From 5d2a344b9909270e39068aa4d596966200defbe8 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Mon, 6 Jan 2025 09:48:07 +0100
Subject: [PATCH] Update Dockerfile

---
 webtrees/Dockerfile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile
index afbcb164471..7c9911f2ba2 100644
--- a/webtrees/Dockerfile
+++ b/webtrees/Dockerfile
@@ -40,17 +40,15 @@ ENV APACHE_RUN_USER=www-data \
 # Global variables
 ENV WEBTREES_HOME="/var2/www/webtrees"
 WORKDIR $WEBTREES_HOME
-# hadolint ignore=DL4006, SC2016
+# hadolint ignore=DL4006
 RUN \
     # Change data location
     grep -rl "/var/www/webtrees" /etc | xargs sed -i 's|/var/www/webtrees|/var2/www/webtrees|g' \
     && sed -i 's|/var/www/webtrees|/var2/www/webtrees|g' /docker-entrypoint.py \
     && mkdir -p /var2 \
     && cp -rf /var/* /var2/ \
-    && chown -R www-data:www-data /var2/www/webtrees \
-    # Avoid log spam
-    && [ -d /etc/apache2/sites-available ] && for file in /etc/apache2/sites-*/*.conf; do sed -i '/<VirtualHost/a \# Match requests with the custom User-Agent "HealthCheck"\\nSetEnvIf User-Agent "*HealthCheck*" dontlog\\n\# Exclude matching requests from access logs\\nCustomLog ${APACHE_LOG_DIR}/access.log combined env=!dontlog' "$file"; done
-    
+    && chown -R www-data:www-data /var2/www/webtrees
+
 ##################
 # 3 Install apps #
 ##################
@@ -129,6 +127,7 @@ LABEL \
 #################
 
 # Avoid spamming logs with Apache
+# hadolint ignore=SC2016
 RUN if [ -d /etc/apache2/sites-available ]; then for file in /etc/apache2/sites-*/*.conf; do sed -i '/<VirtualHost/a # Match requests with the custom User-Agent "HealthCheck" \n SetEnvIf User-Agent "HealthCheck" dontlog \n # Exclude matching requests from access logs \n CustomLog ${APACHE_LOG_DIR}/access.log combined env=!dontlog' "$file"; done; fi
 
 ENV HEALTH_PORT="80" \