From 4c648d244914c1a473b393ad058447aafd7b1aa3 Mon Sep 17 00:00:00 2001
From: Alexandre <alexandre.pary@gmail.com>
Date: Tue, 30 Nov 2021 13:40:15 +0100
Subject: [PATCH] correct

---
 webtrees/Dockerfile                                 | 13 +++++++------
 webtrees/rootfs/scripts/00-aaa_dockerfile_backup.sh |  6 ------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile
index 92952a09f..f64c19f19 100644
--- a/webtrees/Dockerfile
+++ b/webtrees/Dockerfile
@@ -29,16 +29,17 @@ RUN \
     | tar -xzf - --strip 1 -C /tmp/bashio \
     && mv /tmp/bashio/lib /usr/lib/bashio \
     && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
-    && rm -rf /tmp/bashio \
-    \
+    && rm -rf /tmp/bashio  || true
+
+RUN \
     ################
     # Modify image #
     ################
     # Change data location
-    && grep -rl "/var/www/webtrees" /etc/ | xargs sed -i 's|/var/www/webtrees|/data/webtrees|g' || true
-
-# Add entry script
-RUN chown root:root /entrypoint.sh \
+    && sed -i 's|/etc/services.d/*/run|/scripts/99-run.sh|g' /scripts/90-config_yaml.sh \
+    && grep -rl "/var/www/webtrees" /etc/ | xargs sed -i 's|/var/www/webtrees|/data/webtrees|g' \
+    # Add entry script
+    && chown root:root /entrypoint.sh \
     && chmod 777 /entrypoint.sh \
     # Add end script
     && sed -i '$ d' /docker-entrypoint.sh
diff --git a/webtrees/rootfs/scripts/00-aaa_dockerfile_backup.sh b/webtrees/rootfs/scripts/00-aaa_dockerfile_backup.sh
index 9252c3b6e..b373d2c54 100644
--- a/webtrees/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/webtrees/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -13,12 +13,6 @@ if [ ! -f "/usr/bin/bashio" ]; then
         curl &&
             apt-get clean
 
-        ################
-        # Modify image #
-        ################
-        # Change data location
-        grep -rl "/var/www/webtrees" /etc/ | xargs sed -i 's|/var/www/webtrees|/data/webtrees|g'
-
         ###################
         # Install bashio #
         ##################