From 680c9d4f960c5cbd815ccc57f9cbb325ae6ab490 Mon Sep 17 00:00:00 2001 From: Andy Steed Date: Tue, 16 Dec 2025 13:10:54 -0800 Subject: [PATCH 01/10] fix: update openresty version --- Dockerfile-debian | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile-debian b/Dockerfile-debian index 0d26220..138712a 100644 --- a/Dockerfile-debian +++ b/Dockerfile-debian @@ -25,7 +25,7 @@ ARG _sbindir=/usr/local/sbin ARG TEST_NGINX_VERSION=0.26 ARG NGINX_UPSTREAM_CHECK_MODULE_VERSION="0.4.0" -ARG NGINX_VERSION="1.21.4" +ARG NGINX_VERSION="1.27.1" ARG RESTY_VERSION="${NGINX_VERSION}.2" ARG RESTY_LUAROCKS_VERSION="3.9.2" @@ -68,7 +68,7 @@ ARG RESTY_CONFIG_OPTIONS_MORE="" ARG _RESTY_CONFIG_DEPS="--with-openssl=/tmp/openssl-${RESTY_OPENSSL_VERSION} --with-pcre" # OpenTelemetry dependency versions -ARG LUA_PROTOBUF_VERSION=0.3.3 +ARG LUA_PROTOBUF_VERSION=0.3.3-1 ARG API7_LUA_RESTY_HTTP_VERSION=0.2.0 ARG OPENTELEMETRY_LUA_VERSION=0.2.6 From 7418389b2a9412575972bf5d1ada1ba3a19dc02f Mon Sep 17 00:00:00 2001 From: Andy Steed Date: Tue, 16 Dec 2025 13:14:36 -0800 Subject: [PATCH 02/10] fix: update luarocks version --- Dockerfile-debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-debian b/Dockerfile-debian index 138712a..ca61958 100644 --- a/Dockerfile-debian +++ b/Dockerfile-debian @@ -27,7 +27,7 @@ ARG TEST_NGINX_VERSION=0.26 ARG NGINX_UPSTREAM_CHECK_MODULE_VERSION="0.4.0" ARG NGINX_VERSION="1.27.1" ARG RESTY_VERSION="${NGINX_VERSION}.2" -ARG RESTY_LUAROCKS_VERSION="3.9.2" +ARG RESTY_LUAROCKS_VERSION="3.12.2" # !!! Do not upgrade RESTY_OPENSSL_VERSION to "3.1.3". It will break the reload with OOM error. Other versions have not been tested. ARG RESTY_OPENSSL_VERSION="1.1.1" From 961e024ac799b6cfc35c773ff76e4644032c523c Mon Sep 17 00:00:00 2001 From: Andy Steed Date: Tue, 16 Dec 2025 14:12:34 -0800 Subject: [PATCH 03/10] fix: move copy to later --- Dockerfile-debian | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile-debian b/Dockerfile-debian index ca61958..cea356a 100644 --- a/Dockerfile-debian +++ b/Dockerfile-debian @@ -303,10 +303,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \ iproute2 \ htop -COPY init.sh /etc/init-container.sh - -COPY api-gateway-config /etc/api-gateway - RUN groupadd --gid 1000 nginx-api-gateway \ && useradd --uid 1000 --gid nginx-api-gateway --shell /bin/bash --create-home nginx-api-gateway @@ -319,4 +315,8 @@ RUN apt-get update && apt-get install -y inotify-tools USER nginx-api-gateway +COPY init.sh /etc/init-container.sh + +COPY api-gateway-config /etc/api-gateway + ENTRYPOINT ["/etc/init-container.sh"] From e927f253d37965d02dc904230fb7b5eb36965d60 Mon Sep 17 00:00:00 2001 From: Andy Steed Date: Tue, 16 Dec 2025 14:43:08 -0800 Subject: [PATCH 04/10] fix: set perms on init script --- Dockerfile-debian | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile-debian b/Dockerfile-debian index cea356a..4bfeb84 100644 --- a/Dockerfile-debian +++ b/Dockerfile-debian @@ -303,11 +303,15 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \ iproute2 \ htop +COPY init.sh /etc/init-container.sh + +COPY api-gateway-config /etc/api-gateway + RUN groupadd --gid 1000 nginx-api-gateway \ && useradd --uid 1000 --gid nginx-api-gateway --shell /bin/bash --create-home nginx-api-gateway RUN mkdir -p /usr/local/api-gateway \ - && chown -R nginx-api-gateway /etc/api-gateway /var/log/api-gateway /usr/local \ + && chown -R nginx-api-gateway /etc/init-container.sh /etc/api-gateway /var/log/api-gateway /usr/local \ && chmod 755 -R /etc/api-gateway /var/log/api-gateway /usr/local \ && echo "nginx-api-gateway ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers @@ -315,8 +319,4 @@ RUN apt-get update && apt-get install -y inotify-tools USER nginx-api-gateway -COPY init.sh /etc/init-container.sh - -COPY api-gateway-config /etc/api-gateway - ENTRYPOINT ["/etc/init-container.sh"] From 11545e77ebfc0ef9da4c8095eb060c61b2dea901 Mon Sep 17 00:00:00 2001 From: Andy Steed Date: Tue, 16 Dec 2025 14:50:00 -0800 Subject: [PATCH 05/10] fix: set group as well --- Dockerfile-debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-debian b/Dockerfile-debian index 4bfeb84..190ad4d 100644 --- a/Dockerfile-debian +++ b/Dockerfile-debian @@ -311,7 +311,7 @@ RUN groupadd --gid 1000 nginx-api-gateway \ && useradd --uid 1000 --gid nginx-api-gateway --shell /bin/bash --create-home nginx-api-gateway RUN mkdir -p /usr/local/api-gateway \ - && chown -R nginx-api-gateway /etc/init-container.sh /etc/api-gateway /var/log/api-gateway /usr/local \ + && chown -R nginx-api-gateway:nginx-api-gateway /etc/init-container.sh /etc/api-gateway /var/log/api-gateway /usr/local \ && chmod 755 -R /etc/api-gateway /var/log/api-gateway /usr/local \ && echo "nginx-api-gateway ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers From 1f8d69d7ee2e0e245453681646bf7267949bbb4a Mon Sep 17 00:00:00 2001 From: Andy Steed Date: Tue, 16 Dec 2025 15:14:33 -0800 Subject: [PATCH 06/10] fix: revert openresty version to test --- Dockerfile-debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-debian b/Dockerfile-debian index 190ad4d..43d3b60 100644 --- a/Dockerfile-debian +++ b/Dockerfile-debian @@ -25,7 +25,7 @@ ARG _sbindir=/usr/local/sbin ARG TEST_NGINX_VERSION=0.26 ARG NGINX_UPSTREAM_CHECK_MODULE_VERSION="0.4.0" -ARG NGINX_VERSION="1.27.1" +ARG NGINX_VERSION="1.21.4" ARG RESTY_VERSION="${NGINX_VERSION}.2" ARG RESTY_LUAROCKS_VERSION="3.12.2" From ec124971bd6122ded518a682a97e061ec2edcac4 Mon Sep 17 00:00:00 2001 From: Andy Steed Date: Tue, 16 Dec 2025 16:07:52 -0800 Subject: [PATCH 07/10] fix: update openresty to 1.27.1.2 --- Dockerfile-debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-debian b/Dockerfile-debian index 43d3b60..190ad4d 100644 --- a/Dockerfile-debian +++ b/Dockerfile-debian @@ -25,7 +25,7 @@ ARG _sbindir=/usr/local/sbin ARG TEST_NGINX_VERSION=0.26 ARG NGINX_UPSTREAM_CHECK_MODULE_VERSION="0.4.0" -ARG NGINX_VERSION="1.21.4" +ARG NGINX_VERSION="1.27.1" ARG RESTY_VERSION="${NGINX_VERSION}.2" ARG RESTY_LUAROCKS_VERSION="3.12.2" From c23cdcd455071088b552a1fd1e7541e3b408e219 Mon Sep 17 00:00:00 2001 From: Andy Steed Date: Thu, 18 Dec 2025 12:46:31 -0800 Subject: [PATCH 08/10] fix: update to openssl 3.4.3 --- Dockerfile-debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-debian b/Dockerfile-debian index 190ad4d..c1f3e38 100644 --- a/Dockerfile-debian +++ b/Dockerfile-debian @@ -30,7 +30,7 @@ ARG RESTY_VERSION="${NGINX_VERSION}.2" ARG RESTY_LUAROCKS_VERSION="3.12.2" # !!! Do not upgrade RESTY_OPENSSL_VERSION to "3.1.3". It will break the reload with OOM error. Other versions have not been tested. -ARG RESTY_OPENSSL_VERSION="1.1.1" +ARG RESTY_OPENSSL_VERSION="3.4.3" ARG RESTY_CONFIG_OPTIONS="\ --prefix=${_exec_prefix} \ --sbin-path=${_sbindir}/api-gateway \ From ca6fab381849fa31797abbd4dc6b90ec48c55082 Mon Sep 17 00:00:00 2001 From: Andy Steed Date: Thu, 18 Dec 2025 16:39:23 -0800 Subject: [PATCH 09/10] fix: update debian make target --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f11e692..17007c8 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ docker: docker build --build-arg BASE_REGISTRY=${BASE_REGISTRY} --build-arg CONFIG_SUPERVISOR_VERSION=${CONFIG_SUPERVISOR_VERSION} -t ${IMAGE_NAME} . docker-debian: - docker build --build-arg BASE_REGISTRY=${BASE_REGISTRY} --build-arg CONFIG_SUPERVISOR_VERSION=${CONFIG_SUPERVISOR_VERSION} -t ${IMAGE_NAME}:10-debian-1.21.4.2 -f Dockerfile-debian . + docker build --build-arg BASE_REGISTRY=${BASE_REGISTRY} --build-arg CONFIG_SUPERVISOR_VERSION=${CONFIG_SUPERVISOR_VERSION} -t ${IMAGE_NAME} -f Dockerfile-debian . docker-debian-multiarch-push: docker buildx build --platform linux/amd64,linux/arm64 --build-arg BASE_REGISTRY=${BASE_REGISTRY} --build-arg CONFIG_SUPERVISOR_VERSION=${CONFIG_SUPERVISOR_VERSION} --push -t $(DOCKER_REGISTRY)/${IMAGE_NAME}:$(DOCKER_TAG) -f Dockerfile-debian . From a34e6c8be3fdff31131c0ca3313c81c632487e8c Mon Sep 17 00:00:00 2001 From: Andy Steed Date: Wed, 7 Jan 2026 11:35:48 -0800 Subject: [PATCH 10/10] doc: remove outdated comment --- Dockerfile-debian | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile-debian b/Dockerfile-debian index c1f3e38..18f05b4 100644 --- a/Dockerfile-debian +++ b/Dockerfile-debian @@ -29,7 +29,6 @@ ARG NGINX_VERSION="1.27.1" ARG RESTY_VERSION="${NGINX_VERSION}.2" ARG RESTY_LUAROCKS_VERSION="3.12.2" -# !!! Do not upgrade RESTY_OPENSSL_VERSION to "3.1.3". It will break the reload with OOM error. Other versions have not been tested. ARG RESTY_OPENSSL_VERSION="3.4.3" ARG RESTY_CONFIG_OPTIONS="\ --prefix=${_exec_prefix} \