refactoring

Author: dmitriy

Dockerfile

@@ -3,16 +3,16 @@ FROM php:7.3-apache
 # set main params
 ARG BUILD_ARGUMENT_DEBUG_ENABLED=false
 ENV DEBUG_ENABLED=$BUILD_ARGUMENT_DEBUG_ENABLED
-ARG BUILD_ARGUMENT_APP_ENV=dev
-ENV APP_ENV=$BUILD_ARGUMENT_APP_ENV
+ARG BUILD_ARGUMENT_ENV=dev
+ENV ENV=$BUILD_ARGUMENT_ENV
 ENV APP_HOME /var/www/html
 
 # check environment
-RUN if [ "$BUILD_ARGUMENT_APP_ENV" = "default" ]; then echo "Set BUILD_ARGUMENT_APP_ENV in docker build-args like --build-arg BUILD_ARGUMENT_APP_ENV=dev" && exit 2; \
-    elif [ "$BUILD_ARGUMENT_APP_ENV" = "dev" ]; then echo "Building development environment."; \
-    elif [ "$BUILD_ARGUMENT_APP_ENV" = "test" ]; then echo "Building test environment."; \
-    elif [ "$BUILD_ARGUMENT_APP_ENV" = "prod" ]; then echo "Building production environment."; \
-    else echo "Set correct BUILD_ARGUMENT_APP_ENV in docker build-args like --build-arg BUILD_ARGUMENT_APP_ENV=dev. Available choices are dev,test,prod." && exit 2; \
+RUN if [ "$BUILD_ARGUMENT_ENV" = "default" ]; then echo "Set BUILD_ARGUMENT_ENV in docker build-args like --build-arg BUILD_ARGUMENT_ENV=dev" && exit 2; \
+    elif [ "$BUILD_ARGUMENT_ENV" = "dev" ]; then echo "Building development environment."; \
+    elif [ "$BUILD_ARGUMENT_ENV" = "test" ]; then echo "Building test environment."; \
+    elif [ "$BUILD_ARGUMENT_ENV" = "prod" ]; then echo "Building production environment."; \
+    else echo "Set correct BUILD_ARGUMENT_ENV in docker build-args like --build-arg BUILD_ARGUMENT_ENV=dev. Available choices are dev,test,prod." && exit 2; \
     fi
 
 # install all the dependencies and enable PHP modules
@@ -55,7 +55,7 @@ RUN chown -R www-data:www-data $APP_HOME
 COPY ./docker/hosts/symfony.conf /etc/apache2/sites-available/symfony.conf
 COPY ./docker/hosts/symfony-ssl.conf /etc/apache2/sites-available/symfony-ssl.conf
 RUN a2ensite symfony.conf && a2ensite symfony-ssl
-COPY ./docker/$BUILD_ARGUMENT_APP_ENV/php.ini /usr/local/etc/php/php.ini
+COPY ./docker/$BUILD_ARGUMENT_ENV/php.ini /usr/local/etc/php/php.ini
 
 # enable apache modules
 RUN a2enmod rewrite
@@ -64,15 +64,15 @@ RUN a2enmod ssl
 # install Xdebug in case development or test environment
 COPY ./docker/other/do_we_need_xdebug.sh /tmp/
 COPY ./docker/dev/xdebug.ini /tmp/
-RUN chmod u+x /tmp/do_we_need_xdebug.sh && /tmp/do_we_need_xdebug.sh $BUILD_ARGUMENT_APP_ENV
+RUN chmod u+x /tmp/do_we_need_xdebug.sh && /tmp/do_we_need_xdebug.sh
 
 # install composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer
 
 # add supervisor
 RUN mkdir -p /var/log/supervisor
 COPY --chown=root:root ./docker/other/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-COPY --chown=root:root ./docker/$BUILD_ARGUMENT_APP_ENV/cron /var/spool/cron/crontabs/root
+COPY --chown=root:root ./docker/other/cron /var/spool/cron/crontabs/root
 RUN chmod 0600 /var/spool/cron/crontabs/root
 
 # generate certificates
@@ -91,12 +91,12 @@ USER www-data
 COPY --chown=www-data:www-data . $APP_HOME/
 
 # install all PHP dependencies
-RUN if [ "$BUILD_ARGUMENT_APP_ENV" = "dev" ] || [ "$BUILD_ARGUMENT_APP_ENV" = "test" ]; then composer install --optimize-autoloader --no-interaction --no-progress; \
-    else  composer install --optimize-autoloader --no-interaction --no-progress --no-dev; \
+RUN if [ "$BUILD_ARGUMENT_ENV" = "dev" ] || [ "$BUILD_ARGUMENT_ENV" = "test" ]; then composer install --optimize-autoloader --no-interaction --no-progress; \
+    else export APP_ENV=$BUILD_ARGUMENT_ENV && composer install --optimize-autoloader --no-interaction --no-progress --no-dev; \
     fi
 
 # create cached config file .env.local.php in case prod environment
-RUN if [ "$BUILD_ARGUMENT_APP_ENV" = "prod" ]; then composer dump-env $BUILD_ARGUMENT_APP_ENV; \
+RUN if [ "$BUILD_ARGUMENT_ENV" = "prod" ]; then composer dump-env $BUILD_ARGUMENT_ENV; \
     fi
 
 USER root

Makefile

@@ -59,22 +59,19 @@ info:
 	@make exec cmd="php --version"
 
 drop-migrate:
-	@make exec cmd="php bin/console doctrine:schema:drop --full-database --force --env=dev"
+	@make exec cmd="php bin/console doctrine:schema:drop --full-database --force"
 	@make exec cmd="php bin/console doctrine:schema:drop --full-database --force --env=test"
 	@make migrate
 
 migrate-prod:
 	@make exec cmd="php bin/console doctrine:migrations:migrate --no-interaction"
 
 migrate:
-	@make exec cmd="php bin/console doctrine:migrations:migrate --no-interaction --env=dev"
+	@make exec cmd="php bin/console doctrine:migrations:migrate --no-interaction"
 	@make exec cmd="php bin/console doctrine:migrations:migrate --no-interaction --env=test"
 
-fixtures-prod:
-	@make exec cmd="php bin/console doctrine:fixtures:load --append"
-
 fixtures:
-	@make exec cmd="php bin/console doctrine:fixtures:load --append --env=dev"
+	@make exec cmd="php bin/console doctrine:fixtures:load --append"
 
 phpunit:
 	@make exec cmd="./vendor/bin/simple-phpunit -c phpunit.xml.dist --log-junit reports/phpunit.xml --coverage-html reports/coverage --coverage-clover reports/coverage.xml"

composer.lock

@@ -7,7 +7,7 @@ services:
       build:
         context: .
         args:
-          - "BUILD_ARGUMENT_APP_ENV=prod"
+          - "BUILD_ARGUMENT_ENV=prod"
           - "BUILD_ARGUMENT_DEBUG_ENABLED=false"
         dockerfile: ./Dockerfile
       container_name: symfony
@@ -27,7 +27,7 @@ services:
       build:
         context: .
         args:
-          - "BUILD_ARGUMENT_APP_ENV=prod"
+          - "BUILD_ARGUMENT_ENV=prod"
           - "BUILD_ARGUMENT_DEBUG_ENABLED=false"
         dockerfile: ./Dockerfile
       container_name: supervisord

docker-compose-prod.yml

@@ -7,7 +7,7 @@ services:
       build:
         context: .
         args:
-          - "BUILD_ARGUMENT_APP_ENV=test"
+          - "BUILD_ARGUMENT_ENV=test"
           - "BUILD_ARGUMENT_DEBUG_ENABLED=false"
         dockerfile: ./Dockerfile
       container_name: symfony
@@ -27,7 +27,7 @@ services:
       build:
         context: .
         args:
-          - "BUILD_ARGUMENT_APP_ENV=test"
+          - "BUILD_ARGUMENT_ENV=test"
           - "BUILD_ARGUMENT_DEBUG_ENABLED=false"
         dockerfile: ./Dockerfile
       container_name: supervisord

docker-compose-test-ci.yml

@@ -7,7 +7,7 @@ services:
       build:
         context: .
         args:
-          - "BUILD_ARGUMENT_APP_ENV=dev"
+          - "BUILD_ARGUMENT_ENV=dev"
           - "BUILD_ARGUMENT_DEBUG_ENABLED=false"
         dockerfile: ./Dockerfile
       container_name: symfony
@@ -29,7 +29,7 @@ services:
       build:
         context: .
         args:
-          - "BUILD_ARGUMENT_APP_ENV=dev"
+          - "BUILD_ARGUMENT_ENV=dev"
           - "BUILD_ARGUMENT_DEBUG_ENABLED=false"
         dockerfile: ./Dockerfile
       container_name: supervisord

docker-compose.yml

@@ -1,6 +1,6 @@
 #!/bin/bash -x
 
-if [ "$APP_ENV" == "dev" ] || [ "$APP_ENV" == "test" ]; then
+if [ "$ENV" == "dev" ] || [ "$ENV" == "test" ]; then
     #pecl install xdebug - enable it when Xdebug 2.7.0 will be released
     pecl install xdebug-beta
     mv /tmp/xdebug.ini /usr/local/etc/php/conf.d/

docker/dev/cron renamed to docker/other/cron

@@ -11,7 +11,6 @@
          printerClass="Codedungeon\PHPUnitPrettyResultPrinter\Printer">
     <php>
         <ini name="error_reporting" value="-1" />
-        <server name="APP_ENV" value="test" />
         <env name="APP_ENV" value="test" />
         <env name="SYMFONY_PHPUNIT_VERSION" value="7" />
         <env name="SHELL_VERBOSITY" value="-1" />

docker/other/do_we_need_xdebug.sh

@@ -299,7 +299,7 @@
             "repo": "github.com/symfony/recipes",
             "branch": "master",
             "version": "4.2",
-            "ref": "5bb3a8c27df824d195fa68bb635d074854f8498f"
+            "ref": "9aafbc8edf7558dfe213e9d51d0217cbd78acc5a"
         },
         "files": [
             "config/bootstrap.php",
@@ -357,7 +357,7 @@
         "version": "v1.0.6"
     },
     "symfony/panther": {
-        "version": "v0.2.0"
+        "version": "v0.3.0"
     },
     "symfony/phpunit-bridge": {
         "version": "4.1",