diff --git a/Dockerfile b/Dockerfile index ff9b91d..e7ca6e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,6 +48,10 @@ RUN chmod +x /usr/local/bin/docker-entrypoint.sh COPY run-tests.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/run-tests.sh +# Put an apache foreground script in place +COPY httpd-foreground /usr/local/bin/httpd-foreground +RUN chmod +x /usr/local/bin/httpd-foreground + #COPY docker-entrypoint-tests.sh /usr/local/bin/ #RUN chmod +x /usr/local/bin/docker-entrypoint-tests.sh diff --git a/httpd-foreground b/httpd-foreground new file mode 100644 index 0000000..29aa3eb --- /dev/null +++ b/httpd-foreground @@ -0,0 +1,12 @@ +#!/bin/bash + +# Copied from official httpd container: https://github.com/docker-library/httpd/blob/fa5223d83a5225aa3fd5b23229b785c7764142bf/2.2/httpd-foreground + +set -e + +env + +# Apache gets grumpy about PID files pre-existing +rm -f /usr/local/apache2/logs/apache2.pid + +exec apache2 -DFOREGROUND \ No newline at end of file