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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Summary of release changes.

### 1.13.0 - Unreleased

- Updates image source to [1.13.0](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.13.0).
- Updates description in `centos-ssh-apache-php-fcgi.register@.service`.
- Updates CHANGELOG.md to simplify maintenance.
- Updates README.md to simplify contents and improve readability.
Expand Down
14 changes: 6 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
FROM jdeathe/centos-ssh-apache-php:1.12.0
FROM jdeathe/centos-ssh-apache-php:1.13.0

ARG RELEASE_VERSION="1.12.0"

# ------------------------------------------------------------------------------
# - Base install of required packages
# Base install of required packages
# ------------------------------------------------------------------------------
RUN rpm --rebuilddb \
&& yum -y erase \
RUN yum -y erase \
php-5.3.3-49.el6 \
&& yum -y install \
--setopt=tsflags=nodocs \
Expand Down Expand Up @@ -37,9 +36,7 @@ RUN cat \
/etc/httpd/conf.d/fcgid.conf \
&& sed -i \
-e "s~{{RELEASE_VERSION}}~${RELEASE_VERSION}~g" \
/etc/systemd/system/centos-ssh-apache-php-fcgi@.service \
&& chmod 700 \
/usr/{bin/healthcheck,sbin/httpd-{bootstrap,wrapper}}
/etc/systemd/system/centos-ssh-apache-php-fcgi@.service

# ------------------------------------------------------------------------------
# Package installation
Expand All @@ -54,7 +51,8 @@ RUN sed -i \
# ------------------------------------------------------------------------------
# Set default environment variables used to configure the service container
# ------------------------------------------------------------------------------
ENV APACHE_MPM="worker"
ENV \
APACHE_MPM="worker"

# ------------------------------------------------------------------------------
# Set image metadata
Expand Down
Loading