diff options
| -rw-r--r-- | 2.4/Dockerfile | 18 | ||||
| -rw-r--r-- | 2.4/conf/conf-available/pid.conf | 1 |
2 files changed, 11 insertions, 8 deletions
diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 6ba5e7a..6d02469 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -4,10 +4,9 @@ FROM httpd:alpine # ENV HTTPD_PREFIX /usr/local/apache2 # WORKDIR "$HTTPD_PREFIX" -# Copy in our configuration files. -COPY conf/ conf/ - RUN set -ex; \ + # Install openssl if we need to generate a self-signed certificate. + apk add --no-cache openssl; \ # Create empty default DocumentRoot. mkdir -p "/var/www/html"; \ # Create directories for Dav data and lock database. @@ -43,17 +42,20 @@ RUN set -ex; \ printf '%s\n' "Include conf/conf-enabled/*.conf" \ >> "conf/httpd.conf"; \ printf '%s\n' "Include conf/sites-enabled/*.conf" \ - >> "conf/httpd.conf"; \ - \ + >> "conf/httpd.conf" + +COPY conf/ conf/ + +RUN set -ex; \ # Enable dav and default site. mkdir -p "conf/conf-enabled"; \ mkdir -p "conf/sites-enabled"; \ ln -s ../conf-available/dav.conf "conf/conf-enabled"; \ - ln -s ../sites-available/default.conf "conf/sites-enabled"; \ - # Install openssl if we need to generate a self-signed certificate. - apk add --no-cache openssl + ln -s ../conf-available/pid.conf "conf/conf-enabled"; \ + ln -s ../sites-available/default.conf "conf/sites-enabled" COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh + EXPOSE 8080/tcp 4430/tcp ENTRYPOINT [ "docker-entrypoint.sh" ] CMD [ "httpd-foreground" ] diff --git a/2.4/conf/conf-available/pid.conf b/2.4/conf/conf-available/pid.conf new file mode 100644 index 0000000..f88307b --- /dev/null +++ b/2.4/conf/conf-available/pid.conf @@ -0,0 +1 @@ +PidFile "/tmp/httpd.pid" |