Skip to content

Commit

Permalink
Improved environment configuration, updated composer dependencies and…
Browse files Browse the repository at this point in the history
… documentation.
  • Loading branch information
DKravtsov committed Oct 30, 2022
1 parent 9a62a28 commit 7df4248
Show file tree
Hide file tree
Showing 36 changed files with 1,126 additions and 953 deletions.
9 changes: 9 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@
COMPOSE_PROJECT_NAME=environment2
###< 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
Expand Down
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down Expand Up @@ -74,7 +76,7 @@ RUN a2enmod ssl

# 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
Expand Down
155 changes: 79 additions & 76 deletions Makefile

Large diffs are not rendered by default.

16 changes: 5 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,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.*",
Expand All @@ -97,20 +97,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",
Expand Down
Loading

0 comments on commit 7df4248

Please sign in to comment.