Skip to content
Permalink
Browse files

Build Tools: Pass the current uid/gid to Docker containers.

This prepares for an upcoming change to the Docker images, which improves file permission handling.

See #47767.



git-svn-id: https://develop.svn.wordpress.org/trunk@46320 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information...
pento committed Sep 26, 2019
1 parent d2ec28b commit da43c14a5de3846161d3464e6d6075ad17d73310
Showing with 8 additions and 0 deletions.
  1. +2 −0 .travis.yml
  2. +6 −0 docker-compose.yml
@@ -20,6 +20,8 @@ env:
- COMPOSER_INSTALL: false
- NPM_INSTALL: true
- WP_INSTALL: true
- PHP_FPM_UID: "`id -u`"
- PHP_FPM_GID: "`id -g`"

matrix:
include:
@@ -39,6 +39,8 @@ services:
environment:
LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
PHP_FPM_UID: ${PHP_FPM_UID-1000}
PHP_FPM_GID: ${PHP_FPM_GID-1000}

volumes:
- ./tools/local-env/php-config.ini:/usr/local/etc/php/conf.d/php-config.ini
@@ -78,6 +80,8 @@ services:
environment:
LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
PHP_FPM_UID: ${PHP_FPM_UID-1000}
PHP_FPM_GID: ${PHP_FPM_GID-1000}

volumes:
- ./:/var/www
@@ -99,6 +103,8 @@ services:
LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
LOCAL_DIR: ${LOCAL_DIR-src}
WP_MULTISITE: ${WP_MULTISITE-false}
PHP_FPM_UID: ${PHP_FPM_UID-1000}
PHP_FPM_GID: ${PHP_FPM_GID-1000}

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

0 comments on commit da43c14

Please sign in to comment.
You can’t perform that action at this time.