Improved environment, updated composer components.

Author: dmitriy

.circleci/config.yml

@@ -10,7 +10,7 @@ jobs:
       - checkout
 
       - run:
-          name: Start container and verify it's working
+          name: Start containers and verify it's working
           command: |
             make start-test
 

.dockerignore

@@ -15,4 +15,5 @@
 Dockerfile
 docker-compose.yml
 docker-compose-test-ci.yml
+docker-compose-staging.yml
 docker-compose-prod.yml

.env

@@ -13,6 +13,10 @@
 # Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
 # https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
 
+###> docker-compose configuration ###
+COMPOSE_PROJECT_NAME=environment2
+###< docker-compose configuration ###
+
 ###> symfony/framework-bundle ###
 APP_ENV=dev
 APP_DEBUG=1
@@ -30,7 +34,7 @@ DATABASE_URL=mysql://root:secret@mysql:3306/symfony
 ###< doctrine/doctrine-bundle ###
 
 ###> symfony/mailer ###
-# MAILER_DSN=smtp://localhost
+MAILER_DSN=smtp://user:pass@smtp.example.com
 ###< symfony/mailer ###
 
 ###> symfony/messenger ###

.env.prod

@@ -7,6 +7,10 @@ APP_DEBUG=0
 DATABASE_URL=mysql://root:secret@mysql:3306/symfony
 ###< doctrine/doctrine-bundle ###
 
+###> symfony/mailer ###
+MAILER_DSN=smtp://user:pass@smtp.example.com?encryption=tls
+###< symfony/mailer ###
+
 ###> symfony/messenger ###
 MESSENGER_TRANSPORT_DSN=amqp://guest:guest@rabbitmq:5672/%2f/messages
 ###< symfony/messenger ###

.env.staging

@@ -2,3 +2,15 @@
 APP_ENV=staging
 APP_SECRET=42f011ec3a7bde0bec87364b1d967194
 APP_DEBUG=0
+
+###> doctrine/doctrine-bundle ###
+DATABASE_URL=mysql://root:secret@mysql:3306/symfony
+###< doctrine/doctrine-bundle ###
+
+###> symfony/mailer ###
+MAILER_DSN=smtp://user:pass@smtp.example.com?encryption=tls
+###< symfony/mailer ###
+
+###> symfony/messenger ###
+MESSENGER_TRANSPORT_DSN=amqp://guest:guest@rabbitmq:5672/%2f/messages
+###< symfony/messenger ###

.env.test

@@ -4,4 +4,7 @@ KERNEL_CLASS='App\Kernel'
 APP_SECRET='$ecretf0rt3st'
 APP_DEBUG=0
 SYMFONY_DEPRECATIONS_HELPER=999999
+
+###> doctrine/doctrine-bundle ###
 DATABASE_URL=mysql://root:secret@mysql:3306/symfony_testing
+###< doctrine/doctrine-bundle ###

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
         steps:
             - uses: actions/checkout@v1
             - name: Build the docker images
-              run: docker-compose -f docker-compose-test-ci.yml build
+              run: make build-test
             - name: Start the docker images
               run: make start-test
             - name: Check running containers

.gitlab-ci.yml

@@ -23,7 +23,7 @@ stages:
 build:
   stage: build
   script:
-    - docker-compose -f docker-compose-test-ci.yml build
+    - make build-test
     - make start-test
     - docker ps -a
     - make wait-for-db
@@ -46,18 +46,19 @@ build:
 push_staging_images:
   stage: deploy
   script:
-    - docker-compose -f docker-compose-staging.yml build
+    - make build-staging
     # TODO: set necessary image name in docker-compose-staging.yml according to your registry and edit lines bellow
     #- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
     #- docker-compose -f docker-compose-staging.yml push
   only:
     - master
     - develop
+    - /^release.*$/
 
 push_prod_images:
   stage: deploy
   script:
-    - docker-compose -f docker-compose-prod.yml build
+    - make build-prod
     # TODO: set necessary image name in docker-compose-prod.yml according to your registry and edit lines bellow
     #- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
     #- docker-compose -f docker-compose-prod.yml push

Makefile

@@ -1,6 +1,15 @@
 dir=${CURDIR}
-project=-p symfony
-service=symfony:latest
+
+ifndef APP_ENV
+	include .env
+	# Determine if .env.local file exist
+	ifneq ("$(wildcard .env.local)","")
+		include .env.local
+	endif
+endif
+
+project=-p ${COMPOSE_PROJECT_NAME}
+service=${COMPOSE_PROJECT_NAME}:latest
 openssl_bin:=$(shell which openssl)
 interactive:=$(shell [ -t 0 ] && echo 1)
 ifneq ($(interactive),1)
@@ -11,13 +20,17 @@ ifeq ($(GITLAB_CI),1)
 	phpunitOptions=--coverage-text --colors=never
 endif
 
-ifndef APP_ENV
-	include .env
-	# Determine if .env.local file exist
-	ifneq ("$(wildcard .env.local)","")
-		include .env.local
-	endif
-endif
+build:
+	@docker-compose -f docker-compose.yml build
+
+build-test:
+	@docker-compose -f docker-compose-test-ci.yml build
+
+build-staging:
+	@docker-compose -f docker-compose-staging.yml build
+
+build-prod:
+	@docker-compose -f docker-compose-prod.yml build
 
 start:
 	@docker-compose -f docker-compose.yml $(project) up -d
@@ -95,16 +108,16 @@ info:
 	@make exec cmd="php --version"
 
 logs:
-	@docker logs -f symfony
+	@docker logs -f ${COMPOSE_PROJECT_NAME}_symfony
 
 logs-supervisord:
-	@docker logs -f supervisord
+	@docker logs -f ${COMPOSE_PROJECT_NAME}_supervisord
 
 logs-mysql:
-	@docker logs -f mysql
+	@docker logs -f ${COMPOSE_PROJECT_NAME}_mysql
 
 logs-rabbitmq:
-	@docker logs -f rabbitmq
+	@docker logs -f ${COMPOSE_PROJECT_NAME}_rabbitmq
 
 drop-migrate:
 	@make exec cmd="php bin/console doctrine:schema:drop --full-database --force"

bitbucket-pipelines.yml

@@ -9,12 +9,13 @@ pipelines:
         script:
           - chmod +x .bitbucket/dependencies.sh
           - .bitbucket/dependencies.sh
-          - docker-compose -f docker-compose-test-ci.yml build
+          - make build-test
           - make start-test
           - docker ps -a
           - make wait-for-db
           - make drop-migrate
           - make messenger-setup-transports
+          - make info
           - make phpunit
           - make ecs
           - make phpcs

composer.json

@@ -31,7 +31,7 @@
 		"ext-mbstring": "*",
 		"ext-pdo": "*",
 		"ext-pdo_mysql": "*",
-		"doctrine/doctrine-migrations-bundle": "^2.1",
+		"doctrine/doctrine-migrations-bundle": "^2.2",
 		"easycorp/easy-log-handler": "1.0.*",
 		"jmose/command-scheduler-bundle": "^2.2",
 		"sensio/framework-extra-bundle": "^5.5",
@@ -42,7 +42,7 @@
 		"symfony/console": "4.4.*",
 		"symfony/dotenv": "4.4.*",
 		"symfony/expression-language": "4.4.*",
-		"symfony/flex": "^1.6",
+		"symfony/flex": "^1.9",
 		"symfony/form": "4.4.*",
 		"symfony/framework-bundle": "4.4.*",
 		"symfony/http-client": "4.4.*",
@@ -76,10 +76,10 @@
 	"require-dev": {
 		"bamarni/composer-bin-plugin": "^1.4",
 		"doctrine/doctrine-fixtures-bundle": "^3.3",
-		"ergebnis/composer-normalize": "^2.3",
+		"ergebnis/composer-normalize": "^2.6",
 		"roave/security-advisories": "dev-master",
 		"symfony/debug-pack": "*",
-		"symfony/maker-bundle": "^1.17",
+		"symfony/maker-bundle": "^1.20",
 		"symfony/requirements-checker": "^1.1"
 	},
 	"config": {