diff options
| author | Jamie Nguyen <j@jamielinux.com> | 2018-07-17 14:11:52 +0100 |
|---|---|---|
| committer | Jamie Nguyen <j@jamielinux.com> | 2018-07-17 14:11:52 +0100 |
| commit | da253163d5352f5487d68d0ae30a1667482de1cb (patch) | |
| tree | a910ea9551757ac115c06f8b54bf91fd686d6db8 | |
| parent | e1f08ea957716adc1a9e42eed18963de3d384e3d (diff) | |
| download | apache-da253163d5352f5487d68d0ae30a1667482de1cb.tar.gz apache-da253163d5352f5487d68d0ae30a1667482de1cb.tar.bz2 apache-da253163d5352f5487d68d0ae30a1667482de1cb.tar.xz apache-da253163d5352f5487d68d0ae30a1667482de1cb.zip | |
Switch to copying whole directory of config files
| -rw-r--r-- | 2.4/Dockerfile | 13 | ||||
| -rw-r--r-- | 2.4/conf/conf-available/dav.conf (renamed from 2.4/dav.conf) | 0 | ||||
| -rw-r--r-- | 2.4/conf/sites-available/default-ssl.conf (renamed from 2.4/default-ssl.conf) | 0 | ||||
| -rw-r--r-- | 2.4/conf/sites-available/default.conf (renamed from 2.4/default.conf) | 0 |
4 files changed, 3 insertions, 10 deletions
diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 151bd38..58e3ea7 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -4,17 +4,8 @@ MAINTAINER Bytemark Hosting "support@bytemark.co.uk" # This variable is inherited from httpd:alpine image: # ENV HTTPD_PREFIX /usr/local/apache2 -RUN set -ex; \ - # Create Debian-style subdirectories. - mkdir -p "$HTTPD_PREFIX/conf/conf-available"; \ - mkdir -p "$HTTPD_PREFIX/conf/conf-enabled"; \ - mkdir -p "$HTTPD_PREFIX/conf/sites-available"; \ - mkdir -p "$HTTPD_PREFIX/conf/sites-enabled" - # Copy in our configuration files. -COPY dav.conf "$HTTPD_PREFIX/conf/conf-available" -COPY default.conf "$HTTPD_PREFIX/conf/sites-available" -COPY default-ssl.conf "$HTTPD_PREFIX/conf/sites-available" +COPY conf/ "$HTTPD_PREFIX/conf/" RUN set -ex; \ # Create empty default DocumentRoot. @@ -51,6 +42,8 @@ RUN set -ex; \ >> "$HTTPD_PREFIX/conf/httpd.conf"; \ \ # Enable dav and default site. + mkdir -p "$HTTPD_PREFIX/conf/conf-enabled"; \ + mkdir -p "$HTTPD_PREFIX/conf/sites-enabled"; \ ln -s ../conf-available/dav.conf "$HTTPD_PREFIX/conf/conf-enabled"; \ ln -s ../sites-available/default.conf "$HTTPD_PREFIX/conf/sites-enabled" diff --git a/2.4/dav.conf b/2.4/conf/conf-available/dav.conf index caacd03..caacd03 100644 --- a/2.4/dav.conf +++ b/2.4/conf/conf-available/dav.conf diff --git a/2.4/default-ssl.conf b/2.4/conf/sites-available/default-ssl.conf index ef90866..ef90866 100644 --- a/2.4/default-ssl.conf +++ b/2.4/conf/sites-available/default-ssl.conf diff --git a/2.4/default.conf b/2.4/conf/sites-available/default.conf index e309338..e309338 100644 --- a/2.4/default.conf +++ b/2.4/conf/sites-available/default.conf |