diff --git a/Dockerfile b/Dockerfile index 602d52c..b7f8d90 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,12 +28,12 @@ ENV TZ="America/New_York" ADD "." "/var/www/html" # Set permissions for script files as executable scripts inside 'docker/scripts' directory -RUN chmod u+x "${DOCKER_SCRIPTS}/php/prepare.sh" &&\ - chmod u+x "${DOCKER_SCRIPTS}/server/prepare.sh" &&\ - chmod u+x "${DOCKER_SCRIPTS}/entrypoint.sh" &&\ - chmod u+x "${DOCKER_SCRIPTS}/attributes.sh" +RUN chmod u+x "${DOCKER_SCRIPTS}/php/prepare.sh" &&\ + chmod u+x "${DOCKER_SCRIPTS}/server/prepare.sh" &&\ + chmod u+x "${DOCKER_SCRIPTS}/entrypoint.sh" &&\ + chmod u+x "${DOCKER_SCRIPTS}/attributes.sh" -RUN apk add abuild-rootbld --no-cache +RUN apk add gettext --no-cache # The following lines import all Dockerfiles from other folders so that they can be built together in the final build INCLUDE+ docker/php/php.dockerfile diff --git a/docker/php/php.dockerfile b/docker/php/php.dockerfile index 392353c..bb1287a 100644 --- a/docker/php/php.dockerfile +++ b/docker/php/php.dockerfile @@ -49,7 +49,7 @@ ENV CURLOPT_VERBOSE=false # Install PHP-FPM using Alpine's package manager, apk # Configure PHP-FPM to listen on a Unix socket instead of a TCP port, which is more secure and efficient -RUN apk add php7 php7-fpm php7-dom php7-curl php7-json php7-xml --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing &&\ +RUN apk add php7 php7-fpm php7-dom php7-curl php7-json --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing &&\ sed -i 's/^\s*listen = 127.0.0.1:9000/listen = \/run\/php7\/php-fpm7.sock/' ${WWW_CONFIG} &&\ sed -i 's/^\s*;\s*listen.owner = nobody/listen.owner = nginx/' ${WWW_CONFIG} &&\ sed -i 's/^\s*;\s*listen.group = nobody/listen.group = nginx/' ${WWW_CONFIG} &&\