From 8dd8b0d5d26211d6c964db101a7af0d79551e682 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 10 Sep 2019 12:31:18 +0200 Subject: simplify /etc copying --- Dockerfile | 3 +-- etc/httpd.d/documentroot.conf | 1 - etc/httpd/conf.d/jekyll-documentroot.conf | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 etc/httpd.d/documentroot.conf create mode 100644 etc/httpd/conf.d/jekyll-documentroot.conf diff --git a/Dockerfile b/Dockerfile index 07db11f..39bd9b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,8 +21,7 @@ RUN yum install -y centos-release-scl && \ yum clean all -y COPY ./s2i/bin/ /usr/libexec/s2i -COPY ./etc/httpd.d/* /etc/httpd/conf.d -COPY ./etc/scl_enable /etc +COPY ./etc/ /etc ENV BASH_ENV="/etc/scl_enable" diff --git a/etc/httpd.d/documentroot.conf b/etc/httpd.d/documentroot.conf deleted file mode 100644 index 14ce1df..0000000 --- a/etc/httpd.d/documentroot.conf +++ /dev/null @@ -1 +0,0 @@ -DocumentRoot /opt/app-root/src/html diff --git a/etc/httpd/conf.d/jekyll-documentroot.conf b/etc/httpd/conf.d/jekyll-documentroot.conf new file mode 100644 index 0000000..14ce1df --- /dev/null +++ b/etc/httpd/conf.d/jekyll-documentroot.conf @@ -0,0 +1 @@ +DocumentRoot /opt/app-root/src/html -- cgit