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

Release changes for 1.9.0

Author: jdeathe

CHANGELOG.md

@@ -6,6 +6,23 @@ Summary of release changes for Version 1.
 
 CentOS-6 6.8 x86_64, Apache 2.2, PHP-CGI 5.3 (FastCGI), PHP memcached 1.0, PHP APC 3.1.
 
+### 1.9.0 - 2017-02-07
+
+- Updates image source to release 1.9.0.
+- Fixes issue with app specific `httpd` configuration requiring the `etc/php.d` directory to exist.
+- Adds default Apache modules appropriate for Apache 2.4/2.2 in the bootstrap script for the unlikely case where the values in the environment and configuration file defaults are both unset.
+- Updates `README.md` with details of the SCMI install example's prerequisite step of either pulling or loading the image.
+- Updates `httpd` and `mod_ssl` packages.
+- Fixes noisy certificate generation output in logs during bootstrap when `APACHE_MOD_SSL_ENABLED` is `true`.
+- Changes `APACHE_SERVER_ALIAS` to a default empty value for `Makefile`, `scmi` and `systemd` templates which is the existing `Dockerfile` default.
+- Changes default `APACHE_SERVER_NAME` to unset and use the container's hostname for the Apache ServerName.
+- Fixes `scmi` install/uninstall examples and Dockerfile `LABEL` install/uninstall templates to prevent the `X-Service-UID` header being populated with the hostname of the ephemeral container used to run `scmi`.
+- Adds feature to allow both `APACHE_SERVER_NAME` and `APACHE_SERVER_ALIAS` to contain the `{{HOSTNAME}}` placeholder which is replaced on startup with the container's hostname.
+- Removes environment variable re-mappings that are no longer in use: `APP_HOME_DIR`, `APACHE_SUEXEC_USER_GROUP`, `DATE_TIMEZONE`, `SERVICE_USER`, `SUEXECUSERGROUP`, `SERVICE_UID`.
+- Changes Apache configuration so that `NameVirtualHost` and `Listen` are separated out from `VirtualHost`.
+- Adds further information on the use of `watch` to monitor `server-status`.
+- Changes the auto-generated self-signed certificate to include hosts from `APACHE_SERVER_NAME` and `APACHE_SERVER_ALIAS` via subjectAltName.
+
 ### 1.8.1 - 2017-01-29
 
 - Updates image source to release 1.8.2 including required Makefile and environment changes.

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.8.2
+FROM jdeathe/centos-ssh-apache-php:1.9.0
 
 MAINTAINER James Deathe <james.deathe@gmail.com>
 
@@ -46,12 +46,14 @@ ENV APACHE_MPM="worker"
 # -----------------------------------------------------------------------------
 # Set image metadata
 # -----------------------------------------------------------------------------
-ARG RELEASE_VERSION="1.8.1"
+ARG RELEASE_VERSION="1.9.0"
 LABEL \
 	install="docker run \
 --rm \
 --privileged \
 --volume /:/media/root \
+--env BASH_ENV="" \
+--env ENV="" \
 jdeathe/centos-ssh-apache-php-fcgi:${RELEASE_VERSION} \
 /usr/sbin/scmi install \
 --chroot=/media/root \
@@ -61,6 +63,8 @@ jdeathe/centos-ssh-apache-php-fcgi:${RELEASE_VERSION} \
 --rm \
 --privileged \
 --volume /:/media/root \
+--env BASH_ENV="" \
+--env ENV="" \
 jdeathe/centos-ssh-apache-php-fcgi:${RELEASE_VERSION} \
 /usr/sbin/scmi uninstall \
 --chroot=/media/root \

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.8.1` or `1.8.1` for the [1.8.1](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.9.0` or `1.9.0` for the [1.9.0](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/1.7.0) release tag.
 
-- centos-6, `centos-6-1.8.1`, `1.8.1` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-6/Dockerfile)
+- `centos-6`, `centos-6-1.9.0`, `1.9.0` [(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.
 
@@ -85,10 +85,12 @@ $ docker run \
   --rm \
   --privileged \
   --volume /:/media/root \
-  jdeathe/centos-ssh-apache-php-fcgi:1.8.1 \
+  --env BASH_ENV="" \
+  --env ENV="" \
+  jdeathe/centos-ssh-apache-php-fcgi:1.9.0 \
   /usr/sbin/scmi install \
     --chroot=/media/root \
-    --tag=1.8.1 \
+    --tag=1.9.0 \
     --name=apache-php.pool-1.1.1
 ```
 
@@ -101,10 +103,12 @@ $ docker run \
   --rm \
   --privileged \
   --volume /:/media/root \
-  jdeathe/centos-ssh-apache-php-fcgi:1.8.1 \
+  --env BASH_ENV="" \
+  --env ENV="" \
+  jdeathe/centos-ssh-apache-php-fcgi:1.9.0 \
   /usr/sbin/scmi uninstall \
     --chroot=/media/root \
-    --tag=1.8.1 \
+    --tag=1.9.0 \
     --name=apache-php.pool-1.1.1
 ```
 
@@ -117,10 +121,12 @@ $ docker run \
   --rm \
   --privileged \
   --volume /:/media/root \
-  jdeathe/centos-ssh-apache-php-fcgi:1.8.1 \
+  --env BASH_ENV="" \
+  --env ENV="" \
+  jdeathe/centos-ssh-apache-php-fcgi:1.9.0 \
   /usr/sbin/scmi install \
     --chroot=/media/root \
-    --tag=1.8.1 \
+    --tag=1.9.0 \
     --name=apache-php.pool-1.1.1 \
     --manager=systemd \
     --register \
@@ -142,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.8.1
+    jdeathe/centos-ssh-apache-php-fcgi:1.9.0
   ) --info"
 ```
 
@@ -152,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.8.1
+    jdeathe/centos-ssh-apache-php-fcgi:1.9.0
   ) --name=apache-php.pool-1.2.1"
 ```
 
@@ -162,20 +168,26 @@ 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.8.1
+    jdeathe/centos-ssh-apache-php-fcgi:1.9.0
   ) --name=apache-php.pool-1.2.1"
 ```
 
 ##### SCMI on Atomic Host
 
 With the addition of install/uninstall image labels it is possible to use [Project Atomic's](http://www.projectatomic.io/) `atomic install` command to simplify install/uninstall tasks on [CentOS Atomic](https://wiki.centos.org/SpecialInterestGroup/Atomic) Hosts.
 
+_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.9.0
+```
+
 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.8.1 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.9.0 \
   --info
 ```
 
@@ -184,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.8.1
+  jdeathe/centos-ssh-apache-php-fcgi:1.9.0
 ```
 
 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.8.1 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.9.0 \
   --name apache-php.pool-1.3.1
 ```
 
@@ -200,14 +212,16 @@ 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.8.1
+  jdeathe/centos-ssh-apache-php-fcgi:1.9.0
 ```
 
 #### Environment Variables
 
 ##### 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. In the following example the running container would respond to the host names `app-1.local` or `app-1`:
+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.
+
+In the following example the running container would respond to the host names `app-1.local` or `app-1`.
 
 ```
 ...
@@ -260,13 +274,13 @@ The variable `APACHE_EXTENDED_STATUS_ENABLED` allows you to turn ExtendedStatus
 ...
 ```
 
-You can view the output from Apache server-status either using the elinks browser from onboard the container or by using `watch` and `curl` to monitor status over time - the following command shows the server-status updated at a 1 second interval.
+You can view the output from Apache server-status either using the elinks browser from onboard the container or by using `watch` and `curl` to monitor status over time. The following command shows the server-status updated at a 1 second interval given an `APACHE_SERVER_NAME` or `APACHE_SERVER_ALIAS` of "app-1.local".
 
 ```
 $ docker exec -it apache-php.pool-1.1.1 \
   env TERM=xterm \
   watch -n 1 \
-  -d "curl -s http://app-1/server-status?auto"
+  -d "curl -sH 'Host: app-1.local' http://127.0.0.1/server-status?auto"
 ```
 
 ##### APACHE_HEADER_X_SERVICE_UID

environment.mk

@@ -60,7 +60,7 @@ APACHE_MPM ?= worker
 APACHE_PUBLIC_DIRECTORY ?= public_html
 APACHE_RUN_GROUP ?= app-www
 APACHE_RUN_USER ?= app-www
-APACHE_SERVER_ALIAS ?= app-1
-APACHE_SERVER_NAME ?= app-1.local
+APACHE_SERVER_ALIAS ?=
+APACHE_SERVER_NAME ?=
 APACHE_SYSTEM_USER ?= app
 PHP_OPTIONS_DATE_TIMEZONE ?= UTC

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.8.1"
+Environment="DOCKER_IMAGE_TAG=1.9.0"
 Environment="DOCKER_PORT_MAP_TCP_80=8080"
 Environment="DOCKER_PORT_MAP_TCP_443=9443"
 Environment="DOCKER_PORT_MAP_TCP_8443=NULL"
@@ -70,9 +70,8 @@ Environment="APACHE_OPERATING_MODE=production"
 Environment="APACHE_PUBLIC_DIRECTORY=public_html"
 Environment="APACHE_RUN_GROUP=app-www"
 Environment="APACHE_RUN_USER=app-www"
-Environment="APACHE_SERVER_ALIAS=app-1"
-Environment="APACHE_SERVER_HOME=/var/www"
-Environment="APACHE_SERVER_NAME=app-1.local"
+Environment="APACHE_SERVER_ALIAS="
+Environment="APACHE_SERVER_NAME="
 Environment="APACHE_SYSTEM_USER=app"
 Environment="PHP_OPTIONS_DATE_TIMEZONE=UTC"
 

opt/scmi/environment.sh

@@ -60,11 +60,11 @@ APACHE_HEADER_X_SERVICE_UID="${APACHE_HEADER_X_SERVICE_UID:-"{{HOSTNAME}}"}"
 APACHE_LOAD_MODULES="${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_OPERATING_MODE="${APACHE_OPERATING_MODE:-production}"
 APACHE_MOD_SSL_ENABLED="${APACHE_MOD_SSL_ENABLED:-false}"
-APACHE_MPM="${APACHE_MPM:-prefork}"
+APACHE_MPM="${APACHE_MPM:-worker}"
 APACHE_PUBLIC_DIRECTORY="${APACHE_PUBLIC_DIRECTORY:-public_html}"
 APACHE_RUN_GROUP="${APACHE_RUN_GROUP:-app-www}"
 APACHE_RUN_USER="${APACHE_RUN_USER:-app-www}"
-APACHE_SERVER_ALIAS="${APACHE_SERVER_ALIAS:-app-1}"
-APACHE_SERVER_NAME="${APACHE_SERVER_NAME:-app-1.local}"
+APACHE_SERVER_ALIAS="${APACHE_SERVER_ALIAS:-}"
+APACHE_SERVER_NAME="${APACHE_SERVER_NAME:-}"
 APACHE_SYSTEM_USER="${APACHE_SYSTEM_USER:-app}"
 PHP_OPTIONS_DATE_TIMEZONE="${PHP_OPTIONS_DATE_TIMEZONE:-UTC}"