Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ executors:
openresty:
working_directory: /opt/app-root/apicast
docker:
- image: quay.io/3scale/apicast-ci:openresty-1.21.4-5
- image: quay.io/3scale/apicast-ci:openresty-1.27.1-1
- image: mirror.gcr.io/library/redis
environment:
TEST_NGINX_BINARY: openresty
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.access.redhat.com/ubi9/ubi-minimal

ARG OPENRESTY_RPM_VERSION="1.21.4-4.el9"
ARG OPENRESTY_RPM_VERSION="1.27.1-1.el9"
ARG LUAROCKS_VERSION="3.12.0"

LABEL summary="The 3scale API gateway (APIcast) is an OpenResty application, which consists of two parts: NGINX configuration and Lua files." \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.devel
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.access.redhat.com/ubi9/ubi-minimal

ARG OPENRESTY_RPM_VERSION="1.21.4-4.el9"
ARG OPENRESTY_RPM_VERSION="1.27.1-1.el9"
ARG LUAROCKS_VERSION="3.12.0"
ARG LUAROVER_VERSION="0.2.3"

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ NPROC ?= $(firstword $(shell nproc 2>/dev/null) 1)

SEPARATOR="\n=============================================\n"

DEVEL_IMAGE ?= quay.io/3scale/apicast-ci:openresty-1.21.4-5
DEVEL_IMAGE ?= quay.io/3scale/apicast-ci:openresty-1.27.1-1
DEVEL_DOCKERFILE ?= Dockerfile.devel

RUNTIME_IMAGE ?= quay.io/3scale/apicast:latest
Expand Down Expand Up @@ -69,7 +69,7 @@ export COMPOSE_PROJECT_NAME
# docker push quay.io/3scale/apicast-ci:openresty-X.Y.Z-{release_number}
# * update .circleci/config.yaml openresty executor with the image URL
.PHONY: dev-build
dev-build: export OPENRESTY_RPM_VERSION?=1.21.4
dev-build: export OPENRESTY_RPM_VERSION?=1.27.1-1.el9
dev-build: export LUAROCKS_VERSION?=3.12.0
dev-build: IMAGE_NAME ?= apicast-development:latest
dev-build: ## Build development image
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-devel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: '2.2'
services:
development:
image: ${IMAGE:-quay.io/3scale/apicast-ci:openresty-1.21.4-5}
image: ${IMAGE:-quay.io/3scale/apicast-ci:openresty-1.27.1-1}
platform: "linux/amd64"
depends_on:
- redis
Expand Down
3 changes: 2 additions & 1 deletion gateway/http.d/apicast.conf.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ server {
{% endif %}

{% if https_port -%}
listen {{ https_port }} ssl http2 {% if https_proxy_protocol %}proxy_protocol{% endif %};
listen {{ https_port }} ssl {% if https_proxy_protocol %}proxy_protocol{% endif %};
http2 on;

ssl_protocols TLSv1.2 TLSv1.3;
{%- assign https_certificate = env.APICAST_HTTPS_CERTIFICATE -%}
Expand Down
2 changes: 1 addition & 1 deletion gateway/src/apicast/mapping_rule.lua
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ local function regexpify(pattern)

pattern = re_gsub(pattern, [[\?.*]], '', 'oj')
-- dollar sign is escaped by another $, see https://github.com/openresty/lua-nginx-module#ngxresub
pattern = re_gsub(pattern, [[\{.+?\}]], [[([\w-.~%!$$&'()*+,;=@:]+)]], 'oj')
pattern = re_gsub(pattern, [[\{.+?\}]], [[([\w\-.~%!$$&'()*+,;=@:]+)]], 'oj')
pattern = re_gsub(pattern, [[\.]], [[\.]], 'oj')
return pattern
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ local function transform_rule_to_regex(match_rule)
return re_gsub(
match_rule,
[[\{.+?\}]],
[[([\w-.~%!$$&'()*+,;=@:]+)]], -- Same as in the MappingRule module
[[([\w\-.~%!$$&'()*+,;=@:]+)]], -- Same as in the MappingRule module
'oj'
)
end
Expand Down
Loading