From da43c14a5de3846161d3464e6d6075ad17d73310 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <pento@git.wordpress.org>
Date: Thu, 26 Sep 2019 04:57:38 +0000
Subject: [PATCH] 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
---
 .travis.yml        | 2 ++
 docker-compose.yml | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index cfd15e10b8..bdc6fb3938 100644
--- a/.travis.yml
+++ b/.travis.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:
diff --git a/docker-compose.yml b/docker-compose.yml
index 520dcb3383..ab898800b1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -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