Makussu/bunkerweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dockerfile fix - compile

Browse Source
This commit is contained in:
bunkerity 2020-10-21 15:12:27 +02:00
parent 01095bd72f
commit 7a8795883b
6 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -1,4 +1,4 @@
FROM nginx:stable-alpine AS builder FROM nginx:stable-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
@ -6,9 +6,6 @@ RUN chmod +x /tmp/compile.sh && \
/tmp/compile.sh && \ /tmp/compile.sh && \
rm -rf /tmp/* rm -rf /tmp/*
FROM nginx:stable-alpine
COPY --from=builder /*.so /usr/local/nginx/modules/
COPY entrypoint.sh /opt/entrypoint.sh COPY entrypoint.sh /opt/entrypoint.sh
COPY confs/ /opt/confs COPY confs/ /opt/confs
COPY scripts/ /opt/scripts COPY scripts/ /opt/scripts

5
Dockerfile-amd64
View File

@ -1,4 +1,4 @@
FROM amd64/nginx:stable-alpine AS builder FROM amd64/nginx:stable-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
@ -6,9 +6,6 @@ RUN chmod +x /tmp/compile.sh && \
/tmp/compile.sh && \ /tmp/compile.sh && \
rm -rf /tmp/* rm -rf /tmp/*
FROM amd64/nginx:stable-alpine
COPY --from=builder /*.so /usr/local/nginx/modules/
COPY entrypoint.sh /opt/entrypoint.sh COPY entrypoint.sh /opt/entrypoint.sh
COPY confs/ /opt/confs COPY confs/ /opt/confs
COPY scripts/ /opt/scripts COPY scripts/ /opt/scripts

10
Dockerfile-arm32v7
View File

@ -1,11 +1,11 @@
FROM alpine AS builder1 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 AS builder2 FROM arm32v7/nginx:stable-alpine
COPY --from=builder1 qemu-arm-static /usr/bin COPY --from=builder qemu-arm-static /usr/bin
COPY nginx-keys/ /tmp/nginx-keys COPY nginx-keys/ /tmp/nginx-keys
COPY compile.sh /tmp/compile.sh COPY compile.sh /tmp/compile.sh
@ -13,10 +13,6 @@ RUN chmod +x /tmp/compile.sh && \
/tmp/compile.sh && \ /tmp/compile.sh && \
rm -rf /tmp/* rm -rf /tmp/*
FROM arm32v7/nginx:stable-alpine
COPY --from=builder1 qemu-arm-static /usr/bin
COPY --from=builder2 /*.so /usr/local/nginx/modules/
COPY entrypoint.sh /opt/entrypoint.sh COPY entrypoint.sh /opt/entrypoint.sh
COPY confs/ /opt/confs COPY confs/ /opt/confs
COPY scripts/ /opt/scripts COPY scripts/ /opt/scripts

10
Dockerfile-arm64v8
View File

@ -1,11 +1,11 @@
FROM alpine AS builder1 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 AS builder2 FROM arm64v8/nginx:stable-alpine
COPY --from=builder1 qemu-aarch64-static /usr/bin COPY --from=builder qemu-aarch64-static /usr/bin
COPY nginx-keys/ /tmp/nginx-keys COPY nginx-keys/ /tmp/nginx-keys
COPY compile.sh /tmp/compile.sh COPY compile.sh /tmp/compile.sh
@ -13,10 +13,6 @@ RUN chmod +x /tmp/compile.sh && \
/tmp/compile.sh && \ /tmp/compile.sh && \
rm -rf /tmp/* rm -rf /tmp/*
FROM arm64v8/nginx:stable-alpine
COPY --from=builder1 qemu-aarch64-static /usr/bin
COPY --from=builder2 /*.so /usr/local/nginx/modules/
COPY entrypoint.sh /opt/entrypoint.sh COPY entrypoint.sh /opt/entrypoint.sh
COPY confs/ /opt/confs COPY confs/ /opt/confs
COPY scripts/ /opt/scripts COPY scripts/ /opt/scripts

5
Dockerfile-i386
View File

@ -1,4 +1,4 @@
FROM i386/nginx:stable-alpine AS builder FROM i386/nginx:stable-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
@ -6,9 +6,6 @@ RUN chmod +x /tmp/compile.sh && \
/tmp/compile.sh && \ /tmp/compile.sh && \
rm -rf /tmp/* rm -rf /tmp/*
FROM i386/nginx:stable-alpine
COPY --from=builder /*.so /usr/local/nginx/modules/
COPY entrypoint.sh /opt/entrypoint.sh COPY entrypoint.sh /opt/entrypoint.sh
COPY confs/ /opt/confs COPY confs/ /opt/confs
COPY scripts/ /opt/scripts COPY scripts/ /opt/scripts

2
compile.sh
View File

@ -122,7 +122,7 @@ CONFARGS=$(nginx -V 2>&1 | sed -n -e 's/^.*arguments: //p')
CONFARGS=${CONFARGS/-Os -fomit-frame-pointer/-Os} CONFARGS=${CONFARGS/-Os -fomit-frame-pointer/-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 ./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
make -j $NTASK modules make -j $NTASK modules
cp ./objs/*.so / cp ./objs/*.so /usr/local/nginx/modules/
# remove build dependencies # remove build dependencies
apk del build apk del build