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

Release changes for 1.10.1

Author: jdeathe

CHANGELOG.md

@@ -6,6 +6,10 @@ Summary of release changes for Version 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.1 - 2017-09-28
+
+- Updates image source to [release 1.10.1](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.10.1).
+
 ### 1.10.0 - 2017-07-16
 
 - Updates image source to [release 1.10.0](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.10.0).

Dockerfile

@@ -4,7 +4,7 @@
 # CentOS-6, Apache 2.2, PHP 5.3, PHP Memcached 1.0, PHP APC 3.1.
 # 
 # =============================================================================
-FROM jdeathe/centos-ssh-apache-php:1.10.0
+FROM jdeathe/centos-ssh-apache-php:1.10.1
 
 # -----------------------------------------------------------------------------
 # FastCGI support
@@ -46,7 +46,7 @@ ENV APACHE_MPM="worker"
 # -----------------------------------------------------------------------------
 # Set image metadata
 # -----------------------------------------------------------------------------
-ARG RELEASE_VERSION="1.10.0"
+ARG RELEASE_VERSION="1.10.1"
 LABEL \
 	maintainer="James Deathe <james.deathe@gmail.com>" \
 	install="docker run \

README.md

@@ -7,9 +7,9 @@ Apache PHP web server, loading only a minimal set of Apache modules by default.
 
 ## Overview & links
 
-The latest CentOS-6 based release can be pulled from the centos-6 Docker tag. For a specific release tag the convention is `centos-6-1.10.0` or `1.10.0` for the [1.10.0](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/1.7.0) release tag.
+The latest CentOS-6 based release can be pulled from the centos-6 Docker tag. For a specific release tag the convention is `centos-6-1.10.1` or `1.10.1` for the [1.10.1](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/1.7.0) release tag.
 
-- `centos-6`, `centos-6-1.10.0`, `1.10.0` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-6/Dockerfile)
+- `centos-6`, `centos-6-1.10.1`, `1.10.1` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-6/Dockerfile)
 
 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.
 
@@ -87,10 +87,10 @@ $ docker run \
   --volume /:/media/root \
   --env BASH_ENV="" \
   --env ENV="" \
-  jdeathe/centos-ssh-apache-php-fcgi:1.10.0 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.1 \
   /usr/sbin/scmi install \
     --chroot=/media/root \
-    --tag=1.10.0 \
+    --tag=1.10.1 \
     --name=apache-php.pool-1.1.1
 ```
 
@@ -105,10 +105,10 @@ $ docker run \
   --volume /:/media/root \
   --env BASH_ENV="" \
   --env ENV="" \
-  jdeathe/centos-ssh-apache-php-fcgi:1.10.0 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.1 \
   /usr/sbin/scmi uninstall \
     --chroot=/media/root \
-    --tag=1.10.0 \
+    --tag=1.10.1 \
     --name=apache-php.pool-1.1.1
 ```
 
@@ -123,10 +123,10 @@ $ docker run \
   --volume /:/media/root \
   --env BASH_ENV="" \
   --env ENV="" \
-  jdeathe/centos-ssh-apache-php-fcgi:1.10.0 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.1 \
   /usr/sbin/scmi install \
     --chroot=/media/root \
-    --tag=1.10.0 \
+    --tag=1.10.1 \
     --name=apache-php.pool-1.1.1 \
     --manager=systemd \
     --register \
@@ -148,7 +148,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.10.0
+    jdeathe/centos-ssh-apache-php-fcgi:1.10.1
   ) --info"
 ```
 
@@ -158,7 +158,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.10.0
+    jdeathe/centos-ssh-apache-php-fcgi:1.10.1
   ) --name=apache-php.pool-1.2.1"
 ```
 
@@ -168,7 +168,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.10.0
+    jdeathe/centos-ssh-apache-php-fcgi:1.10.1
   ) --name=apache-php.pool-1.2.1"
 ```
 
@@ -179,15 +179,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.10.0
+$ docker pull jdeathe/centos-ssh-apache-php-fcgi:1.10.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.10.0 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.1 \
   --info
 ```
 
@@ -196,14 +196,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.10.0
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.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.10.0 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.1 \
   --name apache-php.pool-1.3.1
 ```
 
@@ -212,11 +212,17 @@ 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.10.0
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.1
 ```
 
 #### Environment Variables
 
+There are environmental variables available which allows the operator to customise the running container.
+
+##### APACHE_AUTOSTART_HTTPD_BOOTSTRAP & APACHE_AUTOSTART_HTTPD_WRAPPER
+
+It may be desirable to prevent the startup of the httpd-bootstrap and/or httpd-wrapper scripts. For example, when using an image built from this Dockerfile as the source for another Dockerfile you could disable services from startup by setting `APACHE_AUTOSTART_HTTPD_WRAPPER` to `false`. The benefit of this is to reduce the number of running processes in the final container. Another use for this would be to make use of the packages installed in the image such as `ab`, `curl`, `elinks`, `php-cli` etc.
+
 ##### APACHE_SERVER_NAME & APACHE_SERVER_ALIAS
 
 The `APACHE_SERVER_NAME` and `APACHE_SERVER_ALIAS` environmental variables are used to set the VirtualHost `ServerName` and `ServerAlias` values respectively. If the value contains the placeholder `{{HOSTNAME}}` it will be replaced with the system `hostname` value; by default this is the container id but the hostname can be modified using the `--hostname` docker create|run parameter.
@@ -425,3 +431,14 @@ To set the timezone for the UK and account for British Summer Time you would use
   --env "PHP_OPTIONS_DATE_TIMEZONE=Europe/London" \
 ...
 ```
+
+##### PHP_OPTIONS_SESSION_SAVE_HANDLER & PHP_OPTIONS_SESSION_SAVE_PATH
+
+Using `PHP_OPTIONS_SESSION_SAVE_HANDLER` and `PHP_OPTIONS_SESSION_SAVE_PATH` together it's possible to configure PHP to use an alternative `session.save_handler` and `session.save_path`. For example if you have a Memcached server running on the host `memcached-server` on the default port `11211` the following configuration will allow session data to be stored in Memcached, allowing session data to be shared between multiple PHP containers.
+
+```
+...
+  --env "PHP_OPTIONS_SESSION_SAVE_HANDLER=memcached" \
+  --env "PHP_OPTIONS_SESSION_SAVE_PATH=memcached-server:11211" \
+...
+```

default.mk

@@ -3,6 +3,8 @@
 define DOCKER_CONTAINER_PARAMETERS
 --name $(DOCKER_NAME) \
 --restart $(DOCKER_RESTART_POLICY) \
+--env "APACHE_AUTOSTART_HTTPD_BOOTSTRAP=$(APACHE_AUTOSTART_HTTPD_BOOTSTRAP)" \
+--env "APACHE_AUTOSTART_HTTPD_WRAPPER=$(APACHE_AUTOSTART_HTTPD_WRAPPER)" \
 --env "APACHE_CONTENT_ROOT=$(APACHE_CONTENT_ROOT)" \
 --env "APACHE_CUSTOM_LOG_FORMAT=$(APACHE_CUSTOM_LOG_FORMAT)" \
 --env "APACHE_CUSTOM_LOG_LOCATION=$(APACHE_CUSTOM_LOG_LOCATION)" \
@@ -23,7 +25,9 @@ define DOCKER_CONTAINER_PARAMETERS
 --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)"
+--env "PHP_OPTIONS_DATE_TIMEZONE=$(PHP_OPTIONS_DATE_TIMEZONE)" \
+--env "PHP_OPTIONS_SESSION_SAVE_HANDLER=$(PHP_OPTIONS_SESSION_SAVE_HANDLER)" \
+--env "PHP_OPTIONS_SESSION_SAVE_PATH=$(PHP_OPTIONS_SESSION_SAVE_PATH)"
 endef
 
 DOCKER_PUBLISH := $(shell \

environment.mk

@@ -49,6 +49,8 @@ SSH_USER_PASSWORD_HASHED ?= false
 SSH_USER_SHELL ?= /bin/bash
 SSH_USER_ID ?= 500:500
 # ------------------------------------------------------------------------------
+APACHE_AUTOSTART_HTTPD_BOOTSTRAP ?= true
+APACHE_AUTOSTART_HTTPD_WRAPPER ?= true
 APACHE_CONTENT_ROOT ?= /var/www/app
 APACHE_CUSTOM_LOG_FORMAT ?= combined
 APACHE_CUSTOM_LOG_LOCATION ?= var/log/apache_access_log
@@ -70,3 +72,5 @@ APACHE_SSL_CIPHER_SUITE ?= ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY
 APACHE_SSL_PROTOCOL ?= All -SSLv2 -SSLv3
 APACHE_SYSTEM_USER ?= app
 PHP_OPTIONS_DATE_TIMEZONE ?= UTC
+PHP_OPTIONS_SESSION_SAVE_HANDLER ?= files
+PHP_OPTIONS_SESSION_SAVE_PATH ?= /var/lib/php/session

src/etc/systemd/system/centos-ssh-apache-php-fcgi@.service

@@ -52,10 +52,12 @@ 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=1.10.0"
+Environment="DOCKER_IMAGE_TAG=1.10.1"
 Environment="DOCKER_PORT_MAP_TCP_80=8080"
 Environment="DOCKER_PORT_MAP_TCP_443=9443"
 Environment="DOCKER_PORT_MAP_TCP_8443=NULL"
+Environment="APACHE_AUTOSTART_HTTPD_BOOTSTRAP=true"
+Environment="APACHE_AUTOSTART_HTTPD_WRAPPER=true"
 Environment="APACHE_CONTENT_ROOT=/var/www/app"
 Environment="APACHE_CUSTOM_LOG_FORMAT=combined"
 Environment="APACHE_CUSTOM_LOG_LOCATION=var/log/apache_access_log"
@@ -77,6 +79,8 @@ Environment="APACHE_SSL_CIPHER_SUITE=ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHA
 Environment="APACHE_SSL_PROTOCOL=All -SSLv2 -SSLv3"
 Environment="APACHE_SYSTEM_USER=app"
 Environment="PHP_OPTIONS_DATE_TIMEZONE=UTC"
+Environment="PHP_OPTIONS_SESSION_SAVE_HANDLER=files"
+Environment="PHP_OPTIONS_SESSION_SAVE_PATH=/var/lib/php/session"
 
 # Initialisation: Load image from local storage if available, otherwise pull.
 ExecStartPre=/bin/bash -c \
@@ -106,6 +110,8 @@ ExecStartPre=-/bin/bash -c \
 ExecStart=/bin/bash -c \
   "exec /usr/bin/docker run \
     --name %p.%i \
+    --env \"APACHE_AUTOSTART_HTTPD_BOOTSTRAP=${APACHE_AUTOSTART_HTTPD_BOOTSTRAP}\" \
+    --env \"APACHE_AUTOSTART_HTTPD_WRAPPER=${APACHE_AUTOSTART_HTTPD_WRAPPER}\" \
     --env \"APACHE_CONTENT_ROOT=${APACHE_CONTENT_ROOT}\" \
     --env \"APACHE_CUSTOM_LOG_FORMAT=${APACHE_CUSTOM_LOG_FORMAT}\" \
     --env \"APACHE_CUSTOM_LOG_LOCATION=${APACHE_CUSTOM_LOG_LOCATION}\" \
@@ -127,6 +133,8 @@ ExecStart=/bin/bash -c \
     --env \"APACHE_SSL_PROTOCOL=${APACHE_SSL_PROTOCOL}\" \
     --env \"APACHE_SYSTEM_USER=${APACHE_SYSTEM_USER}\" \
     --env \"PHP_OPTIONS_DATE_TIMEZONE=${PHP_OPTIONS_DATE_TIMEZONE}\" \
+    --env \"PHP_OPTIONS_SESSION_SAVE_HANDLER=${PHP_OPTIONS_SESSION_SAVE_HANDLER}\" \
+    --env \"PHP_OPTIONS_SESSION_SAVE_PATH=${PHP_OPTIONS_SESSION_SAVE_PATH}\" \
     $(if [[ ${DOCKER_PORT_MAP_TCP_80} != NULL ]]; then \
       if /usr/bin/grep -qE '^([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}:)?[0-9]*$' <<< \"${DOCKER_PORT_MAP_TCP_80}\"; then \
         printf -- '--publish %%s%%s:80' \

src/opt/scmi/environment.sh

@@ -1,12 +1,12 @@
 # -----------------------------------------------------------------------------
 # Constants
 # -----------------------------------------------------------------------------
-DOCKER_USER=jdeathe
-DOCKER_IMAGE_NAME=centos-ssh-apache-php-fcgi
+readonly DOCKER_USER=jdeathe
+readonly DOCKER_IMAGE_NAME=centos-ssh-apache-php-fcgi
 
 # Tag validation patterns
-DOCKER_IMAGE_TAG_PATTERN='^(latest|centos-6|((1|centos-6-1)\.[0-9]+\.[0-9]+))$'
-DOCKER_IMAGE_RELEASE_TAG_PATTERN='^(1|centos-6-1)\.[0-9]+\.[0-9]+$'
+readonly DOCKER_IMAGE_TAG_PATTERN='^(latest|centos-6|((1|centos-6-1)\.[0-9]+\.[0-9]+))$'
+readonly DOCKER_IMAGE_RELEASE_TAG_PATTERN='^(1|centos-6-1)\.[0-9]+\.[0-9]+$'
 
 # -----------------------------------------------------------------------------
 # Variables
@@ -53,6 +53,8 @@ SSH_USER_PASSWORD="${SSH_USER_PASSWORD:-}"
 SSH_USER_PASSWORD_HASHED="${SSH_USER_PASSWORD_HASHED:-false}"
 SSH_USER_SHELL="${SSH_USER_SHELL:-/bin/bash}"
 # -----------------------------------------------------------------------------
+APACHE_AUTOSTART_HTTPD_BOOTSTRAP="${APACHE_AUTOSTART_HTTPD_BOOTSTRAP:-true}"
+APACHE_AUTOSTART_HTTPD_WRAPPER="${APACHE_AUTOSTART_HTTPD_WRAPPER:-true}"
 APACHE_CONTENT_ROOT="${APACHE_CONTENT_ROOT:-/var/www/app}"
 APACHE_CUSTOM_LOG_FORMAT="${APACHE_CUSTOM_LOG_FORMAT:-combined}"
 APACHE_CUSTOM_LOG_LOCATION="${APACHE_CUSTOM_LOG_LOCATION:-var/log/apache_access_log}"
@@ -74,3 +76,5 @@ APACHE_SSL_CIPHER_SUITE="${APACHE_SSL_CIPHER_SUITE:-"ECDHE-ECDSA-CHACHA20-POLY13
 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}"
+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}"