diff options
| author | startxfr <clarue@startx.fr> | 2015-12-06 03:44:47 +0100 |
|---|---|---|
| committer | startxfr <clarue@startx.fr> | 2015-12-06 03:44:47 +0100 |
| commit | 1af7a22460dafe12f22f9b564d946f3d583f4cb0 (patch) | |
| tree | 3d13d49ba4f5d6ac8cb4532435898b911bdf5a02 /Services/apache | |
| parent | b502829a772adb36d4786db369aa4d803eb7877c (diff) | |
| download | phpmyadmin-1af7a22460dafe12f22f9b564d946f3d583f4cb0.tar.gz phpmyadmin-1af7a22460dafe12f22f9b564d946f3d583f4cb0.tar.bz2 phpmyadmin-1af7a22460dafe12f22f9b564d946f3d583f4cb0.tar.xz phpmyadmin-1af7a22460dafe12f22f9b564d946f3d583f4cb0.zip | |
debuging images and improve startup display
Diffstat (limited to 'Services/apache')
| -rw-r--r-- | Services/apache/README.md | 4 | ||||
| -rw-r--r-- | Services/apache/docker-compose.yml | 4 | ||||
| -rw-r--r-- | Services/apache/sx-httpd.sh | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Services/apache/README.md b/Services/apache/README.md index 81afb68..48aa4a0 100644 --- a/Services/apache/README.md +++ b/Services/apache/README.md @@ -18,8 +18,8 @@ based on [startx/fedora container](https://hub.docker.com/r/startx/fedora) ## Available flavours -* `:latest` : Fedora core 23 + Apache -* `:fc23` : Fedora core 23 + Apache +* `:latest` : Fedora core 23 + Apache 2.4.17 +* `:fc23` : Fedora core 23 + Apache 2.4.17 * `:fc22` : Fedora core 22 + Apache * `:fc21` : Fedora core 21 + Apache * `:centos7` : CentOS 7 + Apache diff --git a/Services/apache/docker-compose.yml b/Services/apache/docker-compose.yml index bb4617f..44c8a5b 100644 --- a/Services/apache/docker-compose.yml +++ b/Services/apache/docker-compose.yml @@ -6,8 +6,8 @@ server: cpu_shares: 2 restart: "on-failure:2" ports: - - "80:80" - - "443:443" + - "9201:80" + - "9202:443" environment: CONTAINER_TYPE: "service" CONTAINER_SERVICE: "apache" diff --git a/Services/apache/sx-httpd.sh b/Services/apache/sx-httpd.sh index ec8c6bb..2b7581d 100644 --- a/Services/apache/sx-httpd.sh +++ b/Services/apache/sx-httpd.sh @@ -28,12 +28,12 @@ function display_container_httpd_header { if [ -v CONTAINER_TYPE ]; then echo "| Type : $CONTAINER_TYPE" fi - if [ -v CONTAINER_INSTANCE ]; then - echo "| Instance : $CONTAINER_INSTANCE" - 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 |