@@ -93,7 +93,7 @@ RUN --mount=type=bind,from=nginx-files,src=nginx_signing.rsa.pub,target=/etc/apk
93
93
&& export $(cat /tmp/user_agent) \
94
94
&& printf "%s%s%s\n " "http://packages.nginx.org/nginx/mainline/alpine/v" `egrep -o '^[0-9]+\. [0-9]+' /etc/alpine-release` "/main" >> /etc/apk/repositories \
95
95
&& printf "%s%s%s\n " "http://packages.nginx.org/nginx-agent/alpine/v" `egrep -o '^[0-9]+\. [0-9]+' /etc/alpine-release` "/main" >> /etc/apk/repositories \
96
- && apk add --no-cache nginx-module-otel~${NGINX_OSS_VERSION} " nginx-agent< 3.1" \
96
+ && apk add --no-cache nginx-module-otel~${NGINX_OSS_VERSION} nginx-agent~ 3.1 \
97
97
&& ldconfig /usr/local/lib/ \
98
98
&& agent.sh \
99
99
&& sed -i -e '/nginx.org/d' /etc/apk/repositories
@@ -115,7 +115,7 @@ RUN --mount=type=bind,from=nginx-files,src=nginx_signing.key,target=/tmp/nginx_s
115
115
http://packages.nginx.org/nginx-agent/debian `lsb_release -cs` agent" >> /etc/apt/sources.list.d/nginx.list \
116
116
&& printf "%s" "Package: *\n Pin: origin nginx.org\n Pin: release o=nginx\n Pin-Priority: 900\n " > /etc/apt/preferences.d/99nginx \
117
117
&& apt-get update \
118
- && apt-get install --no-install-recommends --no-install-suggests -y nginx-agent=3.0 .* nginx-module-otel=${NGINX_OSS_VERSION}* \
118
+ && apt-get install --no-install-recommends --no-install-suggests -y nginx-agent=3.1 .* nginx-module-otel=${NGINX_OSS_VERSION}* \
119
119
&& apt-get purge --auto-remove -y gpg \
120
120
&& rm -rf /var/lib/apt/lists/* /etc/apt/preferences.d/99nginx /etc/apt/sources.list.d/nginx.list \
121
121
&& agent.sh
@@ -158,7 +158,7 @@ RUN --mount=type=bind,from=nginx-files,src=nginx_signing.key,target=/tmp/nginx_s
158
158
&& printf "%s\n " "[agent]" "name=agent repo" \
159
159
"baseurl=https://packages.nginx.org/nginx-agent/centos/9/\$ basearch/" \
160
160
"gpgcheck=1" "enabled=1" "module_hotfixes=true" >> /etc/yum.repos.d/nginx.repo \
161
- && microdnf --nodocs install -y nginx-${NGINX_OSS_VERSION}* nginx-module-njs-${NGINX_OSS_VERSION}* nginx-module-otel-${NGINX_OSS_VERSION}* nginx-module-image-filter-${NGINX_OSS_VERSION}* nginx-module-xslt-${NGINX_OSS_VERSION}* nginx-agent-3.0 .* \
161
+ && microdnf --nodocs install -y nginx-${NGINX_OSS_VERSION}* nginx-module-njs-${NGINX_OSS_VERSION}* nginx-module-otel-${NGINX_OSS_VERSION}* nginx-module-image-filter-${NGINX_OSS_VERSION}* nginx-module-xslt-${NGINX_OSS_VERSION}* nginx-agent-3.1 .* \
162
162
&& rm /etc/yum.repos.d/nginx.repo \
163
163
&& ubi-clean.sh
164
164
@@ -178,7 +178,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/apk/cert.pem,mode=0644 \
178
178
export $(cat /tmp/user_agent) \
179
179
&& printf "%s\n " "https://${PACKAGE_REPO}/plus/${NGINX_PLUS_VERSION}/alpine/v$(grep -E -o '^[0-9]+\. [0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
180
180
&& printf "%s\n " "https://${PACKAGE_REPO}/nginx-agent/alpine/v$(grep -E -o '^[0-9]+\. [0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
181
- && apk add --no-cache nginx-plus nginx-plus-module-njs nginx-plus-module-otel nginx-plus-module-fips-check " nginx-agent< 3.1" libcap libcurl \
181
+ && apk add --no-cache nginx-plus nginx-plus-module-njs nginx-plus-module-otel nginx-plus-module-fips-check nginx-agent~ 3.1 libcap libcurl \
182
182
&& mkdir -p /etc/nginx/reporting/ && cp -av /tmp/nginx/reporting/tracking.info /etc/nginx/reporting/tracking.info \
183
183
&& agent.sh \
184
184
&& sed -i -e '/nginx.com/d' /etc/apk/repositories
@@ -219,7 +219,7 @@ RUN --mount=type=bind,from=alpine-fips-3.19,target=/tmp/fips/ \
219
219
&& printf "%s\n " "https://pkgs.nginx.com/app-protect-security-updates/alpine/v$(grep -E -o '^[0-9]+\. [0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
220
220
&& printf "%s\n " "https://${PACKAGE_REPO}/nginx-agent/alpine/v$(grep -E -o '^[0-9]+\. [0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
221
221
&& apk add --no-cache libcap-utils libcurl nginx-plus nginx-plus-module-njs nginx-plus-module-otel nginx-plus-module-fips-check \
222
- && apk add --no-cache " nginx-agent<3" \
222
+ && apk add --no-cache nginx-agent~3.1 \
223
223
&& mkdir -p /usr/ssl \
224
224
&& cp -av /tmp/fips/usr/lib/ossl-modules/fips.so /usr/lib/ossl-modules/fips.so \
225
225
&& cp -av /tmp/fips/usr/ssl/fipsmodule.cnf /usr/ssl/fipsmodule.cnf \
@@ -250,7 +250,7 @@ RUN --mount=type=bind,from=alpine-fips-3.19,target=/tmp/fips/ \
250
250
&& printf "%s\n " "https://${PACKAGE_REPO}/app-protect-x-plus/alpine/v$(grep -E -o '^[0-9]+\. [0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
251
251
&& printf "%s\n " "https://${PACKAGE_REPO}/nginx-agent/alpine/v$(grep -E -o '^[0-9]+\. [0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
252
252
&& apk add --no-cache libcap-utils libcurl nginx-plus nginx-plus-module-njs nginx-plus-module-otel nginx-plus-module-fips-check \
253
- && apk add --no-cache " nginx-agent<3" \
253
+ && apk add --no-cache nginx-agent~3.1 \
254
254
&& mkdir -p /usr/ssl \
255
255
&& cp -av /tmp/fips/usr/lib/ossl-modules/fips.so /usr/lib/ossl-modules/fips.so \
256
256
&& cp -av /tmp/fips/usr/ssl/fipsmodule.cnf /usr/ssl/fipsmodule.cnf \
@@ -307,7 +307,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
307
307
apt-get update \
308
308
&& cp /tmp/nginx-agent.sources /etc/apt/sources.list.d/nginx-agent.sources \
309
309
&& apt-get update \
310
- && apt-get install --no-install-recommends --no-install-suggests -y nginx-agent=3.0 .* \
310
+ && apt-get install --no-install-recommends --no-install-suggests -y nginx-agent=3.1 .* \
311
311
&& agent.sh \
312
312
&& rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/nginx-agent.sources
313
313
@@ -384,7 +384,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
384
384
mkdir -p /etc/nginx/reporting/ && cp -av /tmp/nginx/reporting/tracking.info /etc/nginx/reporting/tracking.info \
385
385
&& ubi-setup.sh \
386
386
&& rpm -Uvh /ubi-bin/c-ares-*.rpm \
387
- && microdnf --nodocs install -y nginx-plus nginx-plus-module-njs nginx-plus-module-otel nginx-plus-module-fips-check nginx-agent-3.0 .* \
387
+ && microdnf --nodocs install -y nginx-plus nginx-plus-module-njs nginx-plus-module-otel nginx-plus-module-fips-check nginx-agent-3.1 .* \
388
388
&& agent.sh \
389
389
&& ubi-clean.sh
390
390
0 commit comments