From: Pablo Zmdl <redacted>
Date: Tue, 22 Apr 2025 15:29:10 +0000 (+0200)
Subject: Fix non-root-images RC 1.7.x
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=3d893e9f0f1c8d3ef7baa23448ea657e3323f19f;p=roundcube-roundcubemail-docker.git

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 c27ad14..ac09d58 100644
--- 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 1e02d1f..b55717c 100644
--- 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