|
@@ -4,25 +4,14 @@ ARG TARGETARCH
|
|
|
ARG TARGETVARIANT
|
|
|
EXPOSE 80 443
|
|
|
|
|
|
-# init config
|
|
|
-COPY resources/docker/init-config.up /etc/s6-overlay/s6-rc.d/init-config/up
|
|
|
-COPY resources/docker/init-config.sh /etc/s6-overlay/s6-rc.d/init-config/init-config.sh
|
|
|
-
|
|
|
-RUN chmod +x /etc/s6-overlay/s6-rc.d/init-config/init-config.sh && \
|
|
|
- echo 'oneshot' > /etc/s6-overlay/s6-rc.d/init-config/type && \
|
|
|
- touch /etc/s6-overlay/s6-rc.d/user/contents.d/init-config && \
|
|
|
- mkdir -p /etc/s6-overlay/s6-rc.d/nginx/dependencies.d && \
|
|
|
- touch /etc/s6-overlay/s6-rc.d/nginx/dependencies.d/init-config
|
|
|
-
|
|
|
# register nginx-ui service
|
|
|
COPY resources/docker/nginx-ui.run /etc/s6-overlay/s6-rc.d/nginx-ui/run
|
|
|
RUN echo 'longrun' > /etc/s6-overlay/s6-rc.d/nginx-ui/type && \
|
|
|
touch /etc/s6-overlay/s6-rc.d/user/contents.d/nginx-ui
|
|
|
|
|
|
# copy nginx config
|
|
|
-COPY resources/docker/nginx.conf /usr/etc/nginx/nginx.conf
|
|
|
-COPY resources/docker/nginx-ui.conf /usr/etc/nginx/conf.d/nginx-ui.conf
|
|
|
-COPY resources/docker/nginx-ui.conf /etc/nginx/conf.d/nginx-ui.conf
|
|
|
+COPY resources/docker/nginx.conf /usr/local/etc/nginx/nginx.conf
|
|
|
+COPY resources/docker/nginx-ui.conf /usr/local/etc/nginx/conf.d/nginx-ui.conf
|
|
|
|
|
|
# copy nginx-ui executable binary
|
|
|
COPY nginx-ui-$TARGETOS-$TARGETARCH$TARGETVARIANT/nginx-ui /usr/local/bin/nginx-ui
|
|
@@ -30,3 +19,9 @@ COPY nginx-ui-$TARGETOS-$TARGETARCH$TARGETVARIANT/nginx-ui /usr/local/bin/nginx-
|
|
|
# remove default nginx config
|
|
|
RUN rm -f /etc/nginx/conf.d/default.conf \
|
|
|
&& rm -f /usr/etc/nginx/conf.d/default.conf
|
|
|
+
|
|
|
+# recreate access.log and error.log
|
|
|
+RUN rm -f /var/log/nginx/access.log && \
|
|
|
+ touch /var/log/nginx/access.log && \
|
|
|
+ rm -f /var/log/nginx/error.log && \
|
|
|
+ touch /var/log/nginx/error.log
|