Merge pull request #552 from jdeathe/centos-6-httpd24u-php56u-develop

Release changes for 2.2.5
jdeathe · May 20, 2018 · 4b436cc · 4b436cc
2 parents 75329f7 + 250f3d1
commit 4b436cc
Show file tree

Hide file tree

Showing 16 changed files with 353 additions and 194 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,16 @@ Summary of release changes for Version 2.
 
 CentOS-6 6.9 x86_64, Apache 2.4, PHP-FPM 5.6, PHP memcached 2.2, Zend Opcache 7.0.
 
+### 2.2.5 - 2018-05-20
+
+- Updates `httpd24u` packages to 2.4.33-3.
+- Updates `php56u` packages to 5.6.36-1.
+- Updates source image to [1.8.4 tag](https://github.com/jdeathe/centos-ssh/releases/tag/1.8.4).
+- Adds feature to set `APACHE_SSL_CERTIFICATE` via a file path. e.g. Docker Swarm secrets.
+- Updates php-hello-world to [0.8.0](https://github.com/jdeathe/php-hello-world/releases/tag/0.8.0).
+- Adds feature to allow `PHP_OPTIONS_SESSION_SAVE_PATH` to be set relative to `APACHE_CONTENT_ROOT` for the files handler.
+- Adds method of setting additional modules with `APACHE_LOAD_MODULES`.
+
 ### 2.2.4 - 2018-01-27
 
 - Fixes issue with unusable healthcheck error messages.

diff --git a/Dockerfile b/Dockerfile
@@ -4,12 +4,12 @@
 # CentOS-6, Apache 2.4, PHP-FPM 5.6, PHP memcached 2.2, Zend Opcache 7.0
 #
 # =============================================================================
-FROM jdeathe/centos-ssh:1.8.3
+FROM jdeathe/centos-ssh:1.8.4
 
 # Use the form ([{fqdn}-]{package-name}|[{fqdn}-]{provider-name})
 ARG PACKAGE_NAME="app"
 ARG PACKAGE_PATH="/opt/${PACKAGE_NAME}"
-ARG PACKAGE_RELEASE_VERSION="0.6.0"
+ARG PACKAGE_RELEASE_VERSION="0.8.0"
 
 # -----------------------------------------------------------------------------
 # IUS Apache 2.4, PHP-FPM 5.6
@@ -19,13 +19,13 @@ RUN rpm --rebuilddb \
 		--setopt=tsflags=nodocs \
 		--disableplugin=fastestmirror \
 		elinks-0.12-0.21.pre5.el6_3 \
-		httpd24u-2.4.29-1.ius.centos6 \
-		httpd24u-tools-2.4.29-1.ius.centos6 \
-		httpd24u-mod_ssl-2.4.29-1.ius.centos6 \
-		php56u-fpm-5.6.33-1.ius.centos6 \
-		php56u-fpm-httpd-5.6.33-1.ius.centos6 \
-		php56u-cli-5.6.33-1.ius.centos6 \
-		php56u-opcache-5.6.33-1.ius.centos6 \
+		httpd24u-2.4.33-3.ius.centos6 \
+		httpd24u-tools-2.4.33-3.ius.centos6 \
+		httpd24u-mod_ssl-2.4.33-3.ius.centos6 \
+		php56u-fpm-5.6.36-1.ius.centos6 \
+		php56u-fpm-httpd-5.6.36-1.ius.centos6 \
+		php56u-cli-5.6.36-1.ius.centos6 \
+		php56u-opcache-5.6.36-1.ius.centos6 \
 		php56u-pecl-memcached-2.2.0-6.ius.centos6 \
 	&& yum versionlock add \
 		elinks \
@@ -260,9 +260,6 @@ RUN mkdir -p \
 	&& ln -sf \
 		/etc/services-config/ssl/certs/localhost.crt \
 		/etc/pki/tls/certs/localhost.crt \
-	&& ln -sf \
-		/etc/services-config/ssl/private/localhost.key \
-		/etc/pki/tls/private/localhost.key \
 	&& ln -sf \
 		/etc/services-config/supervisor/supervisord.conf \
 		/etc/supervisord.conf \
@@ -324,7 +321,7 @@ ENV APACHE_AUTOSTART_HTTPD_BOOTSTRAP=true \
 	APACHE_ERROR_LOG_LEVEL="warn" \
 	APACHE_EXTENDED_STATUS_ENABLED=false \
 	APACHE_HEADER_X_SERVICE_UID="{{HOSTNAME}}" \
-	APACHE_LOAD_MODULES="authz_core_module authz_user_module log_config_module expires_module deflate_module filter_module headers_module setenvif_module socache_shmcb_module mime_module status_module dir_module alias_module unixd_module version_module proxy_module proxy_fcgi_module" \
+	APACHE_LOAD_MODULES="" \
 	APACHE_MOD_SSL_ENABLED=false \
 	APACHE_MPM="prefork" \
 	APACHE_OPERATING_MODE="production" \
@@ -341,14 +338,14 @@ ENV APACHE_AUTOSTART_HTTPD_BOOTSTRAP=true \
 	PHP_OPTIONS_DATE_TIMEZONE="UTC" \
 	PHP_OPTIONS_SESSION_NAME="PHPSESSID" \
 	PHP_OPTIONS_SESSION_SAVE_HANDLER="files" \
-	PHP_OPTIONS_SESSION_SAVE_PATH="/var/lib/php/session" \
+	PHP_OPTIONS_SESSION_SAVE_PATH="var/session" \
 	SSH_AUTOSTART_SSHD=false \
 	SSH_AUTOSTART_SSHD_BOOTSTRAP=false
 
 # -----------------------------------------------------------------------------
 # Set image metadata
 # -----------------------------------------------------------------------------
-ARG RELEASE_VERSION="2.2.4"
+ARG RELEASE_VERSION="2.2.5"
 LABEL \
 	maintainer="James Deathe <james.deathe@gmail.com>" \
 	install="docker run \

diff --git a/README.md b/README.md
diff --git a/environment.mk b/environment.mk
@@ -59,7 +59,7 @@ APACHE_ERROR_LOG_LOCATION ?= var/log/apache_error_log
 APACHE_ERROR_LOG_LEVEL ?= warn
 APACHE_EXTENDED_STATUS_ENABLED ?= false
 APACHE_HEADER_X_SERVICE_UID ?= {{HOSTNAME}}
-APACHE_LOAD_MODULES ?= authz_core_module authz_user_module log_config_module expires_module deflate_module filter_module headers_module setenvif_module socache_shmcb_module mime_module status_module dir_module alias_module unixd_module version_module proxy_module proxy_fcgi_module
+APACHE_LOAD_MODULES ?=
 APACHE_OPERATING_MODE ?= production
 APACHE_MOD_SSL_ENABLED ?= false
 APACHE_MPM ?= prefork
@@ -75,4 +75,4 @@ APACHE_SYSTEM_USER ?= app
 PHP_OPTIONS_DATE_TIMEZONE ?= UTC
 PHP_OPTIONS_SESSION_NAME ?= PHPSESSID
 PHP_OPTIONS_SESSION_SAVE_HANDLER ?= files
-PHP_OPTIONS_SESSION_SAVE_PATH ?= /var/lib/php/session
+PHP_OPTIONS_SESSION_SAVE_PATH ?= var/session
diff --git a/images/hello-world-chrome.png b/images/hello-world-chrome.png
diff --git a/images/hello-world-elinks.png b/images/hello-world-elinks.png
diff --git a/images/hello-world.png b/images/hello-world.png
diff --git a/images/php-hello-world-chrome.png b/images/php-hello-world-chrome.png
diff --git a/images/php-hello-world-elinks.png b/images/php-hello-world-elinks.png
diff --git a/images/php-hello-world-min.png b/images/php-hello-world-min.png
diff --git a/src/etc/services-config/httpd/httpd-bootstrap.conf b/src/etc/services-config/httpd/httpd-bootstrap.conf
@@ -9,7 +9,7 @@ APACHE_ERROR_LOG_LOCATION="${APACHE_ERROR_LOG_LOCATION:-var/log/apache_error_log
 APACHE_ERROR_LOG_LEVEL="${APACHE_ERROR_LOG_LEVEL:-warn}"
 APACHE_EXTENDED_STATUS_ENABLED="${APACHE_EXTENDED_STATUS_ENABLED:-false}"
 APACHE_HEADER_X_SERVICE_UID="${APACHE_HEADER_X_SERVICE_UID:-}"
-APACHE_LOAD_MODULES="${APACHE_LOAD_MODULES:-authz_core_module authz_user_module log_config_module expires_module deflate_module filter_module headers_module setenvif_module socache_shmcb_module mime_module status_module dir_module alias_module unixd_module version_module proxy_module proxy_fcgi_module}"
+APACHE_LOAD_MODULES="${APACHE_LOAD_MODULES:-}"
 APACHE_MOD_SSL_ENABLED="${APACHE_MOD_SSL_ENABLED:-false}"
 APACHE_MPM="${APACHE_MPM:-prefork}"
 APACHE_OPERATING_MODE="${APACHE_OPERATING_MODE:-production}"
@@ -26,4 +26,4 @@ PACKAGE_PATH="${PACKAGE_PATH}"
 PHP_OPTIONS_DATE_TIMEZONE="${PHP_OPTIONS_DATE_TIMEZONE:-UTC}"
 PHP_OPTIONS_SESSION_NAME="${PHP_OPTIONS_SESSION_NAME:-PHPSESSID}"
 PHP_OPTIONS_SESSION_SAVE_HANDLER="${PHP_OPTIONS_SESSION_SAVE_HANDLER:-files}"
-PHP_OPTIONS_SESSION_SAVE_PATH="${PHP_OPTIONS_SESSION_SAVE_PATH:-/var/lib/php/session}"
+PHP_OPTIONS_SESSION_SAVE_PATH="${PHP_OPTIONS_SESSION_SAVE_PATH:-var/session}"
diff --git a/src/etc/systemd/system/centos-ssh-apache-php@.service b/src/etc/systemd/system/centos-ssh-apache-php@.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"
-Environment="DOCKER_IMAGE_TAG=2.2.4"
+Environment="DOCKER_IMAGE_TAG=2.2.5"
 Environment="DOCKER_PORT_MAP_TCP_80=8080"
 Environment="DOCKER_PORT_MAP_TCP_443=9443"
 Environment="DOCKER_PORT_MAP_TCP_8443=NULL"
@@ -66,7 +66,7 @@ Environment="APACHE_ERROR_LOG_LOCATION=var/log/apache_error_log"
 Environment="APACHE_ERROR_LOG_LEVEL=warn"
 Environment="APACHE_EXTENDED_STATUS_ENABLED=false"
 Environment="APACHE_HEADER_X_SERVICE_UID={{HOSTNAME}}"
-Environment="APACHE_LOAD_MODULES=authz_core_module authz_user_module log_config_module expires_module deflate_module filter_module headers_module setenvif_module socache_shmcb_module mime_module status_module dir_module alias_module unixd_module version_module proxy_module proxy_fcgi_module"
+Environment="APACHE_LOAD_MODULES="
 Environment="APACHE_MOD_SSL_ENABLED=false"
 Environment="APACHE_MPM=prefork"
 Environment="APACHE_OPERATING_MODE=production"
@@ -82,7 +82,7 @@ Environment="APACHE_SYSTEM_USER=app"
 Environment="PHP_OPTIONS_DATE_TIMEZONE=UTC"
 Environment="PHP_OPTIONS_SESSION_NAME=PHPSESSID"
 Environment="PHP_OPTIONS_SESSION_SAVE_HANDLER=files"
-Environment="PHP_OPTIONS_SESSION_SAVE_PATH=/var/lib/php/session"
+Environment="PHP_OPTIONS_SESSION_SAVE_PATH=var/session"
 
 # Initialisation: Load image from local storage if available, otherwise pull.
 ExecStartPre=/bin/bash -c \

diff --git a/src/opt/scmi/environment.sh b/src/opt/scmi/environment.sh
@@ -63,7 +63,7 @@ APACHE_ERROR_LOG_LOCATION="${APACHE_ERROR_LOG_LOCATION:-var/log/apache_error_log
 APACHE_ERROR_LOG_LEVEL="${APACHE_ERROR_LOG_LEVEL:-warn}"
 APACHE_EXTENDED_STATUS_ENABLED="${APACHE_EXTENDED_STATUS_ENABLED:-false}"
 APACHE_HEADER_X_SERVICE_UID="${APACHE_HEADER_X_SERVICE_UID:-"{{HOSTNAME}}"}"
-APACHE_LOAD_MODULES="${APACHE_LOAD_MODULES:-authz_core_module authz_user_module log_config_module expires_module deflate_module filter_module headers_module setenvif_module socache_shmcb_module mime_module status_module dir_module alias_module unixd_module version_module proxy_module proxy_fcgi_module}"
+APACHE_LOAD_MODULES="${APACHE_LOAD_MODULES:-}"
 APACHE_OPERATING_MODE="${APACHE_OPERATING_MODE:-production}"
 APACHE_MOD_SSL_ENABLED="${APACHE_MOD_SSL_ENABLED:-false}"
 APACHE_MPM="${APACHE_MPM:-prefork}"
@@ -79,4 +79,4 @@ APACHE_SYSTEM_USER="${APACHE_SYSTEM_USER:-app}"
 PHP_OPTIONS_DATE_TIMEZONE="${PHP_OPTIONS_DATE_TIMEZONE:-UTC}"
 PHP_OPTIONS_SESSION_NAME="${PHP_OPTIONS_SESSION_NAME:-PHPSESSID}"
 PHP_OPTIONS_SESSION_SAVE_HANDLER="${PHP_OPTIONS_SESSION_SAVE_HANDLER:-files}"
-PHP_OPTIONS_SESSION_SAVE_PATH="${PHP_OPTIONS_SESSION_SAVE_PATH:-/var/lib/php/session}"
+PHP_OPTIONS_SESSION_SAVE_PATH="${PHP_OPTIONS_SESSION_SAVE_PATH:-var/session}"