Merge branch 'master' into chore(env)/speed-up-build-process

Author: tarlepp

Dockerfile

@@ -40,6 +40,7 @@ WORKDIR /app
 
 COPY . /app
 COPY ./docker/php/php.ini /usr/local/etc/php/php.ini
+COPY ./docker/php/www.conf /usr/local/etc/php-fpm.d/www.conf
 
 RUN chmod +x /app/bin/console
 RUN chmod +x /app/docker-entrypoint.sh

Dockerfile_dev

@@ -75,18 +75,16 @@ COPY --from=composer:2.6.4 /usr/bin/composer /usr/bin/composer
 # Enable Composer autocompletion
 RUN composer completion bash > /etc/bash_completion.d/composer
 
-# Copy development `php.ini` configuration to container
+# Copy development `php.ini` and PHP-FPM pool configuration to container
 #
-# Also note that this is mounted within `docker-compose.yml` file, so
+# Also note that these files mounted within `docker-compose.yml` file, so
 # you don't need to build containers again if you change something just
 # restart containers and you're good
 COPY ./docker/php/php-dev.ini /usr/local/etc/php/php.ini
+COPY ./docker/php/www-dev.conf /usr/local/etc/php-fpm.d/www.conf
 
 RUN chmod -R o+s+w /usr/local/etc/php
 
-# Enable PHP-FPM status page
-RUN echo 'pm.status_path = /status' >> /usr/local/etc/php-fpm.d/www.conf
-
 RUN curl -s https://api.github.com/repos/fabpot/local-php-security-checker/releases/latest | \
         grep -E "browser_download_url(.+)linux_amd64" | \
         cut -d : -f 2,3 | \

docker-compose.yml

@@ -15,6 +15,8 @@ services:
             - mariadb
         volumes:
             - ./:/app:cached
+            - ./docker/php/php-dev.ini:/usr/local/etc/php/php.ini
+            - ./docker/php/www-dev.conf:/usr/local/etc/php-fpm.d/www.conf
         tmpfs:
             - /app/var/:uid=$HOST_UID,gid=$HOST_GID
         environment:

docker-entrypoint-dev.sh

@@ -4,8 +4,7 @@ set -e
 #
 # If we're starting web-server we need to do following:
 #   0) Basic linting of current JSON configuration file
-#   1) Copy updated php configuration file, with this we can change php
-#      configuration without rebuilding image
+#   1) Export needed environment variables
 #   2) Install all dependencies
 #   3) Generate JWT encryption keys
 #   4) Create database if it not exists yet
@@ -17,8 +16,6 @@ set -e
 make lint-configuration
 
 # Step 1
-cp /app/docker/php/php-dev.ini /usr/local/etc/php/php.ini
-
 DOCKER_IP=$(/sbin/ip route|awk '/default/ { print $3 }')
 
 export DOCKER_IP