Merge pull request #123 from jdeathe/issue/122

CLOSES #122: Updates source image to 1.10.0.

Author: jdeathe

CHANGELOG.md

@@ -4,7 +4,13 @@
 
 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 - Unreleased
+
+- 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.
 
 ### 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/
 
 # -----------------------------------------------------------------------------
@@ -48,6 +48,7 @@ ENV APACHE_MPM="worker"
 # -----------------------------------------------------------------------------
 ARG RELEASE_VERSION="1.9.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,7 +1,7 @@
 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.
 

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

@@ -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"
 

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}"