Merge pull request #63 from linuxserver/storage-dir-fix

rsync over new files in storage directory that may be related to a ne…

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 && \

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 && \

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 && \

root/etc/s6-overlay/s6-rc.d/init-lychee-config/run

@@ -27,6 +27,9 @@ 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
 
 rm -rf /app/www/storage