coop-cloud-chaos-patchs/docker-simplesamlphp
0
0
Fork 0
mirror of https://github.com/3-w-c/docker-simplesamlphp.git synced 2025-09-06 21:42:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve php-fpm startup issues when host is CentOS

Browse Source
This commit is contained in:
Adam W Zheng
2017-09-07 11:33:53 -05:00
parent 7ab96a13f6
commit fd98e72957
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
1.14.15/Dockerfile
View File

@ -53,7 +53,8 @@ RUN mkdir -p /etc/services.d/nginx/ \
RUN mkdir -p /etc/services.d/php-fpm/ \ RUN mkdir -p /etc/services.d/php-fpm/ \
&& touch /etc/services.d/php-fpm/run \ && touch /etc/services.d/php-fpm/run \
&& echo '#!/usr/bin/execlineb -P' > /etc/services.d/php-fpm/run \ && echo '#!/usr/bin/execlineb -P' > /etc/services.d/php-fpm/run \
&& echo '/usr/sbin/php-fpm' >> /etc/services.d/php-fpm/run --nodaemonize && echo '/usr/sbin/php-fpm' >> /etc/services.d/php-fpm/run --nodaemonize \
&& sed -i 's|pid = /run/php-fpm/php-fpm.pid|pid = /run/php-fpm.pid|g' /etc/php-fpm.conf
#Copy the SimpleSAMLphp CLI Install Script into the Container to be executed on startup #Copy the SimpleSAMLphp CLI Install Script into the Container to be executed on startup
COPY install-simplesamlphp.sh /etc/cont-init.d/ COPY install-simplesamlphp.sh /etc/cont-init.d/

5
1.14.16/Dockerfile
View File

@ -4,7 +4,7 @@ MAINTAINER Adam Zheng adam.w.zheng@icloud.com
ENV S6_RELEASE 1.20.0.0 ENV S6_RELEASE 1.20.0.0
ENV SIMPLESAMLPHP_RELEASE 1.14.16 ENV SIMPLESAMLPHP_RELEASE 1.14.16
#Add S6 Overlay (Build via Docker 1.12) #Add S6 Overlay
ADD https://github.com/just-containers/s6-overlay/releases/download/v$S6_RELEASE/s6-overlay-amd64.tar.gz /tmp/ ADD https://github.com/just-containers/s6-overlay/releases/download/v$S6_RELEASE/s6-overlay-amd64.tar.gz /tmp/
RUN tar xzf /tmp/s6-overlay-amd64.tar.gz -C / --exclude="./bin" \ RUN tar xzf /tmp/s6-overlay-amd64.tar.gz -C / --exclude="./bin" \
&& tar xzf /tmp/s6-overlay-amd64.tar.gz -C /usr ./bin && tar xzf /tmp/s6-overlay-amd64.tar.gz -C /usr ./bin
@ -43,7 +43,8 @@ RUN mkdir -p /etc/services.d/nginx/ \
RUN mkdir -p /etc/services.d/php-fpm/ \ RUN mkdir -p /etc/services.d/php-fpm/ \
&& touch /etc/services.d/php-fpm/run \ && touch /etc/services.d/php-fpm/run \
&& echo '#!/usr/bin/execlineb -P' > /etc/services.d/php-fpm/run \ && echo '#!/usr/bin/execlineb -P' > /etc/services.d/php-fpm/run \
&& echo '/usr/sbin/php-fpm' >> /etc/services.d/php-fpm/run --nodaemonize && echo '/usr/sbin/php-fpm' >> /etc/services.d/php-fpm/run --nodaemonize \
&& sed -i 's|pid = /run/php-fpm/php-fpm.pid|pid = /run/php-fpm.pid|g' /etc/php-fpm.conf
#Copy the SimpleSAMLphp CLI Install Script into the Container to be executed on startup #Copy the SimpleSAMLphp CLI Install Script into the Container to be executed on startup
COPY install-simplesamlphp.sh /etc/cont-init.d/ COPY install-simplesamlphp.sh /etc/cont-init.d/