From 388a1fe3d494374e349e732c78fc43412ce1fc41 Mon Sep 17 00:00:00 2001 From: Sascha Nowak Date: Thu, 17 Oct 2024 08:11:38 +0200 Subject: [PATCH] build(deps): bump nginx from 1.27.0 to 1.27.2 in /nginx --- nginx/Dockerfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nginx/Dockerfile b/nginx/Dockerfile index e8c531d..0fa8883 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 # Adding third-party modules to nginx official image # SEE https://github.com/nginxinc/docker-nginx/tree/master/modules -FROM nginx:1.27.0 AS builder +FROM nginx:1.27.2 AS builder ENV ENABLED_MODULES="headers-more subs-filter geoip2" SHELL ["/bin/bash", "-exo", "pipefail", "-c"] @@ -11,13 +11,15 @@ RUN if [ "$ENABLED_MODULES" = "" ]; then \ exit 1; \ fi +COPY ./ /modules/ + RUN apt-get update \ && apt-get install -y --no-install-suggests --no-install-recommends \ - patch make wget mercurial devscripts debhelper dpkg-dev \ + patch make wget git devscripts debhelper dpkg-dev \ quilt lsb-release build-essential libxml2-utils xsltproc \ equivs git g++ libparse-recdescent-perl \ && XSLSCRIPT_SHA512="f7194c5198daeab9b3b0c3aebf006922c7df1d345d454bd8474489ff2eb6b4bf8e2ffe442489a45d1aab80da6ecebe0097759a1e12cc26b5f0613d05b7c09ffa *stdin" \ - && wget -O /tmp/xslscript.pl https://hg.nginx.org/xslscript/raw-file/01dc9ba12e1b/xslscript.pl \ + && wget -O /tmp/xslscript.pl https://raw.githubusercontent.com/nginx/xslscript/9204424259c343ca08a18a78915f40f28025e093/xslscript.pl \ && if [ "$(cat /tmp/xslscript.pl | openssl sha512 -r)" = "$XSLSCRIPT_SHA512" ]; then \ echo "XSLScript checksum verification succeeded!"; \ chmod +x /tmp/xslscript.pl; \ @@ -26,7 +28,7 @@ RUN apt-get update \ echo "XSLScript checksum verification failed!"; \ exit 1; \ fi \ - && hg clone -r ${NGINX_VERSION}-${PKG_RELEASE%%~*} https://hg.nginx.org/pkg-oss/ \ + && git clone -b ${NGINX_VERSION}-${PKG_RELEASE%%~*} https://github.com/nginx/pkg-oss/ \ && cd pkg-oss \ && mkdir /tmp/packages \ && for module in $ENABLED_MODULES; do \ @@ -68,7 +70,7 @@ RUN apt-get update \ done \ && echo "BUILT_MODULES=\"$BUILT_MODULES\"" > /tmp/packages/modules.env -FROM nginx:1.27.0 AS nginx +FROM nginx:1.27.2 AS nginx ENV TZ="Europe/Berlin" RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone