summaryrefslogtreecommitdiffstats
path: root/Services/php
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2015-12-06 03:44:47 +0100
committerstartxfr <clarue@startx.fr>2015-12-06 03:44:47 +0100
commit1af7a22460dafe12f22f9b564d946f3d583f4cb0 (patch)
tree3d13d49ba4f5d6ac8cb4532435898b911bdf5a02 /Services/php
parentb502829a772adb36d4786db369aa4d803eb7877c (diff)
downloadphpmyadmin-1af7a22460dafe12f22f9b564d946f3d583f4cb0.tar.gz
phpmyadmin-1af7a22460dafe12f22f9b564d946f3d583f4cb0.tar.bz2
phpmyadmin-1af7a22460dafe12f22f9b564d946f3d583f4cb0.tar.xz
phpmyadmin-1af7a22460dafe12f22f9b564d946f3d583f4cb0.zip
debuging images and improve startup display
Diffstat (limited to 'Services/php')
-rw-r--r--Services/php/README.md4
-rw-r--r--Services/php/docker-compose.yml4
-rw-r--r--Services/php/run.sh45
3 files changed, 45 insertions, 8 deletions
diff --git a/Services/php/README.md b/Services/php/README.md
index 79f3362..d0063b6 100644
--- a/Services/php/README.md
+++ b/Services/php/README.md
@@ -18,8 +18,8 @@ based on [startx/sv-apache container](https://hub.docker.com/r/startx/sv-apache)
## Available flavours
-* `:latest` : Fedora core 23 + Apache + PHP
-* `:fc23` : Fedora core 23 + Apache + PHP
+* `:latest` : Fedora core 23 + Apache 2.4.17 + PHP 5.6.16
+* `:fc23` : Fedora core 23 + Apache 2.4.17 + PHP 5.6.16
* `:fc22` : Fedora core 22 + Apache + PHP
* `:fc21` : Fedora core 21 + Apache + PHP
* `:centos7` : CentOS 7 + Apache + PHP
diff --git a/Services/php/docker-compose.yml b/Services/php/docker-compose.yml
index 1b6d62a..16a5496 100644
--- a/Services/php/docker-compose.yml
+++ b/Services/php/docker-compose.yml
@@ -6,8 +6,8 @@ server:
cpu_shares: 5
restart: "on-failure:2"
ports:
- - "80:80"
- - "443:443"
+ - "9213:80"
+ - "9214:443"
environment:
CONTAINER_TYPE: "service"
CONTAINER_SERVICE: "php"
diff --git a/Services/php/run.sh b/Services/php/run.sh
index e365b4e..a092c56 100644
--- a/Services/php/run.sh
+++ b/Services/php/run.sh
@@ -6,9 +6,46 @@ if [[ "$0" == *"run.sh" && ! $1 = "" ]];then
eval "$@";
fi
+function display_container_php_header {
+ echo "+====================================================="
+ echo "| Container : $HOSTNAME"
+ echo "| OS : $(</etc/redhat-release)"
+ echo "| HTTP engine : $(httpd -v | head -1)"
+ echo "| PHP engine : $(php --version | head -1)"
+ if [ -v CONTAINER_TYPE ]; then
+ echo "| Type : $CONTAINER_TYPE"
+ fi
+ if [ -v CONTAINER_SERVICE ]; then
+ echo "| Service : $CONTAINER_SERVICE"
+ fi
+ if [ -v CONTAINER_INSTANCE ]; then
+ echo "| Instance : $CONTAINER_INSTANCE"
+ fi
+ if [ -v SERVER_NAME ]; then
+ echo "| ServerName : $SERVER_NAME"
+ fi
+ if [ -v APP_PATH ]; then
+ echo "| App path : $APP_PATH"
+ fi
+ if [ -v LOG_PATH ]; then
+ echo "| Log path : $LOG_PATH"
+ fi
+ echo "+====================================================="
+}
+
+# Begin configuration before starting daemonized process
+# and start generating host keys
+function begin_php_config {
+ echo "=> BEGIN APACHE + PHP CONFIGURATION"
+}
+
+# End configuration process just before starting daemon
+function end_php_config {
+ echo "=> END APACHE + PHP CONFIGURATION"
+}
+
check_httpd_environment | tee -a $STARTUPLOG
-display_container_httpd_header | tee -a $STARTUPLOG
-begin_config | tee -a $STARTUPLOG
-end_config | tee -a $STARTUPLOG
-display_container_started | tee -a $STARTUPLOG
+display_container_php_header | tee -a $STARTUPLOG
+begin_php_config | tee -a $STARTUPLOG
+end_php_config | tee -a $STARTUPLOG
start_daemon