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

Release changes for 1.8.0

Author: jdeathe

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:centos-6-1.7.3
+FROM jdeathe/centos-ssh-apache-php:centos-6-1.8.0
 
 MAINTAINER James Deathe <james.deathe@gmail.com>
 
@@ -31,6 +31,13 @@ ADD opt/scmi \
 ADD etc/systemd/system \
 	/etc/systemd/system/
 
+# -----------------------------------------------------------------------------
+# Package installation
+# -----------------------------------------------------------------------------
+RUN sed -i \
+	-e 's~^description =.*$~description = "This CentOS / Apache / PHP (FastCGI) service is running in a container."~' \
+	${PACKAGE_PATH}/etc/views/index.ini
+
 # -----------------------------------------------------------------------------
 # Set default environment variables used to configure the service container
 # -----------------------------------------------------------------------------
@@ -39,7 +46,7 @@ ENV APACHE_MPM="worker"
 # -----------------------------------------------------------------------------
 # Set image metadata
 # -----------------------------------------------------------------------------
-ARG RELEASE_VERSION="1.7.2"
+ARG RELEASE_VERSION="1.8.0"
 LABEL \
 	install="docker run \
 --rm \
@@ -67,4 +74,4 @@ jdeathe/centos-ssh-apache-php-fcgi:centos-6-${RELEASE_VERSION} \
 	org.deathe.url="https://github.com/jdeathe/centos-ssh-apache-php-fcgi" \
 	org.deathe.description="CentOS-6 6.8 x86_64 - Apache 2.2, PHP 5.3 (FastCGI), PHP memcached 1.0, PHP APC 3.1."
 
-CMD ["/usr/bin/supervisord", "--configuration=/etc/supervisord.conf"]
+CMD ["/usr/sbin/httpd-startup", "/usr/bin/supervisord", "--configuration=/etc/supervisord.conf"]

README.md

@@ -43,7 +43,7 @@ $ docker run -d \
 
 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.
 
-![Hello World - PHP FastCGI Screen Shot - Chrome](https://raw.github.com/jdeathe/centos-ssh-apache-php-fcgi/centos-6/images/hello-world-php-fcgi-chrome.png)
+![PHP "Hello, world!" - Chrome screenshot](https://raw.github.com/jdeathe/centos-ssh-apache-php-fcgi/centos-6/images/php-hello-world-php-chrome-fcgi.png)
 
 To be able to access the server using the "app-1.local" domain name you need to add a hosts file entry locally; such that the IP address of the Docker host resolves to the name "app-1.local". Alternatively, you can use the elinks browser installed in the container. Note that because you are using the browser from the container you access the site over port 80.
 
@@ -52,7 +52,7 @@ $ docker exec -it apache-php.pool-1.1.1 \
   elinks http://app-1.local
 ```
 
-![Hello World - PHP FastCGI Screen Shot - eLinks](https://raw.github.com/jdeathe/centos-ssh-apache-php-fcgi/centos-6/images/hello-world-php-fcgi-elinks.png)
+![PHP "Hello, world!" - eLinks screenshot](https://raw.github.com/jdeathe/centos-ssh-apache-php-fcgi/centos-6/images/php-hello-world-php-elinks-fcgi.png)
 
 To verify the container is initialised and running successfully by inspecting the container's logs.
 

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=centos-6-1.7.2"
+Environment="DOCKER_IMAGE_TAG=centos-6-1.8.0"
 Environment="DOCKER_PORT_MAP_TCP_80=8080"
 Environment="DOCKER_PORT_MAP_TCP_443=9443"
 Environment="DOCKER_PORT_MAP_TCP_8443=NULL"