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

Release changes for 1.13.0

Author: jdeathe

.gitignore

@@ -1,2 +1,3 @@
+.env
 packages
 dist

CHANGELOG.md

@@ -1,10 +1,20 @@
 # Change Log
 
-## centos-6
+## 1 - centos-6
 
-Summary of release changes for Version 1.
+Summary of release changes.
 
-CentOS-6 6.10 x86_64, Apache 2.2, PHP-CGI 5.3 (FastCGI), PHP memcached 1.0, PHP APC 3.1.
+### 1.13.0 - 2019-07-20
+
+- Updates image source to [1.13.0](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.13.0).
+- Updates description in `centos-ssh-apache-php-fcgi.register@.service`.
+- Updates CHANGELOG.md to simplify maintenance.
+- Updates README.md to simplify contents and improve readability.
+- Updates README-short.txt to apply to all image variants.
+- Updates Dockerfile `org.deathe.description` metadata LABEL for consistency + include PHP redis module.
+- Adds `.env` files to `.gitignore` for exclusion from version control.
+- Adds `php-wrapper` and `fcgid.conf` as part of the service; removing dependency on the php-hello-world app.
+- Removes unused `DOCKER_PORT_MAP_TCP_22` variable from environment includes.
 
 ### 1.12.0 - 2019-04-14
 

Dockerfile

@@ -1,12 +1,11 @@
-FROM jdeathe/centos-ssh-apache-php:1.12.0
+FROM jdeathe/centos-ssh-apache-php:1.13.0
 
-ARG RELEASE_VERSION="1.12.0"
+ARG RELEASE_VERSION="1.13.0"
 
 # ------------------------------------------------------------------------------
-# - Base install of required packages
+# Base install of required packages
 # ------------------------------------------------------------------------------
-RUN rpm --rebuilddb \
-	&& yum -y erase \
+RUN yum -y erase \
 		php-5.3.3-49.el6 \
 	&& yum -y install \
 		--setopt=tsflags=nodocs \
@@ -26,35 +25,33 @@ ADD src /
 
 # ------------------------------------------------------------------------------
 # Provisioning
-# - Relocate default fcgid configuration to ensure correct loading order
+# - Disable Apache default fcgid configuration; replaced with 00-fcgid.conf
 # - Replace placeholders with values in systemd service unit template
 # - Set permissions
 # ------------------------------------------------------------------------------
-RUN cat \
+RUN truncate -s 0 \
 		/etc/httpd/conf.d/fcgid.conf \
-		> /etc/httpd/conf.d/00-fcgid.conf \
-	&& truncate -s 0 \
+	&& chmod 444 \
 		/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}}
+		/etc/systemd/system/centos-ssh-apache-php-fcgi@.service
 
 # ------------------------------------------------------------------------------
 # 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 \
-	&& sed -r -i \
-		-e 's~^(source /etc/httpd-bootstrap\.conf)~#\1~' \
-		${PACKAGE_PATH}/bin/php-wrapper
+	&& rm -f \
+		${PACKAGE_PATH}/bin/php-wrapper \
+		${PACKAGE_PATH}/etc/httpd/conf.d/50-fcgid.conf
 
 # ------------------------------------------------------------------------------
 # Set default environment variables used to configure the service container
 # ------------------------------------------------------------------------------
-ENV APACHE_MPM="worker"
+ENV \
+	APACHE_MPM="worker"
 
 # ------------------------------------------------------------------------------
 # Set image metadata
@@ -85,6 +82,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.10 x86_64 - Apache 2.2, PHP-CGI 5.3 (FastCGI), PHP memcached 1.0, PHP APC 3.1."
+	org.deathe.description="Apache 2.2, PHP-CGI 5.3 (FastCGI), PHP memcached 1.0, PHP redis 2.2, PHP APC 3.1 - CentOS-6 6.10 x86_64."
 
 CMD ["/usr/bin/supervisord", "--configuration=/etc/supervisord.conf"]