aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2019-09-10 12:31:18 +0200
committerGerd Hoffmann <kraxel@redhat.com>2019-09-10 12:31:18 +0200
commit8dd8b0d5d26211d6c964db101a7af0d79551e682 (patch)
treefa0cc201309c0b0ce6e3b5872f40efb817dd95b3
parent4c0ab49fdd18e33fcba99fe4de692a1c56b6d82c (diff)
downloads2i-jekyll-8dd8b0d5d26211d6c964db101a7af0d79551e682.tar.gz
simplify /etc copying
-rw-r--r--Dockerfile3
-rw-r--r--etc/httpd/conf.d/jekyll-documentroot.conf (renamed from etc/httpd.d/documentroot.conf)0
2 files changed, 1 insertions, 2 deletions
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/conf.d/jekyll-documentroot.conf
index 14ce1df..14ce1df 100644
--- a/etc/httpd.d/documentroot.conf
+++ b/etc/httpd/conf.d/jekyll-documentroot.conf