Commit 7df4248

author

DKravtsov

committed

Improved environment configuration, updated composer dependencies and documentation.

1 parent 9a62a28 commit 7df4248Copy full SHA for 7df4248

File tree

+1126

-953

lines changed

+1126

-953

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,15 @@`
`17`	`17`	`COMPOSE_PROJECT_NAME=environment2`
`18`	`18`	`###< docker-compose configuration ###`
`19`	`19`
	`20`	`+###> docker configuration that can be overridden in .env.local ###`
	`21`	`+WEB_PORT_HTTP=80`
	`22`	`+WEB_PORT_SSL=443`
	`23`	`+# XDEBUG_CONFIG possible values: main\|osx. Use main value for Linux and Windows, osx value for MacOS.`
	`24`	`+XDEBUG_CONFIG=main`
	`25`	`+# 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`
	`26`	`+INNODB_USE_NATIVE_AIO=1`
	`27`	`+###< docker configuration that can be overridden in .env.local ###`
	`28`	`+`
`20`	`29`	`###> symfony/framework-bundle ###`
`21`	`30`	`APP_ENV=dev`
`22`	`31`	`APP_DEBUG=1`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ ARG HOST_GID=1000`
`9`	`9`	`ENV USERNAME=www-data`
`10`	`10`	`ARG INSIDE_DOCKER_CONTAINER=1`
`11`	`11`	`ENV INSIDE_DOCKER_CONTAINER=$INSIDE_DOCKER_CONTAINER`
	`12`	`+ARG XDEBUG_CONFIG=main`
	`13`	`+ENV XDEBUG_CONFIG=$XDEBUG_CONFIG`
`12`	`14`
`13`	`15`	`# check environment`
`14`	`16`	`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; \`
`@@ -74,7 +76,7 @@ RUN a2enmod ssl`
`74`	`76`
`75`	`77`	`# install Xdebug in case dev/test environment`
`76`	`78`	`COPY ./docker/general/do_we_need_xdebug.sh /tmp/`
`77`		`-COPY ./docker/dev/xdebug.ini /tmp/`
	`79`	`+COPY ./docker/dev/xdebug-${XDEBUG_CONFIG}.ini /tmp/xdebug.ini`
`78`	`80`	`RUN chmod u+x /tmp/do_we_need_xdebug.sh && /tmp/do_we_need_xdebug.sh`
`79`	`81`
`80`	`82`	`# install security-checker in case dev/test environment`

Lines changed: 79 additions & 76 deletions

Large diffs are not rendered by default.

Lines changed: 5 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -77,13 +77,13 @@`
`77`	`77`	`"symfony/twig-bundle": "<3.3"`
`78`	`78`	`},`
`79`	`79`	`"require-dev": {`
`80`		`- "bamarni/composer-bin-plugin": "^1.5",`
	`80`	`+ "bamarni/composer-bin-plugin": "^1.8",`
`81`	`81`	`"doctrine/doctrine-fixtures-bundle": "^3.4",`
`82`		`- "systemsdk/easy-log-bundle": "1.10.*",`
	`82`	`+ "systemsdk/easy-log-bundle": "2.0.*",`
`83`	`83`	`"roave/security-advisories": "dev-latest",`
`84`	`84`	`"symfony/browser-kit": "6.1.*",`
`85`	`85`	`"symfony/debug-bundle": "6.1.*",`
`86`		`- "symfony/maker-bundle": "^1.45",`
	`86`	`+ "symfony/maker-bundle": "^1.47",`
`87`	`87`	`"symfony/requirements-checker": "^2.0",`
`88`	`88`	`"symfony/stopwatch": "6.1.*",`
`89`	`89`	`"symfony/var-dumper": "6.1.*",`
`@@ -97,20 +97,14 @@`
`97`	`97`	`"symfony/polyfill-php81": "*"`
`98`	`98`	`},`
`99`	`99`	`"config": {`
	`100`	`+ "allow-plugins": true,`
`100`	`101`	`"platform": {`
`101`	`102`	`"php": "8.1.0"`
`102`	`103`	`},`
`103`	`104`	`"preferred-install": {`
`104`	`105`	`"*": "dist"`
`105`	`106`	`},`
`106`		`- "sort-packages": true,`
`107`		`- "allow-plugins": {`
`108`		`- "composer/package-versions-deprecated": true,`
`109`		`- "bamarni/composer-bin-plugin": true,`
`110`		`- "ergebnis/composer-normalize": true,`
`111`		`- "symfony/flex": true,`
`112`		`- "symfony/runtime": true`
`113`		`- }`
	`107`	`+ "sort-packages": true`
`114`	`108`	`},`
`115`	`109`	`"extra": {`
`116`	`110`	`"allow-contrib": "true",`

Comments

(0)