Improved environment configuration, updated composer dependencies and documentation.

Author: DKravtsov

.env

@@ -17,6 +17,15 @@
 COMPOSE_PROJECT_NAME=environment1
 ###< docker-compose configuration ###
 
+###> docker configuration that can be overridden in .env.local ###
+WEB_PORT_HTTP=80
+WEB_PORT_SSL=443
+# XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
+XDEBUG_CONFIG=main
+# 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
+INNODB_USE_NATIVE_AIO=1
+###< docker configuration that can be overridden in .env.local ###
+
 ###> symfony/framework-bundle ###
 APP_ENV=dev
 APP_DEBUG=1

Dockerfile

@@ -9,6 +9,8 @@ ARG HOST_GID=1000
 ENV USERNAME=www-data
 ARG INSIDE_DOCKER_CONTAINER=1
 ENV INSIDE_DOCKER_CONTAINER=$INSIDE_DOCKER_CONTAINER
+ARG XDEBUG_CONFIG=main
+ENV XDEBUG_CONFIG=$XDEBUG_CONFIG
 
 # check environment
 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; \
@@ -64,7 +66,7 @@ COPY ./docker/$BUILD_ARGUMENT_ENV/php.ini /usr/local/etc/php/php.ini
 
 # install Xdebug in case dev/test environment
 COPY ./docker/general/do_we_need_xdebug.sh /tmp/
-COPY ./docker/dev/xdebug.ini /tmp/
+COPY ./docker/dev/xdebug-${XDEBUG_CONFIG}.ini /tmp/xdebug.ini
 RUN chmod u+x /tmp/do_we_need_xdebug.sh && /tmp/do_we_need_xdebug.sh
 
 # install security-checker in case dev/test environment

Makefile

@@ -76,13 +76,13 @@
 		"symfony/twig-bundle": "<3.3"
 	},
 	"require-dev": {
-		"bamarni/composer-bin-plugin": "^1.5",
+		"bamarni/composer-bin-plugin": "^1.8",
 		"doctrine/doctrine-fixtures-bundle": "^3.4",
-		"systemsdk/easy-log-bundle": "1.10.*",
+		"systemsdk/easy-log-bundle": "2.0.*",
 		"roave/security-advisories": "dev-latest",
 		"symfony/browser-kit": "6.1.*",
 		"symfony/debug-bundle": "6.1.*",
-		"symfony/maker-bundle": "^1.45",
+		"symfony/maker-bundle": "^1.47",
 		"symfony/requirements-checker": "^2.0",
 		"symfony/stopwatch": "6.1.*",
 		"symfony/var-dumper": "6.1.*",
@@ -96,20 +96,14 @@
 		"symfony/polyfill-php81": "*"
 	},
 	"config": {
+		"allow-plugins": true,
 		"platform": {
 			"php": "8.1.0"
 		},
 		"preferred-install": {
 			"*": "dist"
 		},
-		"sort-packages": true,
-		"allow-plugins": {
-			"composer/package-versions-deprecated": true,
-			"bamarni/composer-bin-plugin": true,
-			"ergebnis/composer-normalize": true,
-			"symfony/flex": true,
-			"symfony/runtime": true
-		}
+		"sort-packages": true
 	},
 	"extra": {
 		"allow-contrib": "true",