From e8d6f64e152a3259d3e8aac957e7d52452597c64 Mon Sep 17 00:00:00 2001 From: Carlgo11 Date: Sun, 16 Aug 2020 22:55:45 +0200 Subject: [PATCH] Move default env vars to 2nd container --- Dockerfile | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4cd9a13..c916ba8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,5 @@ FROM alpine AS jekyll -### -# Environment variables -### - -ENV UNIFI_SITE=default -ENV UNIFI_VERSION=5.13.32 - ### # Jekyll ### @@ -75,9 +68,19 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf # Bug fixes RUN mkdir /run/nginx RUN sed -i 's/cgi.fix_pathinfo= 0/cgi.fix_pathinfo=1/g' /etc/php7/php.ini -ONBUILD RUN chown www:www /opt/www/ -R -COPY --chown=1000 --from=jekyll /opt/www/ /opt/www/ +### +# Default Environment variables +### +ENV UNIFI_SITE=default +ENV UNIFI_VERSION=5.13.32 + +### +# Execution +### + +COPY --chown=1000 --from=jekyll /opt/www/ /opt/www/ +ONBUILD RUN chown www:www /opt/www/ -R EXPOSE 80 CMD php-fpm7 && nginx; tail -F /var/log/nginx/error.log \ No newline at end of file