Skip to content
This repository was archived by the owner on Jul 2, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ 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 - 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).

### 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).
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 <james.deathe@gmail.com>" \
install="docker run \
Expand Down
38 changes: 19 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.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.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.

Expand Down Expand Up @@ -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.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.
Expand All @@ -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.

Expand All @@ -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
```

Expand All @@ -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
```

Expand All @@ -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 \
Expand All @@ -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"
```

Expand All @@ -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"
```

Expand All @@ -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"
```

Expand All @@ -181,15 +181,15 @@ 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.

```
$ 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
```

Expand All @@ -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
```

Expand All @@ -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
Expand Down Expand Up @@ -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.6
```

##### APACHE_MPM
Expand Down
2 changes: 1 addition & 1 deletion src/etc/systemd/system/centos-ssh-apache-php-fcgi@.service
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down