From 9f142557c3e47ef4273df74be68c892aba6ae9d6 Mon Sep 17 00:00:00 2001
From: Alex Phillips <ahp118@gmail.com>
Date: Sat, 22 Apr 2023 08:50:44 -0400
Subject: [PATCH 1/2] rsync over new files in storage directory that may be
 related to a new release before removing

---
 Dockerfile                                         | 3 ++-
 Dockerfile.aarch64                                 | 3 ++-
 Dockerfile.armhf                                   | 3 ++-
 root/etc/s6-overlay/s6-rc.d/init-lychee-config/run | 3 +++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c5fce70..752baa1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,7 +31,8 @@ RUN \
     php81-pecl-imagick \
     php81-phar \
     php81-tokenizer \
-    php81-zip && \
+    php81-zip \
+    rsync && \
   echo "**** configure php-fpm to pass env vars ****" && \
   sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php81/php-fpm.d/www.conf && \
   grep -qxF 'clear_env = no' /etc/php81/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php81/php-fpm.d/www.conf && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index bd1676d..fd94762 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -31,7 +31,8 @@ RUN \
     php81-pecl-imagick \
     php81-phar \
     php81-tokenizer \
-    php81-zip && \
+    php81-zip \
+    rsync && \
   echo "**** configure php-fpm to pass env vars ****" && \
   sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php81/php-fpm.d/www.conf && \
   grep -qxF 'clear_env = no' /etc/php81/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php81/php-fpm.d/www.conf && \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index f3e8b95..e60fd56 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -31,7 +31,8 @@ RUN \
     php81-pecl-imagick \
     php81-phar \
     php81-tokenizer \
-    php81-zip && \
+    php81-zip \
+    rsync && \
   echo "**** configure php-fpm to pass env vars ****" && \
   sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php81/php-fpm.d/www.conf && \
   grep -qxF 'clear_env = no' /etc/php81/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php81/php-fpm.d/www.conf && \
diff --git a/root/etc/s6-overlay/s6-rc.d/init-lychee-config/run b/root/etc/s6-overlay/s6-rc.d/init-lychee-config/run
index 69219d7..97a0348 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-lychee-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-lychee-config/run
@@ -29,6 +29,9 @@ if [[ ! -e "/config/storage" ]]; then
     mv /app/www/storage /config/
 fi
 
+# account for new files in the storage dir that may have been added in a new release
+rsync -azvP --ignore-existing /app/www/storage/ /config/storage/
+
 rm -rf /app/www/storage
 ln -s /config/storage /app/www/storage
 ln -sf /config/.env /app/www/.env

From fc6b0f888710290fc53d3f17f6938f62c07abbce Mon Sep 17 00:00:00 2001
From: Alex Phillips <ahp118@gmail.com>
Date: Sat, 22 Apr 2023 08:54:07 -0400
Subject: [PATCH 2/2] only rsync if the dir already was moved previously

---
 root/etc/s6-overlay/s6-rc.d/init-lychee-config/run | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/root/etc/s6-overlay/s6-rc.d/init-lychee-config/run b/root/etc/s6-overlay/s6-rc.d/init-lychee-config/run
index 97a0348..8db82ac 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-lychee-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-lychee-config/run
@@ -27,11 +27,11 @@ fi
 # handle storage directory
 if [[ ! -e "/config/storage" ]]; then
     mv /app/www/storage /config/
+else
+    # account for new files in the storage dir that may have been added in a new release
+    rsync -azvP --ignore-existing /app/www/storage/ /config/storage/
 fi
 
-# account for new files in the storage dir that may have been added in a new release
-rsync -azvP --ignore-existing /app/www/storage/ /config/storage/
-
 rm -rf /app/www/storage
 ln -s /config/storage /app/www/storage
 ln -sf /config/.env /app/www/.env