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..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,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