diff --git a/Dockerfile b/Dockerfile index 1a87323..beacd65 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ RUN echo "http://dl-cdn.alpinelinux.org/alpine/v3.10/community" >> /etc/apk/repo # install required packages #RUN apk add --no-cache gcc libc-dev libffi-dev openssl openssl-dev python3-dev -RUN apk add --no-cache openrc apache2 apache2-utils apache2-webdav mod_dav_svn subversion +RUN apk add --no-cache apache2 apache2-utils apache2-webdav mod_dav_svn subversion # add user that will be used to install and run the application RUN addgroup -g 1000 deploy @@ -20,7 +20,6 @@ RUN chown deploy:deploy /var/lib/dav/ # apache should run as user deploy RUN sed -i.bak -r 's/(User|Group) apache/\1 deploy/' /etc/apache2/httpd.conf -RUN openrc -RUN touch /run/openrc/softlevel -RUN rc-update add apache2 -RUN rc-service apache2 restart \ No newline at end of file +# copy the script to run httpd in foreground +COPY httpd-foreground /usr/local/bin/ +CMD ["httpd-foreground"] \ No newline at end of file diff --git a/httpd-foreground b/httpd-foreground new file mode 100644 index 0000000..b7f4d56 --- /dev/null +++ b/httpd-foreground @@ -0,0 +1,7 @@ +#!/bin/sh +set -e + +# Apache gets grumpy about PID files pre-existing +rm -f /usr/local/apache2/logs/httpd.pid + +exec httpd -DFOREGROUND "$@" \ No newline at end of file