[odrs-web/oscp] Import changes from the master branch

[Andrea Veri <averi src gnome org>]

commit 0f6f6f2a1d5b66db37c65852b249144c1165e1e9
Author: Andrea Veri <averi redhat com>
Date:   Mon Dec 17 14:04:53 2018 +0100

    Import changes from the master branch

 Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/Dockerfile b/Dockerfile
index 8d31282..9f82fba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,13 +12,16 @@ WORKDIR ${ODRS_HOME}
 
 COPY app_data ${ODRS_HOME}
 
-COPY odrs.gnome.org.conf /etc/httpd/conf.d/odrs.gnome.org.conf
 RUN rm /etc/httpd/conf.d/welcome.conf
+COPY odrs.gnome.org.conf /etc/httpd/conf.d/odrs.gnome.org.conf
 
 RUN python /opt/app-root/src/cron.py ratings /opt/app-root/src/app/static/ratings.json 
 
 RUN chown -R 1000310000:0 ${ODRS_HOME} && \
     chmod -R 664 ${ODRS_HOME} && \
+    chown 1000310000:0 /etc/httpd/conf && \
+    chown 1000310000:0 /etc/httpd/conf.d && \
+    chown 1000310000:0 /etc/httpd/conf.d/odrs.gnome.org.conf && \
     find ${ODRS_HOME} -type d -exec chmod 775 {} +
 
 COPY entrypoint.sh /usr/local/bin