sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Gary Pendergast 2019-09-26 04:57:38 +00:00
parent d2ec28bfdd
commit da43c14a5d
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -20,6 +20,8 @@ env:
- COMPOSER_INSTALL: false - COMPOSER_INSTALL: false
- NPM_INSTALL: true - NPM_INSTALL: true
- WP_INSTALL: true - WP_INSTALL: true
- PHP_FPM_UID: "`id -u`"
- PHP_FPM_GID: "`id -g`"
matrix: matrix:
include: include:

6
docker-compose.yml
View File

@ -39,6 +39,8 @@ services:
environment: environment:
LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false} LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false} LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
PHP_FPM_UID: ${PHP_FPM_UID-1000}
PHP_FPM_GID: ${PHP_FPM_GID-1000}
volumes: volumes:
- ./tools/local-env/php-config.ini:/usr/local/etc/php/conf.d/php-config.ini - ./tools/local-env/php-config.ini:/usr/local/etc/php/conf.d/php-config.ini
@ -78,6 +80,8 @@ services:
environment: environment:
LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false} LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false} LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
PHP_FPM_UID: ${PHP_FPM_UID-1000}
PHP_FPM_GID: ${PHP_FPM_GID-1000}
volumes: volumes:
- ./:/var/www - ./:/var/www
@ -99,6 +103,8 @@ services:
LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false} LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
LOCAL_DIR: ${LOCAL_DIR-src} LOCAL_DIR: ${LOCAL_DIR-src}
WP_MULTISITE: ${WP_MULTISITE-false} WP_MULTISITE: ${WP_MULTISITE-false}
PHP_FPM_UID: ${PHP_FPM_UID-1000}
PHP_FPM_GID: ${PHP_FPM_GID-1000}
volumes: volumes:
- ./tools/local-env/phpunit-config.ini:/usr/local/etc/php/conf.d/phpunit-config.ini - ./tools/local-env/phpunit-config.ini:/usr/local/etc/php/conf.d/phpunit-config.ini