diff --git a/Dockerfile b/Dockerfile index c4e859c..9542d6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:stable-alpine +FROM nginx:1.20.0-alpine COPY nginx-keys/ /tmp/nginx-keys COPY compile.sh /tmp/compile.sh diff --git a/Dockerfile-amd64 b/Dockerfile-amd64 index 89b07b1..e3a616f 100644 --- a/Dockerfile-amd64 +++ b/Dockerfile-amd64 @@ -1,4 +1,4 @@ -FROM amd64/nginx:stable-alpine +FROM amd64/nginx:1.20.0-alpine COPY nginx-keys/ /tmp/nginx-keys COPY compile.sh /tmp/compile.sh diff --git a/Dockerfile-arm32v7 b/Dockerfile-arm32v7 index dd4b00a..fe1209f 100644 --- a/Dockerfile-arm32v7 +++ b/Dockerfile-arm32v7 @@ -3,7 +3,7 @@ FROM alpine AS builder ENV QEMU_URL https://github.com/balena-io/qemu/releases/download/v4.0.0%2Bbalena2/qemu-4.0.0.balena2-arm.tar.gz RUN apk add curl && curl -L ${QEMU_URL} | tar zxvf - -C . --strip-components 1 -FROM arm32v7/nginx:stable-alpine +FROM arm32v7/nginx:1.20.0-alpine COPY --from=builder qemu-arm-static /usr/bin diff --git a/Dockerfile-arm64v8 b/Dockerfile-arm64v8 index cd09371..b46c2f0 100644 --- a/Dockerfile-arm64v8 +++ b/Dockerfile-arm64v8 @@ -3,7 +3,7 @@ FROM alpine AS builder ENV QEMU_URL https://github.com/balena-io/qemu/releases/download/v4.0.0%2Bbalena2/qemu-4.0.0.balena2-aarch64.tar.gz RUN apk add curl && curl -L ${QEMU_URL} | tar zxvf - -C . --strip-components 1 -FROM arm64v8/nginx:stable-alpine +FROM arm64v8/nginx:1.20.0-alpine COPY --from=builder qemu-aarch64-static /usr/bin diff --git a/Dockerfile-i386 b/Dockerfile-i386 index e77d08b..f099c09 100644 --- a/Dockerfile-i386 +++ b/Dockerfile-i386 @@ -1,4 +1,4 @@ -FROM i386/nginx:stable-alpine +FROM i386/nginx:1.20.0-alpine COPY nginx-keys/ /tmp/nginx-keys COPY compile.sh /tmp/compile.sh diff --git a/compile.sh b/compile.sh index 80bef2b..60d71f5 100644 --- a/compile.sh +++ b/compile.sh @@ -157,7 +157,7 @@ fi tar -xvzf nginx-${NGINX_VERSION}.tar.gz cd nginx-$NGINX_VERSION CONFARGS=$(nginx -V 2>&1 | sed -n -e 's/^.*arguments: //p') -CONFARGS=${CONFARGS/-Os -fomit-frame-pointer/-Os} +CONFARGS=${CONFARGS/-Os -fomit-frame-pointer -g/-Os} ./configure $CONFARGS --add-dynamic-module=/tmp/ModSecurity-nginx --add-dynamic-module=/tmp/headers-more-nginx-module --add-dynamic-module=/tmp/ngx_http_geoip2_module --add-dynamic-module=/tmp/nginx_cookie_flag_module --add-dynamic-module=/tmp/lua-nginx-module --add-dynamic-module=/tmp/ngx_brotli make -j $NTASK modules cp ./objs/*.so /usr/lib/nginx/modules