Merge pull request #140 from jdeathe/issue/139

CLOSES #139: Updates image source to 1.10.5.

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.5 - Unreleased
+
+- Updates image source to [release 1.10.5](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.10.5).
+
 ### 1.10.4 - 2018-01-29
 
 - Updates image source to [release 1.10.4](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.10.4).

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.4
+FROM jdeathe/centos-ssh-apache-php:1.10.5
 
 # -----------------------------------------------------------------------------
 # FastCGI support

README.md

@@ -60,7 +60,7 @@ To verify the container is initialised and running successfully by inspecting th
 $ docker logs apache-php.pool-1.1.1
 ```
 
-On first run, the bootstrap script, ([/usr/sbin/httpd-bootstrap](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-6/usr/sbin/httpd-bootstrap)), will check if the DocumentRoot directory is empty and, if so, will populate it with the example app scripts and VirtualHost configuration files.
+On first run, the bootstrap script, ([/usr/sbin/httpd-bootstrap](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-6/src/usr/sbin/httpd-bootstrap)), will check if the DocumentRoot directory is empty and, if so, will populate it with the example app scripts and VirtualHost configuration files.
 
 The `apachectl` command can be accessed as follows.
 
@@ -72,7 +72,7 @@ $ docker exec -it apache-php.pool-1.1.1 apachectl -h
 
 ### Running
 
-To run the a docker container from this image you can use the standard docker commands. Alternatively, you can use the embedded (Service Container Manager Interface) [scmi](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-6/usr/sbin/scmi) that is included in the image since `centos-6-1.7.1` or, if you have a checkout of the [source repository](https://github.com/jdeathe/centos-ssh-apache-php-fcgi), and have make installed the Makefile provides targets to build, install, start, stop etc. where environment variables can be used to configure the container options and set custom docker run parameters.
+To run the a docker container from this image you can use the standard docker commands. Alternatively, you can use the embedded (Service Container Manager Interface) [scmi](https://github.com/jdeathe/centos-ssh/blob/centos-6/src/usr/sbin/scmi) that is included in the image since `centos-6-1.7.1` or, if you have a checkout of the [source repository](https://github.com/jdeathe/centos-ssh-apache-php-fcgi), and have make installed the Makefile provides targets to build, install, start, stop etc. where environment variables can be used to configure the container options and set custom docker run parameters.
 
 #### SCMI Installation Examples
 
@@ -252,7 +252,7 @@ from your browser you can then access it with `http://app-1.local:8080` assuming
 
 ##### APACHE_CUSTOM_LOG_LOCATION & APACHE_CUSTOM_LOG_FORMAT
 
-The Apache CustomLog can be defined using `APACHE_CUSTOM_LOG_LOCATION` to set a file | pipe location and `APACHE_CUSTOM_LOG_FORMAT` to specify the required LogFormat nickname.
+The Apache CustomLog can be defined using `APACHE_CUSTOM_LOG_LOCATION` to set a file, (or pipe), location and `APACHE_CUSTOM_LOG_FORMAT` to specify the required LogFormat nickname.
 
 ```
 ...
@@ -261,14 +261,30 @@ The Apache CustomLog can be defined using `APACHE_CUSTOM_LOG_LOCATION` to set a
 ...
 ```
 
+To set a file path relative to `APACHE_CONTENT_ROOT` the path value should exclude a leading `/`.
+
+```
+...
+  --env "APACHE_CUSTOM_LOG_LOCATION=var/log/httpd_access_log" \
+...
+```
+
 ##### APACHE_ERROR_LOG_LOCATION & APACHE_ERROR_LOG_LEVEL
 
-The Apache ErrorLog can be defined using `APACHE_ERROR_LOG_LOCATION` to set a file | pipe location and `APACHE_ERROR_LOG_LEVEL` to specify the required LogLevel value.
+The Apache ErrorLog can be defined using `APACHE_ERROR_LOG_LOCATION` to set a file, (or pipe), location and `APACHE_ERROR_LOG_LEVEL` to specify the required LogLevel value.
 
 ```
 ...
   --env "APACHE_ERROR_LOG_LOCATION=/var/log/httpd/error_log" \
-  --env "APACHE_ERROR_LOG_FORMAT=error" \
+  --env "APACHE_ERROR_LOG_LEVEL=error" \
+...
+```
+
+To set a file path relative to `APACHE_CONTENT_ROOT` the path value should exclude a leading `/`.
+
+```
+...
+  --env "APACHE_ERROR_LOG_LOCATION=var/log/httpd_error_log" \
 ...
 ```
 
@@ -303,11 +319,12 @@ The `APACHE_HEADER_X_SERVICE_UID` environmental variable is used to set a respon
 
 ##### APACHE_LOAD_MODULES
 
-The variable `APACHE_LOAD_MODULES` defines all Apache modules to be loaded from */etc/httpd/conf/http.conf*. The default is the minimum required so you may need to add more as necessary. To add the "mod\_rewrite" Apache Module you would add it's identifier `rewrite_module` to the array as follows.
+By default, the image loads a minimal set of required Apache modules. To load additional modules the 
+`APACHE_LOAD_MODULES` can be used. To load both the `mod_env` and `mod_rewrite` Apache Modules use the respective module identifiers. i.e. `env_module` and `rewrite_module`.
 
 ```
 ...
-  --env "APACHE_LOAD_MODULES=authz_user_module log_config_module expires_module deflate_module headers_module setenvif_module mime_module status_module dir_module alias_module rewrite_module"
+  --env "APACHE_LOAD_MODULES=env_module rewrite_module"
 ...
 ```
 
@@ -362,7 +379,7 @@ The public directory is relative to the `APACHE_CONTENT_ROOT` and together they
 
 ##### APACHE_SSL_CERTIFICATE
 
-The `APACHE_SSL_CERTIFICATE` environment variable is used to define a PEM, (and optionally base64), encoded certificate bundle. Base64 encoding of the PEM file contents is recommended. To make a compatible certificate bundle use the `cat` command to combine the certificate files together.
+The `APACHE_SSL_CERTIFICATE` environment variable is used to define a PEM encoded certificate bundle. To make a compatible certificate bundle use the `cat` command to combine the certificate files together.
 
 ```
 $ cat /usr/share/private/server-key.pem \
@@ -371,6 +388,8 @@ $ cat /usr/share/private/server-key.pem \
   > /usr/share/certs/server-bundle.pem
 ```
 
+Base64 encoding of the PEM file contents is recommended if not using the file path method.
+
 *Note:* The `base64` command on Mac OSX will encode a file without line breaks by default but if using the command on Linux you need to include use the `-w` option to prevent wrapping lines at 80 characters. i.e. `base64 -w 0 -i {certificate-path}`.
 
 ```
@@ -381,6 +400,14 @@ $ cat /usr/share/private/server-key.pem \
 ...
 ```
 
+If set to a valid container file path the value will be read from the file - this allows for setting the value securely when combined with an orchestration feature such as Docker Swarm secrets.
+
+```
+...
+  --env "APACHE_SSL_CERTIFICATE=/run/secrets/apache_ssl_certificate" \
+...
+```
+
 ##### APACHE_SSL_CIPHER_SUITE
 
 Use the `APACHE_SSL_CIPHER_SUITE` environment variable to define an appropriate Cipher Suite. The default "intermediate" selection should be suitable for most use-cases where support for a wide range browsers is necessary. 
@@ -434,7 +461,7 @@ To set the timezone for the UK and account for British Summer Time you would use
 ...
 ```
 
-##### PHP_OPTIONS_SESSION_SAVE_HANDLER & PHP_OPTIONS_SESSION_SAVE_PATH
+##### PHP_OPTIONS_SESSION_NAME, 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.
 
@@ -447,3 +474,12 @@ Using `PHP_OPTIONS_SESSION_NAME` a session name can be defined - otherwise the d
   --env "PHP_OPTIONS_SESSION_SAVE_PATH=memcached-server:11211" \
 ...
 ```
+
+If using the files handler, to set a save path relative to `APACHE_CONTENT_ROOT` the path value should exclude a leading `/`.
+
+```
+...
+  --env "PHP_OPTIONS_SESSION_SAVE_HANDLER=files" \
+  --env "PHP_OPTIONS_SESSION_SAVE_PATH=var/session" \
+...
+```

environment.mk

@@ -58,7 +58,7 @@ 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 ?= authz_user_module log_config_module expires_module deflate_module headers_module setenvif_module mime_module status_module dir_module alias_module version_module
+APACHE_LOAD_MODULES ?=
 APACHE_OPERATING_MODE ?= production
 APACHE_MOD_SSL_ENABLED ?= false
 APACHE_MPM ?= worker
@@ -74,4 +74,4 @@ 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
+PHP_OPTIONS_SESSION_SAVE_PATH ?= var/session

images/hello-world-php-fcgi-chrome.png

@@ -65,7 +65,7 @@ Environment="APACHE_ERROR_LOG_LOCATION=var/log/apache_error_log"
 Environment="APACHE_ERROR_LOG_LEVEL=warn"
 Environment="APACHE_EXTENDED_STATUS_ENABLED=false"
 Environment="APACHE_HEADER_X_SERVICE_UID={{HOSTNAME}}"
-Environment="APACHE_LOAD_MODULES=authz_user_module log_config_module expires_module deflate_module headers_module setenvif_module mime_module status_module dir_module alias_module version_module"
+Environment="APACHE_LOAD_MODULES="
 Environment="APACHE_MOD_SSL_ENABLED=false"
 Environment="APACHE_MPM=worker"
 Environment="APACHE_OPERATING_MODE=production"
@@ -81,7 +81,7 @@ 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"
+Environment="PHP_OPTIONS_SESSION_SAVE_PATH=var/session"
 
 # Initialisation: Load image from local storage if available, otherwise pull.
 ExecStartPre=/bin/bash -c \