diff --git a/pathfinder.Dockerfile b/pathfinder.Dockerfile index c3c3fe9..9e9fc68 100644 --- a/pathfinder.Dockerfile +++ b/pathfinder.Dockerfile @@ -2,7 +2,7 @@ FROM php:7.2.34-fpm-alpine3.12 as build RUN apk update \ && apk add --no-cache libpng-dev zeromq-dev git \ - $PHPIZE_DEPS \ + $PHPIZE_DEPS \ && docker-php-ext-install gd && docker-php-ext-install pdo_mysql && \ pecl install redis && docker-php-ext-enable redis && \ pecl install channel://pecl.php.net/zmq-1.1.3 && docker-php-ext-enable zmq && \ @@ -16,7 +16,12 @@ RUN composer install 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 php7-event shadow gettext bash apache2-utils logrotate +RUN apk update && apk add --no-cache busybox-suid sudo php7-redis php7-pdo php7-pdo_mysql \ + php7-fileinfo php7-event shadow gettext bash apache2-utils logrotate ca-certificates + +# fix expired DST Cert +RUN sed -i '/^mozilla\/DST_Root_CA_X3.crt$/ s/^/!/' /etc/ca-certificates.conf \ + && update-ca-certificates # symlink nginx logs to stdout/stderr for supervisord RUN ln -sf /dev/stdout /var/log/nginx/access.log \ @@ -31,12 +36,6 @@ COPY static/nginx/site.conf /etc/nginx/templateSite.conf # Configure PHP-FPM 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 # configure cron COPY static/crontab.txt /var/crontab.txt @@ -47,7 +46,7 @@ COPY static/entrypoint.sh / WORKDIR /var/www/html 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/environment.ini /var/www/html/pathfinder/app/templateEnvironment.ini