aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2019-09-05 22:17:51 +0200
committerGerd Hoffmann <kraxel@redhat.com>2019-09-05 22:17:51 +0200
commitd685aba4b23737d9a6285175e3fce35e98cacefd (patch)
tree3af1d83f66e484ab0d08f0a9ef1e207acfdf159f
parent192ae1279dbbd5c4d403ca77336e401b7aad130b (diff)
downloads2i-jekyll-d685aba4b23737d9a6285175e3fce35e98cacefd.tar.gz
fix dir setup
-rw-r--r--Dockerfile11
1 files changed, 6 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile
index 9831fc0..20327c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,11 +27,12 @@ RUN source /opt/rh/rh-ruby${RH_RUBY_VERSION}/enable; \
# COPY ./<builder_folder>/ /opt/app-root/
COPY ./s2i/bin/ /usr/libexec/s2i
-
-# TODO: Drop the root user and make the content of /opt/app-root owned by user 1001
-# RUN chown -R 1001:1001 /opt/app-root
-RUN chown -R 1001:1001 /var/www/html
-RUN echo "Listen 8080" > /etc/httpd/conf.d/port-8080.conf
+COPY ./etc/httpd.conf /opt/app-root/etc
+RUN mkdir -p /run/httpd \
+ /opt/app-root/run \
+ /opt/app-root/html; \
+ chown -R 1001 /run/httpd \
+ /opt/app-root
USER 1001
EXPOSE 8080