nginx 1.20.0 support
This commit is contained in:
parent
42b7a57f01
commit
1a7abab570
@ -1,4 +1,4 @@
|
|||||||
FROM nginx:stable-alpine
|
FROM nginx:1.20.0-alpine
|
||||||
|
|
||||||
COPY nginx-keys/ /tmp/nginx-keys
|
COPY nginx-keys/ /tmp/nginx-keys
|
||||||
COPY compile.sh /tmp/compile.sh
|
COPY compile.sh /tmp/compile.sh
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
FROM amd64/nginx:stable-alpine
|
FROM amd64/nginx:1.20.0-alpine
|
||||||
|
|
||||||
COPY nginx-keys/ /tmp/nginx-keys
|
COPY nginx-keys/ /tmp/nginx-keys
|
||||||
COPY compile.sh /tmp/compile.sh
|
COPY compile.sh /tmp/compile.sh
|
||||||
|
|||||||
@ -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
|
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
|
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
|
COPY --from=builder qemu-arm-static /usr/bin
|
||||||
|
|
||||||
|
|||||||
@ -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
|
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
|
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
|
COPY --from=builder qemu-aarch64-static /usr/bin
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
FROM i386/nginx:stable-alpine
|
FROM i386/nginx:1.20.0-alpine
|
||||||
|
|
||||||
COPY nginx-keys/ /tmp/nginx-keys
|
COPY nginx-keys/ /tmp/nginx-keys
|
||||||
COPY compile.sh /tmp/compile.sh
|
COPY compile.sh /tmp/compile.sh
|
||||||
|
|||||||
@ -157,7 +157,7 @@ fi
|
|||||||
tar -xvzf nginx-${NGINX_VERSION}.tar.gz
|
tar -xvzf nginx-${NGINX_VERSION}.tar.gz
|
||||||
cd nginx-$NGINX_VERSION
|
cd nginx-$NGINX_VERSION
|
||||||
CONFARGS=$(nginx -V 2>&1 | sed -n -e 's/^.*arguments: //p')
|
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
|
./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
|
make -j $NTASK modules
|
||||||
cp ./objs/*.so /usr/lib/nginx/modules
|
cp ./objs/*.so /usr/lib/nginx/modules
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user