Merge pull request #2840 from vlauciani/master

Install 'docker' client into 'php-fpm' and 'workspace' docker image
This commit is contained in:
Shao Yu-Lung (Allen)
2021-02-10 22:29:42 +08:00
committed by GitHub
4 changed files with 34 additions and 0 deletions

View File

@ -163,6 +163,7 @@ services:
- INSTALL_LNAV=${WORKSPACE_INSTALL_LNAV}
- INSTALL_PROTOC=${WORKSPACE_INSTALL_PROTOC}
- PROTOC_VERSION=${WORKSPACE_PROTOC_VERSION}
- INSTALL_DOCKER_CLIENT=${WORKSPACE_INSTALL_DOCKER_CLIENT}
- http_proxy
- https_proxy
- no_proxy
@ -263,6 +264,7 @@ services:
- PHP_FPM_NEW_RELIC=${PHP_FPM_NEW_RELIC}
- PHP_FPM_NEW_RELIC_KEY=${PHP_FPM_NEW_RELIC_KEY}
- PHP_FPM_NEW_RELIC_APP_NAME=${PHP_FPM_NEW_RELIC_APP_NAME}
- INSTALL_DOCKER_CLIENT=${PHP_FPM_INSTALL_DOCKER_CLIENT}
- http_proxy
- https_proxy
- no_proxy