Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit a24994d

Browse files
author
DKravtsov
committed
Improved environment configuration, updated composer dependencies and documentation.
1 parent 4457812 commit a24994d

36 files changed

+1614
-1473
lines changed

‎.env.dev

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
###> docker configuration ###
2+
WEB_PORT_HTTP=80
3+
WEB_PORT_SSL=443
4+
# XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
5+
XDEBUG_CONFIG=main
6+
# 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
7+
INNODB_USE_NATIVE_AIO=1
8+
###< docker configuration ###
9+
110
APP_NAME=Laravel
211
APP_ENV=dev
312
APP_KEY=base64:KgeWah2LwOk5HLjCYuIZjaQQwX59ASqUjCKZMD6H4Ew=

‎.env.prod

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
###> docker configuration ###
2+
WEB_PORT_HTTP=80
3+
WEB_PORT_SSL=443
4+
# 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
5+
INNODB_USE_NATIVE_AIO=1
6+
###< docker configuration ###
7+
18
APP_NAME=Laravel
29
APP_ENV=prod
310
APP_KEY=

‎.env.staging

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
###> docker configuration ###
2+
WEB_PORT_HTTP=80
3+
WEB_PORT_SSL=443
4+
# 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
5+
INNODB_USE_NATIVE_AIO=1
6+
###< docker configuration ###
7+
18
APP_NAME=Laravel
29
APP_ENV=staging
310
APP_KEY=

‎.env.test

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
###> docker configuration ###
2+
WEB_PORT_HTTP=80
3+
WEB_PORT_SSL=443
4+
# XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
5+
XDEBUG_CONFIG=main
6+
# 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
7+
INNODB_USE_NATIVE_AIO=1
8+
###< docker configuration ###
9+
110
APP_NAME=Laravel
211
APP_ENV=test
312
APP_KEY=base64:KgeWah2LwOk5HLjCYuIZjaQQwX59ASqUjCKZMD6H4Ew=

‎.env.test-ci

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
# by default test environment using .env.test. So all tests will use the same database. If you need to separate it, just use make env-test-ci command and then run migrations and seed.
2+
3+
###> docker configuration ###
4+
WEB_PORT_HTTP=80
5+
WEB_PORT_SSL=443
6+
# XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
7+
XDEBUG_CONFIG=main
8+
# 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
9+
INNODB_USE_NATIVE_AIO=1
10+
###< docker configuration ###
11+
212
APP_NAME=Laravel
313
APP_ENV=test
414
APP_KEY=base64:KgeWah2LwOk5HLjCYuIZjaQQwX59ASqUjCKZMD6H4Ew=

‎Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ ARG HOST_GID=1000
99
ENV USERNAME=www-data
1010
ARG INSIDE_DOCKER_CONTAINER=1
1111
ENV INSIDE_DOCKER_CONTAINER=$INSIDE_DOCKER_CONTAINER
12+
ARG XDEBUG_CONFIG=main
13+
ENV XDEBUG_CONFIG=$XDEBUG_CONFIG
1214

1315
# check environment
1416
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; \
@@ -60,7 +62,7 @@ COPY ./docker/$BUILD_ARGUMENT_ENV/php.ini /usr/local/etc/php/php.ini
6062

6163
# install Xdebug in case dev/test environment
6264
COPY ./docker/general/do_we_need_xdebug.sh /tmp/
63-
COPY ./docker/dev/xdebug.ini /tmp/
65+
COPY ./docker/dev/xdebug-${XDEBUG_CONFIG}.ini /tmp/xdebug.ini
6466
RUN chmod u+x /tmp/do_we_need_xdebug.sh && /tmp/do_we_need_xdebug.sh
6567

6668
# install composer

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /