Skip to content

Commit f1d60e8

Browse files
committed
Build/Test Tools: Update environment variables in Docker compose file.
Follow up to [58598]. Merges [51673] to the 5.7 branch. Props pbrearne, ocean90, johnbillion, desrosj. See #61213, #53820. git-svn-id: https://develop.svn.wordpress.org/branches/5.7@58599 602fd350-edb4-49c9-b593-d223f7449a82
1 parent ebc6eec commit f1d60e8

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

docker-compose.yml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ services:
3737
- wpdevnet
3838

3939
environment:
40-
LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
41-
LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
42-
PHP_FPM_UID: ${PHP_FPM_UID-1000}
43-
PHP_FPM_GID: ${PHP_FPM_GID-1000}
40+
- LOCAL_PHP_XDEBUG=${LOCAL_PHP_XDEBUG-false}
41+
- LOCAL_PHP_MEMCACHED=${LOCAL_PHP_MEMCACHED-false}
42+
- PHP_FPM_UID=${PHP_FPM_UID-1000}
43+
- PHP_FPM_GID=${PHP_FPM_GID-1000}
4444

4545
volumes:
4646
- ./tools/local-env/php-config.ini:/usr/local/etc/php/conf.d/php-config.ini
@@ -103,16 +103,14 @@ services:
103103
- wpdevnet
104104

105105
environment:
106-
LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
107-
LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
108-
LOCAL_DIR: ${LOCAL_DIR-src}
109-
WP_MULTISITE: ${WP_MULTISITE-false}
110-
PHP_FPM_UID: ${PHP_FPM_UID-1000}
111-
PHP_FPM_GID: ${PHP_FPM_GID-1000}
112-
TRAVIS_BRANCH: ${TRAVIS_BRANCH-false}
113-
TRAVIS_PULL_REQUEST: ${TRAVIS_PULL_REQUEST-false}
114-
GITHUB_REF: ${GITHUB_REF-false}
115-
GITHUB_EVENT_NAME: ${GITHUB_EVENT_NAME-false}
106+
- LOCAL_PHP_XDEBUG=${LOCAL_PHP_XDEBUG-false}
107+
- LOCAL_PHP_MEMCACHED=${LOCAL_PHP_MEMCACHED-false}
108+
- LOCAL_DIR=${LOCAL_DIR-src}
109+
- WP_MULTISITE=${WP_MULTISITE-false}
110+
- PHP_FPM_UID=${PHP_FPM_UID-1000}
111+
- PHP_FPM_GID=${PHP_FPM_GID-1000}
112+
- GITHUB_REF=${GITHUB_REF-false}
113+
- GITHUB_EVENT_NAME=${GITHUB_EVENT_NAME-false}
116114

117115
volumes:
118116
- ./tools/local-env/phpunit-config.ini:/usr/local/etc/php/conf.d/phpunit-config.ini

0 commit comments

Comments
 (0)