From dcad1b23873065e8a85d44ce375e1ebac51c765b Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Mon, 5 Mar 2018 21:50:02 +0100
Subject: [PATCH] Add new PHP container namespace

---
 .gitignore         | 11 ++++++-----
 backups/.keepme    |  0
 data/.keepme       |  0
 docker-compose.yml |  9 +++++----
 env-example        |  2 +-
 shell.sh           |  3 +--
 6 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 backups/.keepme
 create mode 100644 data/.keepme

diff --git a/.gitignore b/.gitignore
index 5408f447..366eae68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,14 +13,11 @@
 # CUSTOM
 ######################################
 
-# Keep folders
-!.keepme
-
 # Ignore variable dat
 /.env
 /log/[a-z0-9-]*
-/data/
-/backups/
+/data/*
+/backups/*
 
 # Ignore custom HTTPD configs
 /cfg/apache-2.2/*.conf
@@ -64,6 +61,10 @@
 !/bash/bashrc.sh-example
 !/bash/README.md
 
+# Keep folders
+!.keepme
+
+
 ######################################
 # GENERIC
 ######################################
diff --git a/backups/.keepme b/backups/.keepme
new file mode 100644
index 00000000..e69de29b
diff --git a/data/.keepme b/data/.keepme
new file mode 100644
index 00000000..e69de29b
diff --git a/docker-compose.yml b/docker-compose.yml
index ffc32efa..cad0e6e4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -63,7 +63,7 @@ services:
   # PHP / HHVM
   # ------------------------------------------------------------
   php:
-    image: cytopia/${PHP_SERVER:-php-fpm-7.0}:latest
+    image: devilbox/php-fpm:${PHP_SERVER:-7.0}-work
     restart: always
 
     ##
@@ -80,6 +80,7 @@ services:
       ## Debug?
       ##
       - DEBUG_COMPOSE_ENTRYPOINT
+      - DOCKER_LOGS=0
 
       ##
       ## UserID and GroupID
@@ -136,7 +137,7 @@ services:
       - ${HOST_PATH_HTTPD_DATADIR}:/shared/httpd
 
       # Mount logs
-      - ${DEVILBOX_PATH}/log/${PHP_SERVER}:/var/log/php
+      - ${DEVILBOX_PATH}/log/php-fpm-${PHP_SERVER}:/var/log/php
 
       # Mount Mail directory
       #- ${DEVILBOX_PATH}/run/mail:/var/mail
@@ -146,11 +147,11 @@ services:
 
       # Mount devilbox user-defined *.ini files in order
       # to overwrite the default PHP configuration
-      - ${DEVILBOX_PATH}/cfg/${PHP_SERVER}:/etc/php-custom.d:ro
+      - ${DEVILBOX_PATH}/cfg/php-fpm-${PHP_SERVER}:/etc/php-custom.d:ro
 
       # Mount devilbox user-defined *.so files in order
       # to load custom PHP modules
-      - ${DEVILBOX_PATH}/mod/${PHP_SERVER}:/usr/lib64/php/custom-modules:ro
+      - ${DEVILBOX_PATH}/mod/php-fpm-${PHP_SERVER}:/usr/lib64/php/custom-modules:ro
 
       # Mount devilbox user-defined bash config
       - ${DEVILBOX_PATH}/bash:/etc/bashrc-devilbox.d
diff --git a/env-example b/env-example
index 045118dd..6db9735a 100644
--- a/env-example
+++ b/env-example
@@ -172,7 +172,7 @@ DEVILBOX_UI_DISABLE=0
 #PHP_SERVER=php-fpm-5.5
 #PHP_SERVER=php-fpm-5.6
 #PHP_SERVER=php-fpm-7.0
-PHP_SERVER=php-fpm-7.1
+PHP_SERVER=7.1
 #PHP_SERVER=php-fpm-7.2
 #PHP_SERVER=hhvm-latest
 
diff --git a/shell.sh b/shell.sh
index 21e2e790..b91ad58f 100755
--- a/shell.sh
+++ b/shell.sh
@@ -1,4 +1,3 @@
 #!/bin/sh
 
-CWD="/shared/httpd"
-docker-compose exec --user devilbox php env TERM=xterm /bin/sh -c "cd ${CWD}; exec bash -l"
+docker-compose exec --user devilbox php bash -l