From 3c96111f6d37a1dadc3c0cf057b679717888e696 Mon Sep 17 00:00:00 2001 From: James Deathe Date: Mon, 3 Dec 2018 23:56:52 +0000 Subject: [PATCH 1/2] #155: Updates image source to 1.11.1. --- CHANGELOG.md | 4 ++++ Dockerfile | 2 +- README.md | 18 ++++++++++++++---- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3883ac..69e1e35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ Summary of release changes for Version 1. CentOS-6 6.10 x86_64, Apache 2.2, PHP-CGI 5.3 (FastCGI), PHP memcached 1.0, PHP APC 3.1. +### 1.11.1 - Unreleased + +- Updates image source to [1.11.1](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.11.1). + ### 1.11.0 - 2018-09-04 - Updates image source to [1.11.0](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.11.0). diff --git a/Dockerfile b/Dockerfile index ed506cc..3a1b3c7 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.11.0 +FROM jdeathe/centos-ssh-apache-php:1.11.1 # ----------------------------------------------------------------------------- # FastCGI support diff --git a/README.md b/README.md index 465f88c..d406907 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,25 @@ centos-ssh-apache-php-fcgi ========================== -Docker Image including CentOS-6 6.10 x86_64, Apache 2.2, PHP-CGI 5.3 (FastCGI), PHP memcached 1.0, PHP APC 3.1. +Docker Image including: +- CentOS-6 6.10 x86_64, Apache 2.2, PHP-CGI 5.3 (FastCGI), PHP memcached 1.0, PHP APC 3.1. +- CentOS-7 7.5.1804 x86_64, Apache 2.4, PHP-CGI 5.4 (FastCGI), PHP memcached 2.2, Zend Opcache 7.0. Apache PHP web server, loading only a minimal set of Apache modules by default. Supports custom configuration via environment variables. ## 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.11.0` or `1.11.0` for the [1.11.0](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/1.11.0) release tag. - +- `centos-7`, `centos-7-2.0.0`, `2.0.0` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-7/Dockerfile) - `centos-6`, `centos-6-1.11.0`, `1.11.0` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-6/Dockerfile) +#### centos-6 + +The latest CentOS-6 based release can be pulled from the centos-6 Docker tag. It is recommended to select a specific release tag - the convention is `centos-6-1.11.0` or `1.11.0` for the [1.11.0](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/1.11.0) release tag. + +#### centos-7 + +The latest CentOS-7 based release can be pulled from the centos-7 Docker tag. It is recommended to select a specific release tag - the convention is `centos-7-2.0.0` or `2.0.0` for the [2.0.0](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/2.0.0) release tag. + 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. Included in the build are the [SCL](https://www.softwarecollections.org/), [EPEL](http://fedoraproject.org/wiki/EPEL) and [IUS](https://ius.io) repositories. Installed packages include [OpenSSH](http://www.openssh.com/portable.html) secure shell, [vim-minimal](http://www.vim.org/), [elinks](http://elinks.or.cz) (for fullstatus support), PHP [APC](http://pecl.php.net/package/APC), PHP [Memcached](http://pecl.php.net/package/memcached) are installed along with python-setuptools, [supervisor](http://supervisord.org/) and [supervisor-stdout](https://github.com/coderanger/supervisor-stdout). @@ -65,7 +74,8 @@ On first run, the bootstrap script, ([/usr/sbin/httpd-bootstrap](https://github. The `apachectl` command can be accessed as follows. ``` -$ docker exec -it apache-php.pool-1.1.1 apachectl -h +$ docker exec -it apache-php.pool-1.1.1 \ + bash -c "apachectl -h" ``` ## Instructions From a157424fd93a3d26180c400b1630e9f78ac6e911 Mon Sep 17 00:00:00 2001 From: James Deathe Date: Sat, 8 Dec 2018 21:11:06 +0000 Subject: [PATCH 2/2] Release changes for 1.11.1 and 2.0.1. --- CHANGELOG.md | 2 +- Dockerfile | 2 +- README.md | 40 +++++++++---------- .../centos-ssh-apache-php-fcgi@.service | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69e1e35..ea97559 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ Summary of release changes for Version 1. CentOS-6 6.10 x86_64, Apache 2.2, PHP-CGI 5.3 (FastCGI), PHP memcached 1.0, PHP APC 3.1. -### 1.11.1 - Unreleased +### 1.11.1 - 2018-12-08 - Updates image source to [1.11.1](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.11.1). diff --git a/Dockerfile b/Dockerfile index 3a1b3c7..c4bf58b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ ENV APACHE_MPM="worker" # ----------------------------------------------------------------------------- # Set image metadata # ----------------------------------------------------------------------------- -ARG RELEASE_VERSION="1.11.0" +ARG RELEASE_VERSION="1.11.1" LABEL \ maintainer="James Deathe " \ install="docker run \ diff --git a/README.md b/README.md index d406907..7c81e60 100644 --- a/README.md +++ b/README.md @@ -9,16 +9,16 @@ Apache PHP web server, loading only a minimal set of Apache modules by default. ## Overview & links -- `centos-7`, `centos-7-2.0.0`, `2.0.0` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-7/Dockerfile) -- `centos-6`, `centos-6-1.11.0`, `1.11.0` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-6/Dockerfile) +- `centos-7`, `centos-7-2.0.1`, `2.0.1` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-7/Dockerfile) +- `centos-6`, `centos-6-1.11.1`, `1.11.1` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-6/Dockerfile) #### centos-6 -The latest CentOS-6 based release can be pulled from the centos-6 Docker tag. It is recommended to select a specific release tag - the convention is `centos-6-1.11.0` or `1.11.0` for the [1.11.0](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/1.11.0) release tag. +The latest CentOS-6 based release can be pulled from the centos-6 Docker tag. It is recommended to select a specific release tag - the convention is `centos-6-1.11.1` or `1.11.1` for the [1.11.1](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/1.11.1) release tag. #### centos-7 -The latest CentOS-7 based release can be pulled from the centos-7 Docker tag. It is recommended to select a specific release tag - the convention is `centos-7-2.0.0` or `2.0.0` for the [2.0.0](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/2.0.0) release tag. +The latest CentOS-7 based release can be pulled from the centos-7 Docker tag. It is recommended to select a specific release tag - the convention is `centos-7-2.0.1` or `2.0.1` for the [2.0.1](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/2.0.1) release tag. 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. @@ -47,7 +47,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.11.0 + jdeathe/centos-ssh-apache-php-fcgi:1.11.1 ``` 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. @@ -97,10 +97,10 @@ $ docker run \ --volume /:/media/root \ --env BASH_ENV="" \ --env ENV="" \ - jdeathe/centos-ssh-apache-php-fcgi:1.11.0 \ + jdeathe/centos-ssh-apache-php-fcgi:1.11.1 \ /usr/sbin/scmi install \ --chroot=/media/root \ - --tag=1.11.0 \ + --tag=1.11.1 \ --name=apache-php.pool-1.1.1 ``` @@ -115,10 +115,10 @@ $ docker run \ --volume /:/media/root \ --env BASH_ENV="" \ --env ENV="" \ - jdeathe/centos-ssh-apache-php-fcgi:1.11.0 \ + jdeathe/centos-ssh-apache-php-fcgi:1.11.1 \ /usr/sbin/scmi uninstall \ --chroot=/media/root \ - --tag=1.11.0 \ + --tag=1.11.1 \ --name=apache-php.pool-1.1.1 ``` @@ -133,10 +133,10 @@ $ docker run \ --volume /:/media/root \ --env BASH_ENV="" \ --env ENV="" \ - jdeathe/centos-ssh-apache-php-fcgi:1.11.0 \ + jdeathe/centos-ssh-apache-php-fcgi:1.11.1 \ /usr/sbin/scmi install \ --chroot=/media/root \ - --tag=1.11.0 \ + --tag=1.11.1 \ --name=apache-php.pool-1.1.1 \ --manager=systemd \ --register \ @@ -160,7 +160,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.11.0 + jdeathe/centos-ssh-apache-php-fcgi:1.11.1 ) --info" ``` @@ -170,7 +170,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.11.0 + jdeathe/centos-ssh-apache-php-fcgi:1.11.1 ) --name=apache-php.pool-1.2.1" ``` @@ -180,7 +180,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.11.0 + jdeathe/centos-ssh-apache-php-fcgi:1.11.1 ) --name=apache-php.pool-1.2.1" ``` @@ -191,7 +191,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.11.0 +$ docker pull jdeathe/centos-ssh-apache-php-fcgi:1.11.1 ``` To see detailed information about the image run `scmi` with the `--info` option. To see all available `scmi` options run with the `--help` option. @@ -199,7 +199,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.11.0 \ + jdeathe/centos-ssh-apache-php-fcgi:1.11.1 \ --info ``` @@ -208,14 +208,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.11.0 + jdeathe/centos-ssh-apache-php-fcgi:1.11.1 ``` 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.11.0 \ + jdeathe/centos-ssh-apache-php-fcgi:1.11.1 \ --name apache-php.pool-1.3.1 ``` @@ -224,7 +224,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.11.0 + jdeathe/centos-ssh-apache-php-fcgi:1.11.1 ``` #### Environment Variables @@ -353,7 +353,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.11.0 + jdeathe/centos-ssh-apache-php-fcgi:1.11.1 ``` ##### 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 a49e082..d4d1413 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.11.0" +Environment="DOCKER_IMAGE_TAG=1.11.1" Environment="DOCKER_PORT_MAP_TCP_80=8080" Environment="DOCKER_PORT_MAP_TCP_443=9443" Environment="DOCKER_PORT_MAP_TCP_8443=NULL"