Skip to content
This repository was archived by the owner on Jul 2, 2024. It is now read-only.

Commit 6d57526

Browse files
authored
Merge pull request #132 from jdeathe/centos-6-develop
Release changes for 1.10.2
2 parents 67f761c + b011a61 commit 6d57526

File tree

5 files changed

+33
-19
lines changed

5 files changed

+33
-19
lines changed

.dockerignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
.git
2+
.gitignore
3+
dist
4+
test
5+
LICENSE
6+
README-short.txt
7+
*.md
8+
!README.md
9+
**/*.mk
10+
**/Makefile

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ Summary of release changes for Version 1.
66

77
CentOS-6 6.9 x86_64, Apache 2.2, PHP-CGI 5.3 (FastCGI), PHP memcached 1.0, PHP APC 3.1.
88

9+
### 1.10.2 - 2017-12-27
10+
11+
- Updates image source to [release 1.10.2](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.10.2).
12+
913
### 1.10.1 - 2017-09-28
1014

1115
- Updates image source to [release 1.10.1](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.10.1).

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# CentOS-6, Apache 2.2, PHP 5.3, PHP Memcached 1.0, PHP APC 3.1.
55
#
66
# =============================================================================
7-
FROM jdeathe/centos-ssh-apache-php:1.10.1
7+
FROM jdeathe/centos-ssh-apache-php:1.10.2
88

99
# -----------------------------------------------------------------------------
1010
# FastCGI support
@@ -46,7 +46,7 @@ ENV APACHE_MPM="worker"
4646
# -----------------------------------------------------------------------------
4747
# Set image metadata
4848
# -----------------------------------------------------------------------------
49-
ARG RELEASE_VERSION="1.10.1"
49+
ARG RELEASE_VERSION="1.10.2"
5050
LABEL \
5151
maintainer="James Deathe <james.deathe@gmail.com>" \
5252
install="docker run \

README.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ Apache PHP web server, loading only a minimal set of Apache modules by default.
77

88
## Overview & links
99

10-
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.1` or `1.10.1` for the [1.10.1](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/1.7.0) release tag.
10+
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.2` or `1.10.2` for the [1.10.2](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/1.7.0) release tag.
1111

12-
- `centos-6`, `centos-6-1.10.1`, `1.10.1` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-6/Dockerfile)
12+
- `centos-6`, `centos-6-1.10.2`, `1.10.2` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-6/Dockerfile)
1313

1414
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.
1515

@@ -87,10 +87,10 @@ $ docker run \
8787
--volume /:/media/root \
8888
--env BASH_ENV="" \
8989
--env ENV="" \
90-
jdeathe/centos-ssh-apache-php-fcgi:1.10.1 \
90+
jdeathe/centos-ssh-apache-php-fcgi:1.10.2 \
9191
/usr/sbin/scmi install \
9292
--chroot=/media/root \
93-
--tag=1.10.1 \
93+
--tag=1.10.2 \
9494
--name=apache-php.pool-1.1.1
9595
```
9696

@@ -105,10 +105,10 @@ $ docker run \
105105
--volume /:/media/root \
106106
--env BASH_ENV="" \
107107
--env ENV="" \
108-
jdeathe/centos-ssh-apache-php-fcgi:1.10.1 \
108+
jdeathe/centos-ssh-apache-php-fcgi:1.10.2 \
109109
/usr/sbin/scmi uninstall \
110110
--chroot=/media/root \
111-
--tag=1.10.1 \
111+
--tag=1.10.2 \
112112
--name=apache-php.pool-1.1.1
113113
```
114114

@@ -123,10 +123,10 @@ $ docker run \
123123
--volume /:/media/root \
124124
--env BASH_ENV="" \
125125
--env ENV="" \
126-
jdeathe/centos-ssh-apache-php-fcgi:1.10.1 \
126+
jdeathe/centos-ssh-apache-php-fcgi:1.10.2 \
127127
/usr/sbin/scmi install \
128128
--chroot=/media/root \
129-
--tag=1.10.1 \
129+
--tag=1.10.2 \
130130
--name=apache-php.pool-1.1.1 \
131131
--manager=systemd \
132132
--register \
@@ -148,7 +148,7 @@ To see detailed information about the image run `scmi` with the `--info` option.
148148
$ eval "sudo -E $(
149149
docker inspect \
150150
-f "{{.ContainerConfig.Labels.install}}" \
151-
jdeathe/centos-ssh-apache-php-fcgi:1.10.1
151+
jdeathe/centos-ssh-apache-php-fcgi:1.10.2
152152
) --info"
153153
```
154154

@@ -158,7 +158,7 @@ To perform an installation using the docker name `apache-php.pool-1.2.1` simply
158158
$ eval "sudo -E $(
159159
docker inspect \
160160
-f "{{.ContainerConfig.Labels.install}}" \
161-
jdeathe/centos-ssh-apache-php-fcgi:1.10.1
161+
jdeathe/centos-ssh-apache-php-fcgi:1.10.2
162162
) --name=apache-php.pool-1.2.1"
163163
```
164164

@@ -168,7 +168,7 @@ To uninstall use the *same command* that was used to install but with the `unins
168168
$ eval "sudo -E $(
169169
docker inspect \
170170
-f "{{.ContainerConfig.Labels.uninstall}}" \
171-
jdeathe/centos-ssh-apache-php-fcgi:1.10.1
171+
jdeathe/centos-ssh-apache-php-fcgi:1.10.2
172172
) --name=apache-php.pool-1.2.1"
173173
```
174174

@@ -179,15 +179,15 @@ With the addition of install/uninstall image labels it is possible to use [Proje
179179
_NOTE:_ A prerequisite of the following examples is that the image has been pulled (or loaded from the release package).
180180

181181
```
182-
$ docker pull jdeathe/centos-ssh-apache-php-fcgi:1.10.1
182+
$ docker pull jdeathe/centos-ssh-apache-php-fcgi:1.10.2
183183
```
184184

185185
To see detailed information about the image run `scmi` with the `--info` option. To see all available `scmi` options run with the `--help` option.
186186

187187
```
188188
$ sudo -E atomic install \
189189
-n apache-php.pool-1.3.1 \
190-
jdeathe/centos-ssh-apache-php-fcgi:1.10.1 \
190+
jdeathe/centos-ssh-apache-php-fcgi:1.10.2 \
191191
--info
192192
```
193193

@@ -196,14 +196,14 @@ To perform an installation using the docker name `apache-php.pool-1.3.1` simply
196196
```
197197
$ sudo -E atomic install \
198198
-n apache-php.pool-1.3.1 \
199-
jdeathe/centos-ssh-apache-php-fcgi:1.10.1
199+
jdeathe/centos-ssh-apache-php-fcgi:1.10.2
200200
```
201201

202202
Alternatively, you could use the `scmi` options `--name` or `-n` for naming the container.
203203

204204
```
205205
$ sudo -E atomic install \
206-
jdeathe/centos-ssh-apache-php-fcgi:1.10.1 \
206+
jdeathe/centos-ssh-apache-php-fcgi:1.10.2 \
207207
--name apache-php.pool-1.3.1
208208
```
209209

@@ -212,7 +212,7 @@ To uninstall use the *same command* that was used to install but with the `unins
212212
```
213213
$ sudo -E atomic uninstall \
214214
-n apache-php.pool-1.3.1 \
215-
jdeathe/centos-ssh-apache-php-fcgi:1.10.1
215+
jdeathe/centos-ssh-apache-php-fcgi:1.10.2
216216
```
217217

218218
#### Environment Variables

src/etc/systemd/system/centos-ssh-apache-php-fcgi@.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Environment="DOCKER_USER=jdeathe"
5252
Environment="DOCKER_CONTAINER_OPTS="
5353
Environment="DOCKER_IMAGE_PACKAGE_PATH=/var/opt/scmi/packages"
5454
Environment="DOCKER_IMAGE_NAME=centos-ssh-apache-php-fcgi"
55-
Environment="DOCKER_IMAGE_TAG=1.10.1"
55+
Environment="DOCKER_IMAGE_TAG=1.10.2"
5656
Environment="DOCKER_PORT_MAP_TCP_80=8080"
5757
Environment="DOCKER_PORT_MAP_TCP_443=9443"
5858
Environment="DOCKER_PORT_MAP_TCP_8443=NULL"

0 commit comments

Comments
 (0)