Skip to content

Commit 2598147

Browse files
authored
Pin NGINX OSS to 1.29.1 (#8386)
1 parent 2609636 commit 2598147

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VER = $(shell grep IC_VERSION .github/data/version.txt | cut -d '=' -f 2)
33
GIT_TAG = $(shell git describe --exact-match --tags || echo untagged)
44
VERSION = $(VER)-SNAPSHOT
5-
NGINX_OSS_VERSION ?= 1.29
5+
NGINX_OSS_VERSION ?= 1.29.1
66
NGINX_PLUS_VERSION ?= R35
77
NAP_WAF_VERSION ?= 35+5.527
88
NAP_WAF_COMMON_VERSION ?= 11.559

build/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1.19
22
ARG BUILD_OS=debian
3-
ARG NGINX_OSS_VERSION=1.29
3+
ARG NGINX_OSS_VERSION=1.29.1
44
ARG NGINX_PLUS_VERSION=R35
55
ARG NAP_WAF_VERSION=35+5.527
66
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
106106

107107
############################################# Base image for Debian #############################################
108108
FROM nginx:1.29.1@sha256:8adbdcb969e2676478ee2c7ad333956f0c8e0e4c5a7463f4611d7a2e7a7ff5dc AS debian
109+
ARG NGINX_OSS_VERSION
109110
ARG NGINX_AGENT_VERSION
110111

111112
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
121122
http://packages.nginx.org/nginx-agent/debian `lsb_release -cs` agent" >> /etc/apt/sources.list.d/nginx.list \
122123
&& printf "%s" "Package: *\nPin: origin nginx.org\nPin: release o=nginx\nPin-Priority: 900\n" > /etc/apt/preferences.d/99nginx \
123124
&& apt-get update \
124-
&& apt-get install --no-install-recommends --no-install-suggests -y nginx-agent=${NGINX_AGENT_VERSION}* nginx-module-otel=${NGINX_OSS_VERSION}* \
125+
&& apt-get install --no-install-recommends --no-install-suggests -y \
126+
nginx-agent=${NGINX_AGENT_VERSION}* \
127+
nginx-module-otel=${NGINX_OSS_VERSION}* \
125128
&& apt-get purge --auto-remove -y gpg \
126129
&& rm -rf /var/lib/apt/lists/* /etc/apt/preferences.d/99nginx /etc/apt/sources.list.d/nginx.list \
127130
&& agent.sh

0 commit comments

Comments
 (0)