Replaced PHP_UID/GID with EFFECTIVE_UID/GID

Fixes #61

Author: mblaschke

CHANGELOG.md

@@ -1,6 +1,10 @@
 TYPO3 Docker Boilerplate Changelog
 ==================================
 
+UPCOMING
+-------------------------------------
+- Renamed `PHP_UID` and `PHP_GID` to `EFFECTIVE_UID` and `EFFECTIVE_GID`
+
 3.3.1 - 2015-05-11
 -------------------------------------
 - Fixed ssl certificate

docker-env.yml

@@ -37,8 +37,10 @@ MYSQL_DATABASE=typo3
 
 # PHP Settings
 PHP_TIMEZONE=UTC
-PHP_UID=1000
-PHP_GID=1000
+
+# Permission settings
+EFFECTIVE_UID=1000
+EFFECTIVE_GID=1000
 
 # Default cli user (should be www-data)
 CLI_USER=www-data

docker/httpd/entrypoint.sh

@@ -1,5 +1,13 @@
 #!/bin/bash
 
+###################
+# UID/GID
+###################
+
+## Set uid/gid for www-data user
+usermod  --uid "${EFFECTIVE_UID}" --shell /bin/bash --home /home daemon > /dev/null
+groupmod --gid "${EFFECTIVE_GID}" daemon > /dev/null
+
 ###################
 # httpd.conf
 ###################

docker/main/bin/init-system.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 ## Set uid/gid for www-data user
-usermod  --uid "${PHP_UID}" --shell /bin/bash --home /home www-data > /dev/null
-groupmod --gid "${PHP_GID}" www-data > /dev/null
+usermod  --uid "${EFFECTIVE_UID}" --shell /bin/bash --home /home www-data > /dev/null
+groupmod --gid "${EFFECTIVE_GID}" www-data > /dev/null

docker/nginx/entrypoint.sh

@@ -1,5 +1,13 @@
 #!/bin/bash
 
+###################
+# UID/GID
+###################
+
+## Set uid/gid for www-data user
+usermod  --uid "${EFFECTIVE_UID}" --shell /bin/bash --home /home nginx > /dev/null
+groupmod --gid "${EFFECTIVE_GID}" nginx > /dev/null
+
 ###################
 # vhost
 ###################

documentation/DOCKER-INFO.md

@@ -125,8 +125,8 @@ MYSQL_PASSWORD        | Password for initial MySQL user
 MYSQL_DATABASE        | Initial created MySQL database
 <br>                  |
 PHP_TIMEZONE          | Timezone (date.timezone) setting for PHP (cli and fpm)
-PHP_UID               | Effective UID for www-data (cli and fpm)
-PHP_GID               | Effective GID for www-data (cli and fpm)
+EFFECTIVE_UID         | Effective UID for php, fpm und webserver
+EFFECTIVE_GID         | Effective GID for php, fpm und webserver
 
 ## Xdebug Remote debugger (PhpStorm)