Fix non-root-images RC 1.7.x

Previously the Apache was using /var/www/html as docroot, because the
VirtualHost was matching port 80 only.

diff --git a/apache/Dockerfile b/apache/Dockerfile
index c27ad148dec653966ca9f80679adc77a6a05c5a2..ac09d5802c7895bc4ffe4547341617e1691bcde5 100644 (file)
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -139,7 +139,8 @@ RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen; \
        /usr/sbin/locale-gen
 
 RUN sed -i 's/^Listen 80$/Listen 8000/' /etc/apache2/ports.conf
+RUN sed -i /etc/apache2/sites-enabled/000-default.conf -e 's/:80>/:8000>/'
 
 EXPOSE 8000
 
-USER 33:33
\ No newline at end of file
+USER 33:33

diff --git a/apache/nonroot-add.txt b/apache/nonroot-add.txt
index 1e02d1fc568931f8307a136d80d2b37f66aeca78..b55717cf2bdcd1950ef180429c19f20c3e1c199a 100644 (file)
--- a/apache/nonroot-add.txt
+++ b/apache/nonroot-add.txt
@@ -1,3 +1,4 @@
 RUN sed -i 's/^Listen 80$/Listen 8000/' /etc/apache2/ports.conf
+RUN sed -i /etc/apache2/sites-enabled/000-default.conf -e 's/:80>/:8000>/'
 
 EXPOSE 8000