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

Commit bb4c2b7

Browse files
authored
Merge pull request #205 from jdeathe/issue/187
CLOSES #187: Updates image source to 1.13.0.
2 parents 33d2322 + 2ac473e commit bb4c2b7

File tree

10 files changed

+237
-2203
lines changed

10 files changed

+237
-2203
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Summary of release changes.
66

77
### 1.13.0 - Unreleased
88

9+
- Updates image source to [1.13.0](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.13.0).
910
- Updates description in `centos-ssh-apache-php-fcgi.register@.service`.
1011
- Updates CHANGELOG.md to simplify maintenance.
1112
- Updates README.md to simplify contents and improve readability.

Dockerfile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
FROM jdeathe/centos-ssh-apache-php:1.12.0
1+
FROM jdeathe/centos-ssh-apache-php:1.13.0
22

33
ARG RELEASE_VERSION="1.12.0"
44

55
# ------------------------------------------------------------------------------
6-
# - Base install of required packages
6+
# Base install of required packages
77
# ------------------------------------------------------------------------------
8-
RUN rpm --rebuilddb \
9-
&& yum -y erase \
8+
RUN yum -y erase \
109
php-5.3.3-49.el6 \
1110
&& yum -y install \
1211
--setopt=tsflags=nodocs \
@@ -37,9 +36,7 @@ RUN cat \
3736
/etc/httpd/conf.d/fcgid.conf \
3837
&& sed -i \
3938
-e "s~{{RELEASE_VERSION}}~${RELEASE_VERSION}~g" \
40-
/etc/systemd/system/centos-ssh-apache-php-fcgi@.service \
41-
&& chmod 700 \
42-
/usr/{bin/healthcheck,sbin/httpd-{bootstrap,wrapper}}
39+
/etc/systemd/system/centos-ssh-apache-php-fcgi@.service
4340

4441
# ------------------------------------------------------------------------------
4542
# Package installation
@@ -54,7 +51,8 @@ RUN sed -i \
5451
# ------------------------------------------------------------------------------
5552
# Set default environment variables used to configure the service container
5653
# ------------------------------------------------------------------------------
57-
ENV APACHE_MPM="worker"
54+
ENV \
55+
APACHE_MPM="worker"
5856

5957
# ------------------------------------------------------------------------------
6058
# Set image metadata

0 commit comments

Comments
 (0)