affine/pathfinder-containers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes double nginx conf

Browse source
This commit is contained in:
Sam ONeill 2021-10-25 18:30:37 +13:00
parent 80028302fb
commit bbf2c1ce5a
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Dockerfile
View file

@ -1,4 +1,4 @@
FROM php:7.2.11-fpm-alpine3.7 as build FROM php:7.2.5-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 \
@ -16,11 +16,19 @@ FROM trafex/alpine-nginx-php7:ba1dd422
RUN apk update && apk add --no-cache busybox-suid sudo php7-redis php7-pdo php7-pdo_mysql php7-fileinfo shadow gettext bash apache2-utils RUN apk update && apk add --no-cache busybox-suid sudo php7-redis php7-pdo php7-pdo_mysql php7-fileinfo shadow gettext bash apache2-utils
COPY static/nginx/nginx.conf /etc/nginx/templateNginx.conf COPY static/nginx/nginx.conf /etc/nginx/templateNginx.conf
COPY static/nginx/site.conf /etc/nginx/sites_enabled/templateSite.conf # we need to create sites_enabled directory in order for entrypoint.sh being able to copy file after envsubst
RUN mkdir -p /etc/nginx/sites_enabled/
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
@ -31,6 +39,7 @@ 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