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

Release changes for 1.10.3

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.3 - 2018-01-16
+
+- Updates image source to [release 1.10.3](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.10.3).
+
 ### 1.10.2 - 2017-12-27
 
 - Updates image source to [release 1.10.2](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.10.2).

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.2
+FROM jdeathe/centos-ssh-apache-php:1.10.3
 
 # -----------------------------------------------------------------------------
 # FastCGI support
@@ -46,7 +46,7 @@ ENV APACHE_MPM="worker"
 # -----------------------------------------------------------------------------
 # Set image metadata
 # -----------------------------------------------------------------------------
-ARG RELEASE_VERSION="1.10.2"
+ARG RELEASE_VERSION="1.10.3"
 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.2` or `1.10.2` for the [1.10.2](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.3` or `1.10.3` for the [1.10.3](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/1.7.0) release tag.
 
-- `centos-6`, `centos-6-1.10.2`, `1.10.2` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-6/Dockerfile)
+- `centos-6`, `centos-6-1.10.3`, `1.10.3` [(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.2 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.3 \
   /usr/sbin/scmi install \
     --chroot=/media/root \
-    --tag=1.10.2 \
+    --tag=1.10.3 \
     --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.2 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.3 \
   /usr/sbin/scmi uninstall \
     --chroot=/media/root \
-    --tag=1.10.2 \
+    --tag=1.10.3 \
     --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.2 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.3 \
   /usr/sbin/scmi install \
     --chroot=/media/root \
-    --tag=1.10.2 \
+    --tag=1.10.3 \
     --name=apache-php.pool-1.1.1 \
     --manager=systemd \
     --register \
@@ -136,6 +136,8 @@ $ docker run \
 
 ##### SCMI Fleet Support
 
+**_Deprecation Notice:_** The fleet project is no longer maintained. The fleet `--manager` option has been deprecated in `scmi`.
+
 If your docker host has systemd, fleetd (and optionally etcd) installed then `scmi` provides a method to schedule the container  to run on the cluster. This provides some additional features for managing a group of instances on a [fleet](https://github.com/coreos/fleet) cluster and has the option to use an etcd backed service registry. To use the fleet method of installation use the `-m` or `--manager` option of `scmi` and to include the optional etcd register companion unit use the `--register` option.
 
 ##### SCMI Image Information
@@ -148,7 +150,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.2
+    jdeathe/centos-ssh-apache-php-fcgi:1.10.3
   ) --info"
 ```
 
@@ -158,7 +160,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.2
+    jdeathe/centos-ssh-apache-php-fcgi:1.10.3
   ) --name=apache-php.pool-1.2.1"
 ```
 
@@ -168,7 +170,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.2
+    jdeathe/centos-ssh-apache-php-fcgi:1.10.3
   ) --name=apache-php.pool-1.2.1"
 ```
 
@@ -179,15 +181,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.2
+$ docker pull jdeathe/centos-ssh-apache-php-fcgi:1.10.3
 ```
 
 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.2 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.3 \
   --info
 ```
 
@@ -196,14 +198,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.2
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.3
 ```
 
 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.2 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.3 \
   --name apache-php.pool-1.3.1
 ```
 
@@ -212,7 +214,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.10.2
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.3
 ```
 
 #### Environment Variables
@@ -436,8 +438,11 @@ To set the timezone for the UK and account for British Summer Time you would use
 
 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.
 
+Using `PHP_OPTIONS_SESSION_NAME` a session name can be defined - otherwise the default name "PHPSESSID" is used.
+
 ```
 ...
+  --env "PHP_OPTIONS_SESSION_NAME=app-session" \
   --env "PHP_OPTIONS_SESSION_SAVE_HANDLER=memcached" \
   --env "PHP_OPTIONS_SESSION_SAVE_PATH=memcached-server:11211" \
 ...

default.mk

@@ -26,6 +26,7 @@ define DOCKER_CONTAINER_PARAMETERS
 --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_NAME=$(PHP_OPTIONS_SESSION_NAME)" \
 --env "PHP_OPTIONS_SESSION_SAVE_HANDLER=$(PHP_OPTIONS_SESSION_SAVE_HANDLER)" \
 --env "PHP_OPTIONS_SESSION_SAVE_PATH=$(PHP_OPTIONS_SESSION_SAVE_PATH)"
 endef

environment.mk

@@ -72,5 +72,6 @@ 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_NAME ?= PHPSESSID
 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,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=1.10.2"
+Environment="DOCKER_IMAGE_TAG=1.10.3"
 Environment="DOCKER_PORT_MAP_TCP_80=8080"
 Environment="DOCKER_PORT_MAP_TCP_443=9443"
 Environment="DOCKER_PORT_MAP_TCP_8443=NULL"
@@ -79,6 +79,7 @@ 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_NAME=PHPSESSID"
 Environment="PHP_OPTIONS_SESSION_SAVE_HANDLER=files"
 Environment="PHP_OPTIONS_SESSION_SAVE_PATH=/var/lib/php/session"
 
@@ -133,6 +134,7 @@ 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_NAME=${PHP_OPTIONS_SESSION_NAME}\" \
     --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 \

src/opt/scmi/environment.sh

@@ -76,5 +76,6 @@ 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_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}"