Skip to content

Commit e58637e

Browse files
author
dmitriy
committed
Improved environment, updated composer components.
1 parent 0dd9fa9 commit e58637e

28 files changed

+3320
-1603
lines changed

Diff for: ‎.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- checkout
1111

1212
- run:
13-
name: Start container and verify it's working
13+
name: Start containers and verify it's working
1414
command: |
1515
make start-test
1616

Diff for: ‎.dockerignore

+1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@
1515
Dockerfile
1616
docker-compose.yml
1717
docker-compose-test-ci.yml
18+
docker-compose-staging.yml
1819
docker-compose-prod.yml

Diff for: ‎.env

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
1414
# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
1515

16+
###> docker-compose configuration ###
17+
COMPOSE_PROJECT_NAME=environment1
18+
###< docker-compose configuration ###
19+
1620
###> symfony/framework-bundle ###
1721
APP_ENV=dev
1822
APP_DEBUG=1
@@ -30,7 +34,7 @@ DATABASE_URL=mysql://root:secret@mysql:3306/symfony
3034
###< doctrine/doctrine-bundle ###
3135

3236
###> symfony/mailer ###
33-
# MAILER_DSN=smtp://localhost
37+
MAILER_DSN=smtp://user:pass@smtp.example.com
3438
###< symfony/mailer ###
3539

3640
###> symfony/messenger ###

Diff for: ‎.env.prod

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ APP_DEBUG=0
77
DATABASE_URL=mysql://root:secret@mysql:3306/symfony
88
###< doctrine/doctrine-bundle ###
99

10+
###> symfony/mailer ###
11+
MAILER_DSN=smtp://user:pass@smtp.example.com?encryption=tls
12+
###< symfony/mailer ###
13+
1014
###> symfony/messenger ###
1115
MESSENGER_TRANSPORT_DSN=amqp://guest:guest@rabbitmq:5672/%2f/messages
1216
###< symfony/messenger ###

Diff for: ‎.env.staging

+12
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,15 @@
22
APP_ENV=staging
33
APP_SECRET=42f011ec3a7bde0bec87364b1d967194
44
APP_DEBUG=0
5+
6+
###> doctrine/doctrine-bundle ###
7+
DATABASE_URL=mysql://root:secret@mysql:3306/symfony
8+
###< doctrine/doctrine-bundle ###
9+
10+
###> symfony/mailer ###
11+
MAILER_DSN=smtp://user:pass@smtp.example.com?encryption=tls
12+
###< symfony/mailer ###
13+
14+
###> symfony/messenger ###
15+
MESSENGER_TRANSPORT_DSN=amqp://guest:guest@rabbitmq:5672/%2f/messages
16+
###< symfony/messenger ###

Diff for: ‎.env.test

+3
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@ KERNEL_CLASS='App\Kernel'
44
APP_SECRET='$ecretf0rt3st'
55
APP_DEBUG=0
66
SYMFONY_DEPRECATIONS_HELPER=999999
7+
8+
###> doctrine/doctrine-bundle ###
79
DATABASE_URL=mysql://root:secret@mysql:3306/symfony_testing
10+
###< doctrine/doctrine-bundle ###

Diff for: ‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@v1
2323
- name: Build the docker images
24-
run: docker-compose -f docker-compose-test-ci.yml build
24+
run: make build-test
2525
- name: Start the docker images
2626
run: make start-test
2727
- name: Check running containers

Diff for: ‎.gitlab-ci.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ stages:
2323
build:
2424
stage: build
2525
script:
26-
- docker-compose -f docker-compose-test-ci.yml build
26+
- make build-test
2727
- make start-test
2828
- docker ps -a
2929
- make wait-for-db
@@ -46,18 +46,19 @@ build:
4646
push_staging_images:
4747
stage: deploy
4848
script:
49-
- docker-compose -f docker-compose-staging.yml build
49+
- make build-staging
5050
# TODO: set necessary image name in docker-compose-staging.yml according to your registry and edit lines bellow
5151
#- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
5252
#- docker-compose -f docker-compose-staging.yml push
5353
only:
5454
- master
5555
- develop
56+
- /^release.*$/
5657

5758
push_prod_images:
5859
stage: deploy
5960
script:
60-
- docker-compose -f docker-compose-prod.yml build
61+
- make build-prod
6162
# TODO: set necessary image name in docker-compose-prod.yml according to your registry and edit lines bellow
6263
#- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
6364
#- docker-compose -f docker-compose-prod.yml push

Diff for: ‎Makefile

+27-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
dir=${CURDIR}
2-
project=-p symfony
3-
service=symfony:latest
2+
3+
ifndef APP_ENV
4+
include .env
5+
# Determine if .env.local file exist
6+
ifneq ("$(wildcard .env.local)","")
7+
include .env.local
8+
endif
9+
endif
10+
11+
project=-p ${COMPOSE_PROJECT_NAME}
12+
service=${COMPOSE_PROJECT_NAME}:latest
413
openssl_bin:=$(shell which openssl)
514
interactive:=$(shell [ -t 0 ] && echo 1)
615
ifneq ($(interactive),1)
@@ -11,13 +20,17 @@ ifeq ($(GITLAB_CI),1)
1120
phpunitOptions=--coverage-text --colors=never
1221
endif
1322

14-
ifndef APP_ENV
15-
include .env
16-
# Determine if .env.local file exist
17-
ifneq ("$(wildcard .env.local)","")
18-
include .env.local
19-
endif
20-
endif
23+
build:
24+
@docker-compose -f docker-compose.yml build
25+
26+
build-test:
27+
@docker-compose -f docker-compose-test-ci.yml build
28+
29+
build-staging:
30+
@docker-compose -f docker-compose-staging.yml build
31+
32+
build-prod:
33+
@docker-compose -f docker-compose-prod.yml build
2134

2235
start:
2336
@docker-compose -f docker-compose.yml $(project) up -d
@@ -98,19 +111,19 @@ info:
98111
@make exec cmd="php --version"
99112

100113
logs:
101-
@docker logs -f symfony
114+
@docker logs -f ${COMPOSE_PROJECT_NAME}_symfony
102115

103116
logs-nginx:
104-
@docker logs -f nginx
117+
@docker logs -f ${COMPOSE_PROJECT_NAME}_nginx
105118

106119
logs-supervisord:
107-
@docker logs -f supervisord
120+
@docker logs -f ${COMPOSE_PROJECT_NAME}_supervisord
108121

109122
logs-mysql:
110-
@docker logs -f mysql
123+
@docker logs -f ${COMPOSE_PROJECT_NAME}_mysql
111124

112125
logs-rabbitmq:
113-
@docker logs -f rabbitmq
126+
@docker logs -f ${COMPOSE_PROJECT_NAME}_rabbitmq
114127

115128
drop-migrate:
116129
@make exec cmd="php bin/console doctrine:schema:drop --full-database --force"

Diff for: ‎bitbucket-pipelines.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ pipelines:
99
script:
1010
- chmod +x .bitbucket/dependencies.sh
1111
- .bitbucket/dependencies.sh
12-
- docker-compose -f docker-compose-test-ci.yml build
12+
- make build-test
1313
- make start-test
1414
- docker ps -a
1515
- make wait-for-db
1616
- make drop-migrate
1717
- make messenger-setup-transports
18+
- make info
1819
- make phpunit
1920
- make ecs
2021
- make phpcs

Diff for: ‎composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"ext-mbstring": "*",
3232
"ext-pdo": "*",
3333
"ext-pdo_mysql": "*",
34-
"doctrine/doctrine-migrations-bundle": "^2.1",
34+
"doctrine/doctrine-migrations-bundle": "^2.2",
3535
"easycorp/easy-log-handler": "1.0.*",
3636
"jmose/command-scheduler-bundle": "^2.2",
3737
"sensio/framework-extra-bundle": "^5.5",
@@ -41,7 +41,7 @@
4141
"symfony/console": "4.4.*",
4242
"symfony/dotenv": "4.4.*",
4343
"symfony/expression-language": "4.4.*",
44-
"symfony/flex": "^1.6",
44+
"symfony/flex": "^1.9",
4545
"symfony/form": "4.4.*",
4646
"symfony/framework-bundle": "4.4.*",
4747
"symfony/http-client": "4.4.*",
@@ -75,10 +75,10 @@
7575
"require-dev": {
7676
"bamarni/composer-bin-plugin": "^1.4",
7777
"doctrine/doctrine-fixtures-bundle": "^3.3",
78-
"ergebnis/composer-normalize": "^2.3",
78+
"ergebnis/composer-normalize": "^2.6",
7979
"roave/security-advisories": "dev-master",
8080
"symfony/debug-pack": "*",
81-
"symfony/maker-bundle": "^1.17",
81+
"symfony/maker-bundle": "^1.20",
8282
"symfony/requirements-checker": "^1.1"
8383
},
8484
"config": {

0 commit comments

Comments
 (0)