diff --git a/Makefile b/Makefile index 8a1c1fb42e..f917ccf220 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ VER = $(shell grep IC_VERSION .github/data/version.txt | cut -d '=' -f 2) GIT_TAG = $(shell git describe --exact-match --tags || echo untagged) VERSION = $(VER)-SNAPSHOT -NGINX_OSS_VERSION ?= 1.29 +NGINX_OSS_VERSION ?= 1.29.1 NGINX_PLUS_VERSION ?= R35 NAP_WAF_VERSION ?= 35+5.527 NAP_WAF_COMMON_VERSION ?= 11.559 diff --git a/build/Dockerfile b/build/Dockerfile index e5ceb30425..ea4af5d8c1 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.19 ARG BUILD_OS=debian -ARG NGINX_OSS_VERSION=1.29 +ARG NGINX_OSS_VERSION=1.29.1 ARG NGINX_PLUS_VERSION=R35 ARG NAP_WAF_VERSION=35+5.527 ARG NAP_WAF_COMMON_VERSION=11.559 @@ -106,6 +106,7 @@ RUN --mount=type=bind,from=nginx-files,src=nginx_signing.rsa.pub,target=/etc/apk ############################################# Base image for Debian ############################################# FROM nginx:1.29.1@sha256:8adbdcb969e2676478ee2c7ad333956f0c8e0e4c5a7463f4611d7a2e7a7ff5dc AS debian +ARG NGINX_OSS_VERSION ARG NGINX_AGENT_VERSION RUN --mount=type=bind,from=nginx-files,src=nginx_signing.key,target=/tmp/nginx_signing.key \ @@ -121,7 +122,9 @@ RUN --mount=type=bind,from=nginx-files,src=nginx_signing.key,target=/tmp/nginx_s http://packages.nginx.org/nginx-agent/debian `lsb_release -cs` agent" >> /etc/apt/sources.list.d/nginx.list \ && printf "%s" "Package: *\nPin: origin nginx.org\nPin: release o=nginx\nPin-Priority: 900\n" > /etc/apt/preferences.d/99nginx \ && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y nginx-agent=${NGINX_AGENT_VERSION}* nginx-module-otel=${NGINX_OSS_VERSION}* \ + && apt-get install --no-install-recommends --no-install-suggests -y \ + nginx-agent=${NGINX_AGENT_VERSION}* \ + nginx-module-otel=${NGINX_OSS_VERSION}* \ && apt-get purge --auto-remove -y gpg \ && rm -rf /var/lib/apt/lists/* /etc/apt/preferences.d/99nginx /etc/apt/sources.list.d/nginx.list \ && agent.sh