Merge pull request #162 from jdeathe/centos-7-develop

Release changes for 2.0.1

Author: jdeathe

CHANGELOG.md

@@ -6,6 +6,14 @@ Summary of release changes for Version 2.
 
 CentOS-7 7.5.1804 x86_64, Apache 2.4, PHP-CGI 5.4 (FastCGI), PHP memcached 2.2, Zend Opcache 7.0.
 
+### 2.0.1 - 2018-12-08
+
+- Updates source image to [2.4.1](https://github.com/jdeathe/centos-ssh/releases/tag/2.4.1).
+- Updates `httpd` packages to 2.4.6-88.
+- Updates `php` packages to 5.4.16-46.
+- Updates php-hello-world to [0.11.0](https://github.com/jdeathe/php-hello-world/releases/tag/0.11.0).
+- Adds `php-pecl-redis` package to support Redis.
+
 ### 2.0.0 - 2018-10-14
 
 - Initial release

Dockerfile

@@ -4,13 +4,12 @@
 # CentOS-7, Apache 2.4, PHP 5.4, PHP Memcached 2.2, Zend Opcache.
 # 
 # =============================================================================
-# FROM jdeathe/centos-ssh-apache-php:1.11.0
-FROM jdeathe/centos-ssh:2.4.0
+FROM jdeathe/centos-ssh:2.4.1
 
 # Use the form ([{fqdn}-]{package-name}|[{fqdn}-]{provider-name})
 ARG PACKAGE_NAME="app"
 ARG PACKAGE_PATH="/opt/${PACKAGE_NAME}"
-ARG PACKAGE_RELEASE_VERSION="0.10.0"
+ARG PACKAGE_RELEASE_VERSION="0.11.0"
 
 # -----------------------------------------------------------------------------
 # FastCGI support
@@ -21,13 +20,15 @@ RUN rpm --rebuilddb \
 		--disableplugin=fastestmirror \
 		elinks-0.12-0.37.pre6.el7 \
 		fcgi-2.4.0-25.el7 \
-		httpd-2.4.6-80.el7.centos.1 \
-		httpd-tools-2.4.6-80.el7.centos.1 \
+		httpd-2.4.6-88.el7.centos \
+		httpd-tools-2.4.6-88.el7.centos \
 		mod_fcgid-2.3.9-4.el7_4.1 \
-		mod_ssl-2.4.6-80.el7.centos.1 \
-		php-cli-5.4.16-45.el7 \
+		mod_ssl-2.4.6-88.el7.centos \
+		php-cli-5.4.16-46.el7 \
+		php-common-5.4.16-46.el7 \
 		php-pecl-zendopcache-7.0.5-2.el7 \
 		php-pecl-memcached-2.2.0-1.el7 \
+		php-pecl-redis-2.2.8-1.el7 \
 	&& yum versionlock add \
 		elinks \
 		fcgi \
@@ -320,7 +321,7 @@ ENV APACHE_AUTOSTART_HTTPD_BOOTSTRAP=true \
 # -----------------------------------------------------------------------------
 # Set image metadata
 # -----------------------------------------------------------------------------
-ARG RELEASE_VERSION="2.0.0"
+ARG RELEASE_VERSION="2.0.1"
 LABEL \
 	maintainer="James Deathe <james.deathe@gmail.com>" \
 	install="docker run \

README.md

@@ -9,16 +9,16 @@ Apache PHP web server, loading only a minimal set of Apache modules by default.
 
 ## Overview & links
 
-- `centos-7`, `centos-7-2.0.0`, `2.0.0` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-7/Dockerfile)
-- `centos-6`, `centos-6-1.11.0`, `1.11.0` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-6/Dockerfile)
+- `centos-7`, `centos-7-2.0.1`, `2.0.1` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-7/Dockerfile)
+- `centos-6`, `centos-6-1.11.1`, `1.11.1` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-6/Dockerfile)
 
 #### centos-6
 
-The latest CentOS-6 based release can be pulled from the centos-6 Docker tag. It is recommended to select a specific release tag - the convention is `centos-6-1.11.0` or `1.11.0` for the [1.11.0](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/1.11.0) release tag.
+The latest CentOS-6 based release can be pulled from the centos-6 Docker tag. It is recommended to select a specific release tag - the convention is `centos-6-1.11.1` or `1.11.1` for the [1.11.1](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/1.11.1) release tag.
 
 #### centos-7
 
-The latest CentOS-7 based release can be pulled from the centos-7 Docker tag. It is recommended to select a specific release tag - the convention is `centos-7-2.0.0` or `2.0.0` for the [2.0.0](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/2.0.0) release tag.
+The latest CentOS-7 based release can be pulled from the centos-7 Docker tag. It is recommended to select a specific release tag - the convention is `centos-7-2.0.1` or `2.0.1` for the [2.0.1](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/2.0.1) release tag.
 
 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.
 
@@ -47,7 +47,7 @@ $ docker run -d \
   --name apache-php.pool-1.1.1 \
   -p 8080:80 \
   -e "APACHE_SERVER_NAME=app-1.local" \
-  jdeathe/centos-ssh-apache-php-fcgi:1.11.0
+  jdeathe/centos-ssh-apache-php-fcgi:1.11.1
 ```
 
 Now point your browser to `http://{docker-host}:8080` where `{docker-host}` is the host name of your docker server and, if all went well, you should see the "Hello, world!" page.
@@ -97,10 +97,10 @@ $ docker run \
   --volume /:/media/root \
   --env BASH_ENV="" \
   --env ENV="" \
-  jdeathe/centos-ssh-apache-php-fcgi:1.11.0 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.11.1 \
   /usr/sbin/scmi install \
     --chroot=/media/root \
-    --tag=1.11.0 \
+    --tag=1.11.1 \
     --name=apache-php.pool-1.1.1
 ```
 
@@ -115,10 +115,10 @@ $ docker run \
   --volume /:/media/root \
   --env BASH_ENV="" \
   --env ENV="" \
-  jdeathe/centos-ssh-apache-php-fcgi:1.11.0 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.11.1 \
   /usr/sbin/scmi uninstall \
     --chroot=/media/root \
-    --tag=1.11.0 \
+    --tag=1.11.1 \
     --name=apache-php.pool-1.1.1
 ```
 
@@ -133,10 +133,10 @@ $ docker run \
   --volume /:/media/root \
   --env BASH_ENV="" \
   --env ENV="" \
-  jdeathe/centos-ssh-apache-php-fcgi:1.11.0 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.11.1 \
   /usr/sbin/scmi install \
     --chroot=/media/root \
-    --tag=1.11.0 \
+    --tag=1.11.1 \
     --name=apache-php.pool-1.1.1 \
     --manager=systemd \
     --register \
@@ -160,7 +160,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.11.0
+    jdeathe/centos-ssh-apache-php-fcgi:1.11.1
   ) --info"
 ```
 
@@ -170,7 +170,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.11.0
+    jdeathe/centos-ssh-apache-php-fcgi:1.11.1
   ) --name=apache-php.pool-1.2.1"
 ```
 
@@ -180,7 +180,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.11.0
+    jdeathe/centos-ssh-apache-php-fcgi:1.11.1
   ) --name=apache-php.pool-1.2.1"
 ```
 
@@ -191,15 +191,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.11.0
+$ docker pull jdeathe/centos-ssh-apache-php-fcgi:1.11.1
 ```
 
 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.11.0 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.11.1 \
   --info
 ```
 
@@ -208,14 +208,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.11.0
+  jdeathe/centos-ssh-apache-php-fcgi:1.11.1
 ```
 
 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.11.0 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.11.1 \
   --name apache-php.pool-1.3.1
 ```
 
@@ -224,7 +224,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.11.0
+  jdeathe/centos-ssh-apache-php-fcgi:1.11.1
 ```
 
 #### Environment Variables
@@ -353,7 +353,7 @@ $ docker run -d \
   --env "APACHE_SERVER_NAME=app-1.local" \
   --env "APACHE_MOD_SSL_ENABLED=true" \
   --volume apache-php.pool-1.1.1.data-ssl:/etc/services-config/ssl \
-  jdeathe/centos-ssh-apache-php-fcgi:1.11.0
+  jdeathe/centos-ssh-apache-php-fcgi:1.11.1
 ```
 
 ##### APACHE_MPM

src/etc/systemd/system/centos-ssh-apache-php-fcgi@.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=2.0.0"
+Environment="DOCKER_IMAGE_TAG=2.0.1"
 Environment="DOCKER_PORT_MAP_TCP_80=8080"
 Environment="DOCKER_PORT_MAP_TCP_443=9443"
 Environment="DOCKER_PORT_MAP_TCP_8443=NULL"