Skip to content

Commit 9e537ee

Browse files
salvo-githubbestlong
authored andcommitted
Update docker-compose.yml (laradock#2124)
The proxy args added allow to use the local env variable if setted. In this way there is not need to add the proxy server to .env file.
1 parent fbae49b commit 9e537ee

1 file changed

Lines changed: 15 additions & 1 deletion

File tree

docker-compose.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ services:
114114
- INSTALL_POWERLINE=${WORKSPACE_INSTALL_POWERLINE}
115115
- INSTALL_FFMPEG=${WORKSPACE_INSTALL_FFMPEG}
116116
- INSTALL_GNU_PARALLEL=${WORKSPACE_INSTALL_GNU_PARALLEL}
117+
- http_proxy
118+
- https_proxy
119+
- no_proxy
117120
volumes:
118121
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
119122
extra_hosts:
@@ -176,6 +179,9 @@ services:
176179
- INSTALL_MYSQL_CLIENT=${PHP_FPM_INSTALL_MYSQL_CLIENT}
177180
- ADDITIONAL_LOCALES=${PHP_FPM_ADDITIONAL_LOCALES}
178181
- INSTALL_FFMPEG=${PHP_FPM_FFMPEG}
182+
- http_proxy
183+
- https_proxy
184+
- no_proxy
179185
volumes:
180186
- ./php-fpm/php${PHP_VERSION}.ini:/usr/local/etc/php/php.ini
181187
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
@@ -251,6 +257,9 @@ services:
251257
- PHP_UPSTREAM_CONTAINER=${NGINX_PHP_UPSTREAM_CONTAINER}
252258
- PHP_UPSTREAM_PORT=${NGINX_PHP_UPSTREAM_PORT}
253259
- CHANGE_SOURCE=${CHANGE_SOURCE}
260+
- http_proxy
261+
- https_proxy
262+
- no_proxy
254263
volumes:
255264
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
256265
- ${NGINX_HOST_LOG_PATH}:/var/log/nginx
@@ -380,7 +389,12 @@ services:
380389

381390
### MariaDB ##############################################
382391
mariadb:
383-
build: ./mariadb
392+
build:
393+
context: ./mariadb
394+
args:
395+
- http_proxy
396+
- https_proxy
397+
- no_proxy
384398
volumes:
385399
- ${DATA_PATH_HOST}/mariadb:/var/lib/mysql
386400
- ${MARIADB_ENTRYPOINT_INITDB}:/docker-entrypoint-initdb.d

0 commit comments

Comments
 (0)