Add a pid cleaner in case container was killed unexpectedly

Author: yosifkit

5.4/apache/Dockerfile

@@ -67,8 +67,9 @@ RUN buildDeps=" \
 COPY docker-php-ext-* /usr/local/bin/
 
 ##<autogenerated>##
+COPY apache2-foreground /usr/local/bin/
 WORKDIR /var/www/html
 
 EXPOSE 80
-CMD ["apache2", "-DFOREGROUND"]
+CMD ["apache2-foreground"]
 ##</autogenerated>##

5.4/apache/apache2-foreground

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+
+# Apache gets grumpy about PID files pre-existing
+rm -f /var/run/apache2/apache2.pid
+
+exec apache2 -DFOREGROUND

5.5/apache/Dockerfile

@@ -67,8 +67,9 @@ RUN buildDeps=" \
 COPY docker-php-ext-* /usr/local/bin/
 
 ##<autogenerated>##
+COPY apache2-foreground /usr/local/bin/
 WORKDIR /var/www/html
 
 EXPOSE 80
-CMD ["apache2", "-DFOREGROUND"]
+CMD ["apache2-foreground"]
 ##</autogenerated>##

5.5/apache/apache2-foreground

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+
+# Apache gets grumpy about PID files pre-existing
+rm -f /var/run/apache2/apache2.pid
+
+exec apache2 -DFOREGROUND

5.6/apache/Dockerfile

@@ -67,8 +67,9 @@ RUN buildDeps=" \
 COPY docker-php-ext-* /usr/local/bin/
 
 ##<autogenerated>##
+COPY apache2-foreground /usr/local/bin/
 WORKDIR /var/www/html
 
 EXPOSE 80
-CMD ["apache2", "-DFOREGROUND"]
+CMD ["apache2-foreground"]
 ##</autogenerated>##

5.6/apache/apache2-foreground

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+
+# Apache gets grumpy about PID files pre-existing
+rm -f /var/run/apache2/apache2.pid
+
+exec apache2 -DFOREGROUND

apache-Dockerfile-block-2

@@ -1,4 +1,5 @@
+COPY apache2-foreground /usr/local/bin/
 WORKDIR /var/www/html
 
 EXPOSE 80
-CMD ["apache2", "-DFOREGROUND"]
+CMD ["apache2-foreground"]

apache2.conf

@@ -51,9 +51,6 @@ for version in "${versions[@]}"; do
 			s/^(ENV PHP_VERSION) .*/\1 '"$fullVersion"'/;
 			s/^(RUN gpg .* --recv-keys) [0-9a-fA-F ]*$/\1 '"$gpgKey"'/
 		' "$version/Dockerfile" "$version/"*/Dockerfile
-		
-		cp apache2.conf "$version/apache/"
-		cp php-fpm.conf "$version/fpm/"
 	)
 done