Fixes double nginx conf

This commit is contained in:
Sam ONeill 2021-10-25 18:31:52 +13:00
parent bbf2c1ce5a
commit e289846e4b

View file

@ -1,4 +1,4 @@
FROM php:7.2.5-fpm-alpine3.7 as build FROM php:7.2.11-fpm-alpine3.7 as build
RUN apk update \ RUN apk update \
&& apk add --no-cache libpng-dev zeromq-dev git \ && apk add --no-cache libpng-dev zeromq-dev git \
@ -23,12 +23,6 @@ COPY static/nginx/site.conf /etc/nginx/templateSite.conf
# Configure PHP-FPM # Configure PHP-FPM
COPY static/php/fpm-pool.conf /etc/php7/php-fpm.d/zzz_custom.conf COPY static/php/fpm-pool.conf /etc/php7/php-fpm.d/zzz_custom.conf
# DEBUG
RUN apk add php7-xdebug --repository http://dl-3.alpinelinux.org/alpine/edge/testing/
COPY static/php/xdebug.ini /etc/php7/conf.d/xdebug.ini
COPY static/php/error_reporting.ini /etc/php7/conf.d/error_reporting.ini
RUN echo "zend_extension=/usr/lib/php7/modules/xdebug.so" >> /etc/php7/php.ini
COPY static/php/php.ini /etc/zzz_custom.ini COPY static/php/php.ini /etc/zzz_custom.ini
# configure cron # configure cron
COPY static/crontab.txt /var/crontab.txt COPY static/crontab.txt /var/crontab.txt
@ -39,7 +33,6 @@ COPY static/entrypoint.sh /
WORKDIR /var/www/html WORKDIR /var/www/html
COPY --chown=nobody --from=build /app pathfinder COPY --chown=nobody --from=build /app pathfinder
RUN chmod 0766 pathfinder/logs pathfinder/tmp/ && rm index.php && touch /etc/nginx/.setup_pass && chmod +x /entrypoint.sh RUN chmod 0766 pathfinder/logs pathfinder/tmp/ && rm index.php && touch /etc/nginx/.setup_pass && chmod +x /entrypoint.sh
COPY static/pathfinder/routes.ini /var/www/html/pathfinder/app/ COPY static/pathfinder/routes.ini /var/www/html/pathfinder/app/
COPY static/pathfinder/environment.ini /var/www/html/pathfinder/app/templateEnvironment.ini COPY static/pathfinder/environment.ini /var/www/html/pathfinder/app/templateEnvironment.ini