Merge pull request #124 from jdeathe/centos-6-develop

Release changes for 1.10.0

Author: jdeathe

CHANGELOG.md

@@ -4,7 +4,14 @@
 
 Summary of release changes for Version 1.
 
-CentOS-6 6.8 x86_64, Apache 2.2, PHP-CGI 5.3 (FastCGI), PHP memcached 1.0, PHP APC 3.1.
+CentOS-6 6.9 x86_64, Apache 2.2, PHP-CGI 5.3 (FastCGI), PHP memcached 1.0, PHP APC 3.1.
+
+### 1.10.0 - 2017-07-16
+
+- Updates image source to [release 1.10.0](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.10.0).
+- Fixes issue with missing APACHE_SSL_* environment variables for make,scmi and systemd.
+- Adds test case output with improved readability.
+- Adds simplified port incrementation handling to systemd unit and make consistent with SCMI.
 
 ### 1.9.0 - 2017-02-07
 

Dockerfile

@@ -4,17 +4,17 @@
 # CentOS-6, Apache 2.2, PHP 5.3, PHP Memcached 1.0, PHP APC 3.1.
 # 
 # =============================================================================
-FROM jdeathe/centos-ssh-apache-php:1.9.0
-
-MAINTAINER James Deathe <james.deathe@gmail.com>
+FROM jdeathe/centos-ssh-apache-php:1.10.0
 
 # -----------------------------------------------------------------------------
 # FastCGI support
 # -----------------------------------------------------------------------------
 RUN rpm --rebuilddb \
 	&& yum -y erase \
-		php-5.3.3-48.el6_8 \
-	&& yum --setopt=tsflags=nodocs -y install \
+		php-5.3.3-49.el6 \
+	&& yum -y install \
+		--setopt=tsflags=nodocs \
+		--disableplugin=fastestmirror \
 		fcgi-2.4.0-12.el6 \
 		mod_fcgid-2.3.9-1.el6 \
 	&& yum versionlock add \
@@ -26,9 +26,9 @@ RUN rpm --rebuilddb \
 # -----------------------------------------------------------------------------
 # Copy files into place
 # -----------------------------------------------------------------------------
-ADD opt/scmi \
+ADD src/opt/scmi \
 	/opt/scmi/
-ADD etc/systemd/system \
+ADD src/etc/systemd/system \
 	/etc/systemd/system/
 
 # -----------------------------------------------------------------------------
@@ -46,8 +46,9 @@ ENV APACHE_MPM="worker"
 # -----------------------------------------------------------------------------
 # Set image metadata
 # -----------------------------------------------------------------------------
-ARG RELEASE_VERSION="1.9.0"
+ARG RELEASE_VERSION="1.10.0"
 LABEL \
+	maintainer="James Deathe <james.deathe@gmail.com>" \
 	install="docker run \
 --rm \
 --privileged \
@@ -76,6 +77,6 @@ jdeathe/centos-ssh-apache-php-fcgi:${RELEASE_VERSION} \
 	org.deathe.license="MIT" \
 	org.deathe.vendor="jdeathe" \
 	org.deathe.url="https://github.com/jdeathe/centos-ssh-apache-php-fcgi" \
-	org.deathe.description="CentOS-6 6.8 x86_64 - Apache 2.2, PHP-CGI 5.3 (FastCGI), PHP memcached 1.0, PHP APC 3.1."
+	org.deathe.description="CentOS-6 6.9 x86_64 - Apache 2.2, PHP-CGI 5.3 (FastCGI), PHP memcached 1.0, PHP APC 3.1."
 
 CMD ["/usr/sbin/httpd-startup", "/usr/bin/supervisord", "--configuration=/etc/supervisord.conf"]

Makefile

@@ -26,8 +26,8 @@ Targets:
                             DOCKER_IMAGE_TAG variable.
   logs                      Display log output from the running container.
   logs-delayed              Display log output from the running container after
-                            backing off shortly. This can be necessary when 
-                            chaining make targets together.
+                            backing off for STARTUP_TIME seconds. This can be 
+                            necessary when chaining make targets together.
   pause                     Pause the running container.
   pull                      Pull the release image from the registry. Requires 
                             the DOCKER_IMAGE_TAG variable.
@@ -61,6 +61,9 @@ Variables:
                             artifacts are placed.
   - NO_CACHE                When true, no cache will be used while running the 
                             build target.
+  - STARTUP_TIME            Defines the number of seconds expected to complete 
+                            the startup process, including the bootstrap where 
+                            applicable.
 
 endef
 
@@ -357,7 +360,7 @@ logs: _prerequisites
 	@ $(docker) logs $(DOCKER_NAME)
 
 logs-delayed: _prerequisites
-	@ sleep 2
+	@ sleep $(STARTUP_TIME)
 	@ $(MAKE) logs
 
 load: _prerequisites _require-docker-release-tag _require-package-path

README-short.txt

@@ -1 +1 @@
-CentOS-6 6.8 x86_64 - Apache / PHP-CGI (FastCGI) / PHP memcached / PHP APC.
+CentOS-6 6.9 x86_64 - Apache / PHP-CGI (FastCGI) / PHP memcached / PHP APC.

README.md

@@ -1,15 +1,15 @@
 centos-ssh-apache-php-fcgi
 ==========================
 
-Docker Image including CentOS-6 6.8 x86_64, Apache 2.2, PHP-CGI 5.3 (FastCGI), PHP memcached 1.0, PHP APC 3.1.
+Docker Image including CentOS-6 6.9 x86_64, Apache 2.2, PHP-CGI 5.3 (FastCGI), PHP memcached 1.0, PHP APC 3.1.
 
 Apache PHP web server, loading only a minimal set of Apache modules by default. Supports custom configuration via environment variables.
 
 ## Overview & links
 
-The latest CentOS-6 based release can be pulled from the centos-6 Docker tag. For a specific release tag the convention is `centos-6-1.9.0` or `1.9.0` for the [1.9.0](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/1.7.0) release tag.
+The latest CentOS-6 based release can be pulled from the centos-6 Docker tag. For a specific release tag the convention is `centos-6-1.10.0` or `1.10.0` for the [1.10.0](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/1.7.0) release tag.
 
-- `centos-6`, `centos-6-1.9.0`, `1.9.0` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-6/Dockerfile)
+- `centos-6`, `centos-6-1.10.0`, `1.10.0` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-6/Dockerfile)
 
 This build of [Apache](https://httpd.apache.org/), (httpd CentOS package), uses the [mod_fcgid](https://httpd.apache.org/mod_fcgid/) module to run [PHP](http://php.net/) as a [FastCGI](http://www.fastcgi.com/) process.
 
@@ -87,10 +87,10 @@ $ docker run \
   --volume /:/media/root \
   --env BASH_ENV="" \
   --env ENV="" \
-  jdeathe/centos-ssh-apache-php-fcgi:1.9.0 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.0 \
   /usr/sbin/scmi install \
     --chroot=/media/root \
-    --tag=1.9.0 \
+    --tag=1.10.0 \
     --name=apache-php.pool-1.1.1
 ```
 
@@ -105,10 +105,10 @@ $ docker run \
   --volume /:/media/root \
   --env BASH_ENV="" \
   --env ENV="" \
-  jdeathe/centos-ssh-apache-php-fcgi:1.9.0 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.0 \
   /usr/sbin/scmi uninstall \
     --chroot=/media/root \
-    --tag=1.9.0 \
+    --tag=1.10.0 \
     --name=apache-php.pool-1.1.1
 ```
 
@@ -123,10 +123,10 @@ $ docker run \
   --volume /:/media/root \
   --env BASH_ENV="" \
   --env ENV="" \
-  jdeathe/centos-ssh-apache-php-fcgi:1.9.0 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.0 \
   /usr/sbin/scmi install \
     --chroot=/media/root \
-    --tag=1.9.0 \
+    --tag=1.10.0 \
     --name=apache-php.pool-1.1.1 \
     --manager=systemd \
     --register \
@@ -148,7 +148,7 @@ To see detailed information about the image run `scmi` with the `--info` option.
 $ eval "sudo -E $(
     docker inspect \
     -f "{{.ContainerConfig.Labels.install}}" \
-    jdeathe/centos-ssh-apache-php-fcgi:1.9.0
+    jdeathe/centos-ssh-apache-php-fcgi:1.10.0
   ) --info"
 ```
 
@@ -158,7 +158,7 @@ To perform an installation using the docker name `apache-php.pool-1.2.1` simply
 $ eval "sudo -E $(
     docker inspect \
     -f "{{.ContainerConfig.Labels.install}}" \
-    jdeathe/centos-ssh-apache-php-fcgi:1.9.0
+    jdeathe/centos-ssh-apache-php-fcgi:1.10.0
   ) --name=apache-php.pool-1.2.1"
 ```
 
@@ -168,7 +168,7 @@ To uninstall use the *same command* that was used to install but with the `unins
 $ eval "sudo -E $(
     docker inspect \
     -f "{{.ContainerConfig.Labels.uninstall}}" \
-    jdeathe/centos-ssh-apache-php-fcgi:1.9.0
+    jdeathe/centos-ssh-apache-php-fcgi:1.10.0
   ) --name=apache-php.pool-1.2.1"
 ```
 
@@ -179,15 +179,15 @@ With the addition of install/uninstall image labels it is possible to use [Proje
 _NOTE:_ A prerequisite of the following examples is that the image has been pulled (or loaded from the release package).
 
 ```
-$ docker pull jdeathe/centos-ssh-apache-php-fcgi:1.9.0
+$ docker pull jdeathe/centos-ssh-apache-php-fcgi:1.10.0
 ```
 
 To see detailed information about the image run `scmi` with the `--info` option. To see all available `scmi` options run with the `--help` option.
 
 ```
 $ sudo -E atomic install \
   -n apache-php.pool-1.3.1 \
-  jdeathe/centos-ssh-apache-php-fcgi:1.9.0 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.0 \
   --info
 ```
 
@@ -196,14 +196,14 @@ To perform an installation using the docker name `apache-php.pool-1.3.1` simply
 ```
 $ sudo -E atomic install \
   -n apache-php.pool-1.3.1 \
-  jdeathe/centos-ssh-apache-php-fcgi:1.9.0
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.0
 ```
 
 Alternatively, you could use the `scmi` options `--name` or `-n` for naming the container.
 
 ```
 $ sudo -E atomic install \
-  jdeathe/centos-ssh-apache-php-fcgi:1.9.0 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.0 \
   --name apache-php.pool-1.3.1
 ```
 
@@ -212,7 +212,7 @@ To uninstall use the *same command* that was used to install but with the `unins
 ```
 $ sudo -E atomic uninstall \
   -n apache-php.pool-1.3.1 \
-  jdeathe/centos-ssh-apache-php-fcgi:1.9.0
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.0
 ```
 
 #### Environment Variables

default.mk

@@ -19,6 +19,9 @@ define DOCKER_CONTAINER_PARAMETERS
 --env "APACHE_RUN_USER=$(APACHE_RUN_USER)" \
 --env "APACHE_SERVER_ALIAS=$(APACHE_SERVER_ALIAS)" \
 --env "APACHE_SERVER_NAME=$(APACHE_SERVER_NAME)" \
+--env "APACHE_SSL_CERTIFICATE=$(APACHE_SSL_CERTIFICATE)" \
+--env "APACHE_SSL_CIPHER_SUITE=$(APACHE_SSL_CIPHER_SUITE)" \
+--env "APACHE_SSL_PROTOCOL=$(APACHE_SSL_PROTOCOL)" \
 --env "APACHE_SYSTEM_USER=$(APACHE_SYSTEM_USER)" \
 --env "PHP_OPTIONS_DATE_TIMEZONE=$(PHP_OPTIONS_DATE_TIMEZONE)"
 endef

environment.mk

@@ -29,6 +29,9 @@ NO_CACHE ?= false
 # Directory path for release packages
 DIST_PATH ?= ./dist
 
+# Number of seconds expected to complete container startup including bootstrap.
+STARTUP_TIME ?= 2
+
 # ------------------------------------------------------------------------------
 # Application container configuration
 # ------------------------------------------------------------------------------
@@ -62,5 +65,8 @@ APACHE_RUN_GROUP ?= app-www
 APACHE_RUN_USER ?= app-www
 APACHE_SERVER_ALIAS ?=
 APACHE_SERVER_NAME ?=
+APACHE_SSL_CERTIFICATE ?=
+APACHE_SSL_CIPHER_SUITE ?= ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS
+APACHE_SSL_PROTOCOL ?= All -SSLv2 -SSLv3
 APACHE_SYSTEM_USER ?= app
 PHP_OPTIONS_DATE_TIMEZONE ?= UTC

etc/systemd/system/centos-ssh-apache-php-fcgi.register@.service renamed to src/etc/systemd/system/centos-ssh-apache-php-fcgi.register@.service

@@ -52,7 +52,7 @@ Environment="DOCKER_USER=jdeathe"
 Environment="DOCKER_CONTAINER_OPTS="
 Environment="DOCKER_IMAGE_PACKAGE_PATH=/var/opt/scmi/packages"
 Environment="DOCKER_IMAGE_NAME=centos-ssh-apache-php-fcgi"
-Environment="DOCKER_IMAGE_TAG=1.9.0"
+Environment="DOCKER_IMAGE_TAG=1.10.0"
 Environment="DOCKER_PORT_MAP_TCP_80=8080"
 Environment="DOCKER_PORT_MAP_TCP_443=9443"
 Environment="DOCKER_PORT_MAP_TCP_8443=NULL"
@@ -72,6 +72,9 @@ Environment="APACHE_RUN_GROUP=app-www"
 Environment="APACHE_RUN_USER=app-www"
 Environment="APACHE_SERVER_ALIAS="
 Environment="APACHE_SERVER_NAME="
+Environment="APACHE_SSL_CERTIFICATE="
+Environment="APACHE_SSL_CIPHER_SUITE=ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS"
+Environment="APACHE_SSL_PROTOCOL=All -SSLv2 -SSLv3"
 Environment="APACHE_SYSTEM_USER=app"
 Environment="PHP_OPTIONS_DATE_TIMEZONE=UTC"
 
@@ -103,42 +106,6 @@ ExecStartPre=-/bin/bash -c \
 ExecStart=/bin/bash -c \
   "exec /usr/bin/docker run \
     --name %p.%i \
-    $(\
-      if [[ ${DOCKER_PORT_MAP_TCP_80} != NULL ]]; then \
-        if [[ -n $(/usr/bin/gawk 'match($0, /^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}:)?([0-9]+)$/, matches) { print matches[2]; }' <<< \"${DOCKER_PORT_MAP_TCP_80}\") ]]; then \
-          printf -- '--publish %%s%%s:80' \
-            \"$(/usr/bin/gawk 'match($0, /^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}:)?([0-9]+)$/, matches) { print matches[1]; }' <<< \"${DOCKER_PORT_MAP_TCP_80}\")\" \
-            \"$(( $(/usr/bin/gawk 'match($0, /^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}:)?([0-9]+)$/, matches) { print matches[2]; }' <<< \"${DOCKER_PORT_MAP_TCP_80}\") + $(/usr/bin/awk -F. '$0=$1' <<< %i) - 1 ))\"; \
-        else \
-          printf -- '--publish %%s:80' \
-            \"${DOCKER_PORT_MAP_TCP_80}\"; \
-        fi; \
-      fi; \
-    ) \
-    $(\
-      if [[ ${DOCKER_PORT_MAP_TCP_443} != NULL ]] && [[ ${APACHE_MOD_SSL_ENABLED} == true ]]; then \
-        if [[ -n $(/usr/bin/gawk 'match($0, /^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}:)?([0-9]+)$/, matches) { print matches[2]; }' <<< \"${DOCKER_PORT_MAP_TCP_443}\") ]]; then \
-          printf -- '--publish %%s%%s:443' \
-            \"$(/usr/bin/gawk 'match($0, /^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}:)?([0-9]+)$/, matches) { print matches[1]; }' <<< \"${DOCKER_PORT_MAP_TCP_443}\")\" \
-            \"$(( $(/usr/bin/gawk 'match($0, /^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}:)?([0-9]+)$/, matches) { print matches[2]; }' <<< \"${DOCKER_PORT_MAP_TCP_443}\") + $(/usr/bin/awk -F. '$0=$1' <<< %i) - 1 ))\"; \
-        else \
-          printf -- '--publish %%s:443' \
-            \"${DOCKER_PORT_MAP_TCP_443}\"; \
-        fi; \
-      fi; \
-    ) \
-    $(\
-      if [[ ${DOCKER_PORT_MAP_TCP_8443} != NULL ]]; then \
-        if [[ -n $(/usr/bin/gawk 'match($0, /^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}:)?([0-9]+)$/, matches) { print matches[2]; }' <<< \"${DOCKER_PORT_MAP_TCP_8443}\") ]]; then \
-          printf -- '--publish %%s%%s:8443' \
-            \"$(/usr/bin/gawk 'match($0, /^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}:)?([0-9]+)$/, matches) { print matches[1]; }' <<< \"${DOCKER_PORT_MAP_TCP_8443}\")\" \
-            \"$(( $(/usr/bin/gawk 'match($0, /^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}:)?([0-9]+)$/, matches) { print matches[2]; }' <<< \"${DOCKER_PORT_MAP_TCP_8443}\") + $(/usr/bin/awk -F. '$0=$1' <<< %i) - 1 ))\"; \
-        else \
-          printf -- '--publish %%s:8443' \
-            \"${DOCKER_PORT_MAP_TCP_8443}\"; \
-        fi; \
-      fi; \
-    ) \
     --env \"APACHE_CONTENT_ROOT=${APACHE_CONTENT_ROOT}\" \
     --env \"APACHE_CUSTOM_LOG_FORMAT=${APACHE_CUSTOM_LOG_FORMAT}\" \
     --env \"APACHE_CUSTOM_LOG_LOCATION=${APACHE_CUSTOM_LOG_LOCATION}\" \
@@ -155,8 +122,41 @@ ExecStart=/bin/bash -c \
     --env \"APACHE_RUN_USER=${APACHE_RUN_USER}\" \
     --env \"APACHE_SERVER_ALIAS=${APACHE_SERVER_ALIAS}\" \
     --env \"APACHE_SERVER_NAME=${APACHE_SERVER_NAME}\" \
+    --env \"APACHE_SSL_CERTIFICATE=${APACHE_SSL_CERTIFICATE}\" \
+    --env \"APACHE_SSL_CIPHER_SUITE=${APACHE_SSL_CIPHER_SUITE}\" \
+    --env \"APACHE_SSL_PROTOCOL=${APACHE_SSL_PROTOCOL}\" \
     --env \"APACHE_SYSTEM_USER=${APACHE_SYSTEM_USER}\" \
     --env \"PHP_OPTIONS_DATE_TIMEZONE=${PHP_OPTIONS_DATE_TIMEZONE}\" \
+    $(if [[ ${DOCKER_PORT_MAP_TCP_80} != NULL ]]; then \
+      if /usr/bin/grep -qE '^([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}:)?[0-9]*$' <<< \"${DOCKER_PORT_MAP_TCP_80}\"; then \
+        printf -- '--publish %%s%%s:80' \
+          $(/usr/bin/grep -o '^[0-9\.]*:' <<< \"${DOCKER_PORT_MAP_TCP_80}\") \
+          $(( $(/usr/bin/grep -o '[0-9]*$' <<< \"${DOCKER_PORT_MAP_TCP_80}\") + $(/usr/bin/sed 's~\.[0-9]*$~~' <<< %i) - 1 )); \
+      else \
+        printf -- '--publish %%s:80' \
+          \"${DOCKER_PORT_MAP_TCP_80}\"; \
+      fi; \
+    fi) \
+    $(if [[ ${DOCKER_PORT_MAP_TCP_443} != NULL ]]; then \
+      if /usr/bin/grep -qE '^([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}:)?[0-9]*$' <<< \"${DOCKER_PORT_MAP_TCP_443}\"; then \
+        printf -- '--publish %%s%%s:443' \
+          $(/usr/bin/grep -o '^[0-9\.]*:' <<< \"${DOCKER_PORT_MAP_TCP_443}\") \
+          $(( $(/usr/bin/grep -o '[0-9]*$' <<< \"${DOCKER_PORT_MAP_TCP_443}\") + $(/usr/bin/sed 's~\.[0-9]*$~~' <<< %i) - 1 )); \
+      else \
+        printf -- '--publish %%s:443' \
+          \"${DOCKER_PORT_MAP_TCP_443}\"; \
+      fi; \
+    fi) \
+    $(if [[ ${DOCKER_PORT_MAP_TCP_8443} != NULL ]]; then \
+      if /usr/bin/grep -qE '^([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}:)?[0-9]*$' <<< \"${DOCKER_PORT_MAP_TCP_8443}\"; then \
+        printf -- '--publish %%s%%s:8443' \
+          $(/usr/bin/grep -o '^[0-9\.]*:' <<< \"${DOCKER_PORT_MAP_TCP_8443}\") \
+          $(( $(/usr/bin/grep -o '[0-9]*$' <<< \"${DOCKER_PORT_MAP_TCP_8443}\") + $(/usr/bin/sed 's~\.[0-9]*$~~' <<< %i) - 1 )); \
+      else \
+        printf -- '--publish %%s:8443' \
+          \"${DOCKER_PORT_MAP_TCP_8443}\"; \
+      fi; \
+    fi) \
     ${DOCKER_CONTAINER_OPTS} \
     ${DOCKER_USER}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}; \
   "

etc/systemd/system/centos-ssh-apache-php-fcgi@.service renamed to src/etc/systemd/system/centos-ssh-apache-php-fcgi@.service

@@ -28,6 +28,9 @@ NO_CACHE="${NO_CACHE:-false}"
 # Directory path for release packages
 DIST_PATH="${DIST_PATH:-./dist}"
 
+# Number of seconds expected to complete container startup including bootstrap.
+STARTUP_TIME="${STARTUP_TIME:-2}"
+
 # ETCD register service settings
 REGISTER_ETCD_PARAMETERS="${REGISTER_ETCD_PARAMETERS:-}"
 REGISTER_TTL="${REGISTER_TTL:-60}"
@@ -66,5 +69,8 @@ APACHE_RUN_GROUP="${APACHE_RUN_GROUP:-app-www}"
 APACHE_RUN_USER="${APACHE_RUN_USER:-app-www}"
 APACHE_SERVER_ALIAS="${APACHE_SERVER_ALIAS:-}"
 APACHE_SERVER_NAME="${APACHE_SERVER_NAME:-}"
+APACHE_SSL_CERTIFICATE="${APACHE_SSL_CERTIFICATE:-}"
+APACHE_SSL_CIPHER_SUITE="${APACHE_SSL_CIPHER_SUITE:-"ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS"}"
+APACHE_SSL_PROTOCOL="${APACHE_SSL_PROTOCOL:-All -SSLv2 -SSLv3}"
 APACHE_SYSTEM_USER="${APACHE_SYSTEM_USER:-app}"
 PHP_OPTIONS_DATE_TIMEZONE="${PHP_OPTIONS_DATE_TIMEZONE:-UTC}"