From b9c9304e578e6c834cf89837ef149c1291fd0e37 Mon Sep 17 00:00:00 2001 From: James Deathe Date: Mon, 21 May 2018 20:31:14 +0100 Subject: [PATCH 1/3] ISSUE 142: Fixes broken links in the README. --- CHANGELOG.md | 4 ++++ README.md | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b8c884..6264c00 100644 --- a/CHANGELOG.md +++ b/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.6 - Unreleased + +- Fixes broken links in the README document. + ### 1.10.5 - 2018-05-21 - Updates image source to [release 1.10.5](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.10.5). diff --git a/README.md b/README.md index ab0f27a..857f950 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ 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.5` or `1.10.5` for the [1.10.5](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.5` or `1.10.5` for the [1.10.5](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/1.10.5) release tag. - `centos-6`, `centos-6-1.10.5`, `1.10.5` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-6/Dockerfile) @@ -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/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. +On first run, the bootstrap script, ([/usr/sbin/httpd-bootstrap](https://github.com/jdeathe/centos-ssh-apache-php/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. From 23ba24e82bbde143c701b5ae694feaba4fafb3c3 Mon Sep 17 00:00:00 2001 From: James Deathe Date: Thu, 21 Jun 2018 01:17:04 +0100 Subject: [PATCH 2/3] ISSUE 144: Updates image source to 1.10.6. --- CHANGELOG.md | 1 + Dockerfile | 2 +- README.md | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6264c00..170b1c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ CentOS-6 6.9 x86_64, Apache 2.2, PHP-CGI 5.3 (FastCGI), PHP memcached 1.0, PHP A ### 1.10.6 - Unreleased - Fixes broken links in the README document. +- Updates image source to [release 1.10.6](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.10.6). ### 1.10.5 - 2018-05-21 diff --git a/Dockerfile b/Dockerfile index 62c8440..4d8b0b9 100644 --- a/Dockerfile +++ b/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.5 +FROM jdeathe/centos-ssh-apache-php:1.10.6 # ----------------------------------------------------------------------------- # FastCGI support diff --git a/README.md b/README.md index 857f950..bfaaf11 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ $ docker run -d \ --name apache-php.pool-1.1.1 \ -p 8080:80 \ -e "APACHE_SERVER_NAME=app-1.local" \ - jdeathe/centos-ssh-apache-php-fcgi:centos-6 + jdeathe/centos-ssh-apache-php-fcgi:1.10.5 ``` 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. @@ -343,7 +343,7 @@ $ docker run -d \ --env "APACHE_SERVER_NAME=app-1.local" \ --env "APACHE_MOD_SSL_ENABLED=true" \ --volume apache-php.pool-1.1.1.data-ssl:/etc/services-config/ssl \ - jdeathe/centos-ssh-apache-php-fcgi:centos-6 + jdeathe/centos-ssh-apache-php-fcgi:1.10.5 ``` ##### APACHE_MPM From c9d2c15785fd27ce7d144852fdf930f62abbcc77 Mon Sep 17 00:00:00 2001 From: James Deathe Date: Thu, 21 Jun 2018 01:27:12 +0100 Subject: [PATCH 3/3] Release changes for 1.10.6 --- CHANGELOG.md | 2 +- Dockerfile | 2 +- README.md | 36 +++++++++---------- .../centos-ssh-apache-php-fcgi@.service | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 170b1c7..15d9a81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ 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.6 - Unreleased +### 1.10.6 - 2018-06-21 - Fixes broken links in the README document. - Updates image source to [release 1.10.6](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.10.6). diff --git a/Dockerfile b/Dockerfile index 4d8b0b9..102972b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ ENV APACHE_MPM="worker" # ----------------------------------------------------------------------------- # Set image metadata # ----------------------------------------------------------------------------- -ARG RELEASE_VERSION="1.10.5" +ARG RELEASE_VERSION="1.10.6" LABEL \ maintainer="James Deathe " \ install="docker run \ diff --git a/README.md b/README.md index bfaaf11..6951df9 100644 --- a/README.md +++ b/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.5` or `1.10.5` for the [1.10.5](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/1.10.5) 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.6` or `1.10.6` for the [1.10.6](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/1.10.6) release tag. -- `centos-6`, `centos-6-1.10.5`, `1.10.5` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-6/Dockerfile) +- `centos-6`, `centos-6-1.10.6`, `1.10.6` [(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. @@ -38,7 +38,7 @@ $ docker run -d \ --name apache-php.pool-1.1.1 \ -p 8080:80 \ -e "APACHE_SERVER_NAME=app-1.local" \ - jdeathe/centos-ssh-apache-php-fcgi:1.10.5 + jdeathe/centos-ssh-apache-php-fcgi:1.10.6 ``` 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. @@ -87,10 +87,10 @@ $ docker run \ --volume /:/media/root \ --env BASH_ENV="" \ --env ENV="" \ - jdeathe/centos-ssh-apache-php-fcgi:1.10.5 \ + jdeathe/centos-ssh-apache-php-fcgi:1.10.6 \ /usr/sbin/scmi install \ --chroot=/media/root \ - --tag=1.10.5 \ + --tag=1.10.6 \ --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.5 \ + jdeathe/centos-ssh-apache-php-fcgi:1.10.6 \ /usr/sbin/scmi uninstall \ --chroot=/media/root \ - --tag=1.10.5 \ + --tag=1.10.6 \ --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.5 \ + jdeathe/centos-ssh-apache-php-fcgi:1.10.6 \ /usr/sbin/scmi install \ --chroot=/media/root \ - --tag=1.10.5 \ + --tag=1.10.6 \ --name=apache-php.pool-1.1.1 \ --manager=systemd \ --register \ @@ -150,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.5 + jdeathe/centos-ssh-apache-php-fcgi:1.10.6 ) --info" ``` @@ -160,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.5 + jdeathe/centos-ssh-apache-php-fcgi:1.10.6 ) --name=apache-php.pool-1.2.1" ``` @@ -170,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.5 + jdeathe/centos-ssh-apache-php-fcgi:1.10.6 ) --name=apache-php.pool-1.2.1" ``` @@ -181,7 +181,7 @@ 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.5 +$ docker pull jdeathe/centos-ssh-apache-php-fcgi:1.10.6 ``` To see detailed information about the image run `scmi` with the `--info` option. To see all available `scmi` options run with the `--help` option. @@ -189,7 +189,7 @@ To see detailed information about the image run `scmi` with the `--info` option. ``` $ sudo -E atomic install \ -n apache-php.pool-1.3.1 \ - jdeathe/centos-ssh-apache-php-fcgi:1.10.5 \ + jdeathe/centos-ssh-apache-php-fcgi:1.10.6 \ --info ``` @@ -198,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.5 + jdeathe/centos-ssh-apache-php-fcgi:1.10.6 ``` 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.5 \ + jdeathe/centos-ssh-apache-php-fcgi:1.10.6 \ --name apache-php.pool-1.3.1 ``` @@ -214,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.5 + jdeathe/centos-ssh-apache-php-fcgi:1.10.6 ``` #### Environment Variables @@ -343,7 +343,7 @@ $ docker run -d \ --env "APACHE_SERVER_NAME=app-1.local" \ --env "APACHE_MOD_SSL_ENABLED=true" \ --volume apache-php.pool-1.1.1.data-ssl:/etc/services-config/ssl \ - jdeathe/centos-ssh-apache-php-fcgi:1.10.5 + jdeathe/centos-ssh-apache-php-fcgi:1.10.6 ``` ##### APACHE_MPM diff --git a/src/etc/systemd/system/centos-ssh-apache-php-fcgi@.service b/src/etc/systemd/system/centos-ssh-apache-php-fcgi@.service index ba2e9e2..f77efe5 100644 --- a/src/etc/systemd/system/centos-ssh-apache-php-fcgi@.service +++ b/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.5" +Environment="DOCKER_IMAGE_TAG=1.10.6" Environment="DOCKER_PORT_MAP_TCP_80=8080" Environment="DOCKER_PORT_MAP_TCP_443=9443" Environment="DOCKER_PORT_MAP_TCP_8443=NULL"