summaryrefslogtreecommitdiffstats
path: root/Services/php
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2015-12-07 01:42:57 +0100
committerstartxfr <clarue@startx.fr>2015-12-07 01:42:57 +0100
commit15d8c51d28fa2245886b732df5373eedb2dde0cf (patch)
treefee07e202e87e4274aa7cea7070fc9dad368de62 /Services/php
parent7f9465928d5b149e4fb5f9bc476b8cb7298436fc (diff)
downloadphpmyadmin-15d8c51d28fa2245886b732df5373eedb2dde0cf.tar.gz
phpmyadmin-15d8c51d28fa2245886b732df5373eedb2dde0cf.tar.bz2
phpmyadmin-15d8c51d28fa2245886b732df5373eedb2dde0cf.tar.xz
phpmyadmin-15d8c51d28fa2245886b732df5373eedb2dde0cf.zip
update container naming and fix phpmyadmin.
Diffstat (limited to 'Services/php')
-rw-r--r--Services/php/docker-compose.yml2
-rw-r--r--Services/php/run.sh1
2 files changed, 2 insertions, 1 deletions
diff --git a/Services/php/docker-compose.yml b/Services/php/docker-compose.yml
index 22b7585..fe532d9 100644
--- a/Services/php/docker-compose.yml
+++ b/Services/php/docker-compose.yml
@@ -1,6 +1,6 @@
server:
build: ./
- container_name: "php-server"
+ container_name: "service-php"
mem_limit: 1g
memswap_limit: 1g
cpu_shares: 5
diff --git a/Services/php/run.sh b/Services/php/run.sh
index 657fbba..1e73c2f 100644
--- a/Services/php/run.sh
+++ b/Services/php/run.sh
@@ -53,6 +53,7 @@ function begin_php_config {
# End configuration process just before starting daemon
function end_php_config {
echo "=> END APACHE + PHP CONFIGURATION"
+ env | grep _ >> /etc/environment
}
check_httpd_environment | tee -a $STARTUPLOG