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

Commit 7b329f4

Browse files
authored
Merge pull request #83 from jdeathe/issue/82
CLOSES #82: Updates source tag to 1.5.0
2 parents 3a5a4e2 + ee3157c commit 7b329f4

13 files changed

+960
-166
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
packages

Dockerfile

Lines changed: 10 additions & 7 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:centos-6-1.4.5
7+
FROM jdeathe/centos-ssh-apache-php:centos-6-1.5.0
88

99
MAINTAINER James Deathe <james.deathe@gmail.com>
1010

@@ -13,10 +13,10 @@ MAINTAINER James Deathe <james.deathe@gmail.com>
1313
# -----------------------------------------------------------------------------
1414
RUN rpm --rebuilddb \
1515
&& yum -y erase \
16-
php-5.3.3-46.el6_6 \
16+
php-5.3.3-48.el6_8 \
1717
&& yum --setopt=tsflags=nodocs -y install \
18-
fcgi-2.4.0-12.el6 \
19-
mod_fcgid-2.3.9-1.el6 \
18+
fcgi.x86_64 0:2.4.0-12.el6 \
19+
mod_fcgid.x86_64 0:2.3.9-1.el6 \
2020
&& yum versionlock add \
2121
fcgi \
2222
mod_fcgid \
@@ -26,12 +26,15 @@ RUN rpm --rebuilddb \
2626
# -----------------------------------------------------------------------------
2727
# Copy files into place
2828
# -----------------------------------------------------------------------------
29-
ADD etc/services-config/httpd/conf.d/fcgid.conf /etc/services-config/httpd/conf.d/
30-
RUN ln -sf /etc/services-config/httpd/conf.d/fcgid.conf /etc/httpd/conf.d/fcgid.conf
29+
ADD etc/services-config/httpd/conf.d/fcgid.conf \
30+
/etc/services-config/httpd/conf.d/
31+
RUN ln -sf \
32+
/etc/services-config/httpd/conf.d/fcgid.conf \
33+
/etc/httpd/conf.d/fcgid.conf
3134

3235
# -----------------------------------------------------------------------------
3336
# Set default environment variables used to configure the service container
3437
# -----------------------------------------------------------------------------
35-
ENV HTTPD /usr/sbin/httpd.worker
38+
ENV HTTPD="/usr/sbin/httpd.worker"
3639

3740
CMD ["/usr/bin/supervisord", "--configuration=/etc/supervisord.conf"]

0 commit comments

Comments
 (0)