diff --git a/pixelfed/Dockerfile b/pixelfed/Dockerfile index 7d0aeab..203c445 100644 --- a/pixelfed/Dockerfile +++ b/pixelfed/Dockerfile @@ -100,12 +100,6 @@ RUN apt-get update; \ apt-get install -y pngquant jpegoptim optipng tini unzip; \ rm -rf /var/lib/apt/lists/* -COPY pixelfed /usr/local/bin/pixelfed -COPY pixelfed-run /usr/local/bin/pixelfed-run -COPY pixelfed-startup /usr/local/bin/pixelfed-startup -COPY pixelfed-migrate /usr/local/bin/pixelfed-migrate -COPY pixelfed-garbage /usr/local/bin/pixelfed-garbage - USER www-data WORKDIR /var/www/pixelfed @@ -117,8 +111,17 @@ RUN composer install \ --no-scripts \ --no-progress +RUN cp -r storage storage-default + USER root +COPY pixelfed /usr/local/bin/pixelfed +COPY pixelfed-run /usr/local/bin/pixelfed-run +COPY pixelfed-horizon /usr/local/bin/pixelfed-horizon +COPY pixelfed-startup /usr/local/bin/pixelfed-startup +COPY pixelfed-migrate /usr/local/bin/pixelfed-migrate +COPY pixelfed-garbage /usr/local/bin/pixelfed-garbage + VOLUME /var/www/pixelfed/storage ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/pixelfed/pixelfed-horizon b/pixelfed/pixelfed-horizon new file mode 100755 index 0000000..71fcc12 --- /dev/null +++ b/pixelfed/pixelfed-horizon @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +pixelfed 'php artisan config:cache' +pixelfed 'php artisan horizon' diff --git a/pixelfed/pixelfed-startup b/pixelfed/pixelfed-startup index cbc437d..45fe829 100755 --- a/pixelfed/pixelfed-startup +++ b/pixelfed/pixelfed-startup @@ -2,12 +2,13 @@ set -xe +pixelfed 'rsync -rog storage-default/* storage/' +pixelfed 'php artisan config:cache' pixelfed 'php artisan horizon:install' pixelfed 'php artisan horizon:assets' pixelfed 'php artisan route:cache' pixelfed 'php artisan view:cache' pixelfed 'php artisan media:optimize' -pixelfed 'php artisan config:cache' pixelfed 'php artisan optimize' exec "$@"