diff --git a/Dockerfile b/Dockerfile index 418aa44cd..8dd709c50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -76,13 +76,14 @@ RUN chown root:www-data ./ \ # Files should not have execute set, but directories need it && find ./ -type d -exec chmod 750 {} \; \ # Create necessary directories - && mkdir -p /pelican-data/storage /var/www/html/storage/app/public /var/run/supervisord /etc/supercronic \ - # Symlinks for env, database, and avatars + && mkdir -p /pelican-data/storage /pelican-data/plugins /var/www/html/storage/app/public /var/run/supervisord /etc/supercronic \ + # Symlinks for env, database, storage, and plugins && ln -s /pelican-data/.env ./.env \ && ln -s /pelican-data/database/database.sqlite ./database/database.sqlite \ && ln -sf /var/www/html/storage/app/public /var/www/html/public/storage \ && ln -s /pelican-data/storage/avatars /var/www/html/storage/app/public/avatars \ && ln -s /pelican-data/storage/fonts /var/www/html/storage/app/public/fonts \ + && ln -s /pelican-data/plugins /var/www/html/plugins \ # Allow www-data write permissions where necessary && chown -R www-data:www-data /pelican-data ./storage ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \ && chmod -R u+rwX,g+rwX,o-rwx /pelican-data ./storage ./bootstrap/cache /var/run/supervisord \ diff --git a/Dockerfile.dev b/Dockerfile.dev index fc9ecb0fd..008e55d6e 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -80,13 +80,14 @@ RUN chown root:www-data ./ \ # Files should not have execute set, but directories need it && find ./ -type d -exec chmod 750 {} \; \ # Create necessary directories - && mkdir -p /pelican-data/storage /var/www/html/storage/app/public /var/run/supervisord /etc/supercronic \ - # Symlinks for env, database, and avatars + && mkdir -p /pelican-data/storage /pelican-data/plugins /var/www/html/storage/app/public /var/run/supervisord /etc/supercronic \ + # Symlinks for env, database, storage, and plugins && ln -s /pelican-data/.env ./.env \ && ln -s /pelican-data/database/database.sqlite ./database/database.sqlite \ && ln -sf /var/www/html/storage/app/public /var/www/html/public/storage \ && ln -s /pelican-data/storage/avatars /var/www/html/storage/app/public/avatars \ && ln -s /pelican-data/storage/fonts /var/www/html/storage/app/public/fonts \ + && ln -s /pelican-data/plugins /var/www/html/plugins \ # Allow www-data write permissions where necessary && chown -R www-data:www-data /pelican-data ./storage ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \ && chmod -R u+rwX,g+rwX,o-rwx /pelican-data ./storage ./bootstrap/cache /var/run/supervisord \