From e41e23925e4a0e3c80872012d4629020f785f9dc Mon Sep 17 00:00:00 2001 From: Cresson Remi <remi.cresson@irstea.fr> Date: Tue, 10 Jan 2023 15:56:05 +0100 Subject: [PATCH] OKD ready --- Dockerfile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 50c344c..b2bc21d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,6 @@ -FROM ubuntu/apache2 -RUN sed -i 's#<Directory /var/www/>#<Directory /var/www/>\n Header set Access-Control-Allow-Origin "*"#g' /etc/apache2/apache2.conf -RUN a2enmod headers -RUN apt update \ - && apt upgrade -y \ - && apt install -y libcap2-bin procps \ - && setcap 'cap_net_bind_service=+ep' /usr/sbin/apache2 \ - && chown www-data:www-data /var/log/apache2 -USER www-data +FROM httpd:2.4 +RUN sed -i 's#<Directory /var/www/>#<Directory /var/www/>\n Header set Access-Control-Allow-Origin "*"#g' /usr/local/apache2/conf/httpd.conf +RUN sed -i 's#Listen 80#Listen 8080#g' /usr/local/apache2/conf/httpd.conf +RUN chgrp -R 0 /usr/local/apache2/logs && \ + chmod -R g+rwX /usr/local/apache2/logs +USER 1001 -- GitLab