Merge pull request #168 from jdeathe/issue/166

CLOSES #166: Updates image source to 1.12.0.

Author: jdeathe

.dockerignore

@@ -1,7 +1,11 @@
+.env
+.env.example
 .git
 .gitignore
 dist
+images
 test
+docker-compose.yml
 LICENSE
 README-short.txt
 *.md

.env.example

@@ -0,0 +1,25 @@
+APACHE_CONTENT_ROOT=/var/www/app
+APACHE_CUSTOM_LOG_FORMAT=combined
+APACHE_CUSTOM_LOG_LOCATION=var/log/apache_access_log
+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=
+APACHE_MOD_SSL_ENABLED=false
+APACHE_MPM=worker
+APACHE_OPERATING_MODE=production
+APACHE_PUBLIC_DIRECTORY=public_html
+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
+PACKAGE_PATH=/opt/app
+PHP_OPTIONS_DATE_TIMEZONE=UTC
+PHP_OPTIONS_SESSION_NAME=PHPSESSID
+PHP_OPTIONS_SESSION_SAVE_HANDLER=files
+PHP_OPTIONS_SESSION_SAVE_PATH=var/session

CHANGELOG.md

@@ -6,6 +6,11 @@ Summary of release changes for Version 1.
 
 CentOS-6 6.10 x86_64, Apache 2.2, PHP-CGI 5.3 (FastCGI), PHP memcached 1.0, PHP APC 3.1.
 
+### 1.12.0 - Unreleased
+
+- Updates image source to [1.12.0](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.12.0).
+- Adds patched version of `httpd-wrapper` to fix setting user ownership.
+
 ### 1.11.1 - 2018-12-08
 
 - Updates image source to [1.11.1](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.11.1).

Dockerfile

@@ -1,14 +1,10 @@
-# =============================================================================
-# jdeathe/centos-ssh-apache-php-fcgi
-#
-# CentOS-6, Apache 2.2, PHP 5.3, PHP Memcached 1.0, PHP APC 3.1.
-# 
-# =============================================================================
-FROM jdeathe/centos-ssh-apache-php:1.11.1
+FROM jdeathe/centos-ssh-apache-php:1.12.0
 
-# -----------------------------------------------------------------------------
-# FastCGI support
-# -----------------------------------------------------------------------------
+ARG RELEASE_VERSION="1.11.1"
+
+# ------------------------------------------------------------------------------
+# - Base install of required packages
+# ------------------------------------------------------------------------------
 RUN rpm --rebuilddb \
 	&& yum -y erase \
 		php-5.3.3-49.el6 \
@@ -23,38 +19,52 @@ RUN rpm --rebuilddb \
 	&& rm -rf /var/cache/yum/* \
 	&& yum clean all
 
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 # Copy files into place
-# -----------------------------------------------------------------------------
-ADD src/opt/scmi \
-	/opt/scmi/
-ADD src/etc/systemd/system \
-	/etc/systemd/system/
+# ------------------------------------------------------------------------------
+ADD src /
 
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
+# Provisioning
+# - Relocate default fcgid configuration to ensure correct loading order
+# - Replace placeholders with values in systemd service unit template
+# - Set permissions
+# ------------------------------------------------------------------------------
+RUN cat \
+		/etc/httpd/conf.d/fcgid.conf \
+		> /etc/httpd/conf.d/00-fcgid.conf \
+	&& truncate -s 0 \
+		/etc/httpd/conf.d/fcgid.conf \
+	&& sed -i \
+		-e "s~{{RELEASE_VERSION}}~${RELEASE_VERSION}~g" \
+		/etc/systemd/system/centos-ssh-apache-php-fcgi@.service \
+	&& chmod 700 \
+		/usr/{bin/healthcheck,sbin/httpd-{bootstrap,wrapper}}
+
+# ------------------------------------------------------------------------------
 # Package installation
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 RUN sed -i \
-	-e 's~^description =.*$~description = "This CentOS / Apache / PHP-CGI (FastCGI) service is running in a container."~' \
-	${PACKAGE_PATH}/etc/views/index.ini
+		-e 's~^description =.*$~description = "This CentOS / Apache / PHP-CGI (FastCGI) service is running in a container."~' \
+		${PACKAGE_PATH}/etc/views/index.ini \
+	&& sed -r -i \
+		-e 's~^(source /etc/httpd-bootstrap\.conf)~#\1~' \
+		${PACKAGE_PATH}/bin/php-wrapper
 
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 # Set default environment variables used to configure the service container
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 ENV APACHE_MPM="worker"
 
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 # Set image metadata
-# -----------------------------------------------------------------------------
-ARG RELEASE_VERSION="1.11.1"
+# ------------------------------------------------------------------------------
 LABEL \
 	maintainer="James Deathe <james.deathe@gmail.com>" \
 	install="docker run \
 --rm \
 --privileged \
 --volume /:/media/root \
---env BASH_ENV="" \
---env ENV="" \
 jdeathe/centos-ssh-apache-php-fcgi:${RELEASE_VERSION} \
 /usr/sbin/scmi install \
 --chroot=/media/root \
@@ -64,8 +74,6 @@ jdeathe/centos-ssh-apache-php-fcgi:${RELEASE_VERSION} \
 --rm \
 --privileged \
 --volume /:/media/root \
---env BASH_ENV="" \
---env ENV="" \
 jdeathe/centos-ssh-apache-php-fcgi:${RELEASE_VERSION} \
 /usr/sbin/scmi uninstall \
 --chroot=/media/root \
@@ -79,4 +87,4 @@ jdeathe/centos-ssh-apache-php-fcgi:${RELEASE_VERSION} \
 	org.deathe.url="https://github.com/jdeathe/centos-ssh-apache-php-fcgi" \
 	org.deathe.description="CentOS-6 6.10 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"]
+CMD ["/usr/bin/supervisord", "--configuration=/etc/supervisord.conf"]