From aab2b9255edbacd11f46f3eabcb42af403163bd4 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 10 Sep 2019 16:43:40 +0200 Subject: copy etc files separately --- Dockerfile | 3 ++- etc/httpd/conf.d/jekyll-documentroot.conf | 1 - etc/jekyll-documentroot.conf | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 etc/httpd/conf.d/jekyll-documentroot.conf create mode 100644 etc/jekyll-documentroot.conf diff --git a/Dockerfile b/Dockerfile index 6cf7e25..5b54863 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,8 @@ RUN yum install -y centos-release-scl && \ RUN cp /usr/libexec/s2i/run /usr/libexec/s2i/run.httpd COPY ./s2i/bin/ /usr/libexec/s2i -COPY ./etc/ /etc +COPY ./etc/scl_enable /etc/ +COPY ./etc/jekyll-documentroot.conf /etc/httpd/conf.d/ ENV BASH_ENV="/etc/scl_enable" diff --git a/etc/httpd/conf.d/jekyll-documentroot.conf b/etc/httpd/conf.d/jekyll-documentroot.conf deleted file mode 100644 index adf5beb..0000000 --- a/etc/httpd/conf.d/jekyll-documentroot.conf +++ /dev/null @@ -1 +0,0 @@ -DocumentRoot /opt/app-root/src/documentroot diff --git a/etc/jekyll-documentroot.conf b/etc/jekyll-documentroot.conf new file mode 100644 index 0000000..adf5beb --- /dev/null +++ b/etc/jekyll-documentroot.conf @@ -0,0 +1 @@ +DocumentRoot /opt/app-root/src/documentroot -- cgit