Skip to content

Commit f2137a5

Browse files
author
DKravtsov
committed
MySQL 8.1, updated composer dependencies, fixed make stop command, added make down command, updated docs.
1 parent e62f645 commit f2137a5

32 files changed

+2146
-1779
lines changed

.editorconfig

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# EditorConfig is awesome: http://EditorConfig.org
12
root = true
23

34
[*]

.env

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ WEB_PORT_HTTP=80
2323
WEB_PORT_SSL=443
2424
# XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
2525
XDEBUG_CONFIG=main
26+
# MySQL version, recommend values: 8.1|8.0
27+
MYSQL_VERSION=8.1
2628
# MySQL INNODB_USE_NATIVE_AIO possible values: 1|0. Set to 0 when AIO interface is not supported on OSX. https://dev.mysql.com/doc/refman/8.0/en/innodb-parameters.html#sysvar_innodb_use_native_aio
2729
INNODB_USE_NATIVE_AIO=1
2830
# Sometimes AWS MySQL RDS has SQL_MODE="NO_ENGINE_SUBSTITUTION" (https://github.com/awsdocs/amazon-rds-user-guide/issues/160 ) but MySQL default described here - https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_sql_mode

Makefile

+32-4
Original file line numberDiff line numberDiff line change
@@ -84,28 +84,56 @@ else
8484
$(ERROR_ONLY_FOR_HOST)
8585
endif
8686

87-
stop: ## Stop dev environment
87+
stop: ## Stop dev environment services
88+
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
89+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose.yml $(PROJECT_NAME) stop
90+
else
91+
$(ERROR_ONLY_FOR_HOST)
92+
endif
93+
94+
stop-test: ## Stop test or continuous integration environment services
95+
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
96+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-test-ci.yml $(PROJECT_NAME) stop
97+
else
98+
$(ERROR_ONLY_FOR_HOST)
99+
endif
100+
101+
stop-staging: ## Stop staging environment services
102+
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
103+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-staging.yml $(PROJECT_NAME) stop
104+
else
105+
$(ERROR_ONLY_FOR_HOST)
106+
endif
107+
108+
stop-prod: ## Stop prod environment services
109+
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
110+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-prod.yml $(PROJECT_NAME) stop
111+
else
112+
$(ERROR_ONLY_FOR_HOST)
113+
endif
114+
115+
down: ## Stop and remove dev environment containers, networks
88116
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
89117
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose.yml $(PROJECT_NAME) down
90118
else
91119
$(ERROR_ONLY_FOR_HOST)
92120
endif
93121

94-
stop-test: ## Stop test or continuous integration environment
122+
down-test: ## Stop and remove test or continuous integration environment containers, networks
95123
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
96124
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-test-ci.yml $(PROJECT_NAME) down
97125
else
98126
$(ERROR_ONLY_FOR_HOST)
99127
endif
100128

101-
stop-staging: ## Stop staging environment
129+
down-staging: ## Stop and remove staging environment containers, networks
102130
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
103131
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-staging.yml $(PROJECT_NAME) down
104132
else
105133
$(ERROR_ONLY_FOR_HOST)
106134
endif
107135

108-
stop-prod: ## Stop prod environment
136+
down-prod: ## Stop and remove prod environment containers, networks
109137
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
110138
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-prod.yml $(PROJECT_NAME) down
111139
else

composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"Elasticsearch"
1515
],
1616
"homepage": "https://github.com/systemsdk/docker-symfony-api",
17-
"version": "v1.5.1",
17+
"version": "v1.6.0",
1818
"license": "MIT",
1919
"authors": [
2020
{
@@ -43,10 +43,10 @@
4343
"beberlei/doctrineextensions": "^1.3",
4444
"doctrine/doctrine-bundle": "^2.10",
4545
"doctrine/doctrine-migrations-bundle": "^3.2",
46-
"doctrine/orm": "^2.15",
46+
"doctrine/orm": "^2.16",
4747
"dukecity/command-scheduler-bundle": "^5.0",
4848
"elasticsearch/elasticsearch": "^7.17",
49-
"gedmo/doctrine-extensions": "^3.11",
49+
"gedmo/doctrine-extensions": "^3.12",
5050
"lexik/jwt-authentication-bundle": "^2.19",
5151
"mark-gerarts/automapper-plus-bundle": "^1.4",
5252
"matomo/device-detector": "^6.1",
@@ -100,7 +100,7 @@
100100
"roave/security-advisories": "dev-latest",
101101
"symfony/browser-kit": "6.3.*",
102102
"symfony/debug-bundle": "6.3.*",
103-
"symfony/maker-bundle": "^1.49",
103+
"symfony/maker-bundle": "^1.50",
104104
"symfony/requirements-checker": "^2.0",
105105
"symfony/stopwatch": "6.3.*",
106106
"symfony/var-dumper": "6.3.*",

0 commit comments

Comments
 (0)