dockers/pixelfed
3
1
Fork 2
Code Issues 6 Pull requests Releases Activity

persist public directory in fpm image
All checks were successful
dockers/pixelfed/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
chris 2023-10-20 18:35:38 +02:00
parent 98e1a60d35
commit c63b418ea5
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Containerfile.fpm
View file

@ -34,9 +34,9 @@ RUN set -xe;\
git apply /patches/0004-disable-beagle-service.patch &&\ git apply /patches/0004-disable-beagle-service.patch &&\
git apply /patches/0005-allow-30-char-usernames.patch &&\ git apply /patches/0005-allow-30-char-usernames.patch &&\
composer install --prefer-dist --no-interaction --no-ansi --no-dev --optimize-autoloader &&\ composer install --prefer-dist --no-interaction --no-ansi --no-dev --optimize-autoloader &&\
ln -s public html &&\
chown -R www-data:www-data /var/www &&\ chown -R www-data:www-data /var/www &&\
cp -r storage storage.skel &&\ cp -r storage storage.skel &&\
cp -r public public.skel &&\
rm -rf .git tests contrib CHANGELOG.md LICENSE .circleci .dependabot .github CODE_OF_CONDUCT.md .env.docker CONTRIBUTING.md README.md docker-compose.yml .env.testing phpunit.xml .env.example .gitignore .editorconfig .gitattributes .dockerignore rm -rf .git tests contrib CHANGELOG.md LICENSE .circleci .dependabot .github CODE_OF_CONDUCT.md .env.docker CONTRIBUTING.md README.md docker-compose.yml .env.testing phpunit.xml .env.example .gitignore .editorconfig .gitattributes .dockerignore
FROM docker.io/php:8.1-fpm-bullseye FROM docker.io/php:8.1-fpm-bullseye
@ -66,7 +66,7 @@ RUN set -xe;\
sed -i 's/^upload_max_filesize.*/upload_max_filesize = 100M/g' "$PHP_INI_DIR"/php.ini* &&\ sed -i 's/^upload_max_filesize.*/upload_max_filesize = 100M/g' "$PHP_INI_DIR"/php.ini* &&\
mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
WORKDIR /var/www WORKDIR /var/www
VOLUME /var/www/storage /var/www/bootstrap /public VOLUME /var/www/storage /var/www/bootstrap /var/www/public
ENTRYPOINT /entrypoint.sh ENTRYPOINT /entrypoint.sh
LABEL build.date=$DATE version.pixelfev=$VERSION LABEL build.date=$DATE version.pixelfev=$VERSION

3
entrypoint.fpm.sh
View file

@ -1,7 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -xeo pipefail set -xeo pipefail
cp -r storage.skel/* storage/ rsync -a --delete storage.skel/* storage/
rsync -a --delete public.skel/ public/
chown -R www-data:www-data storage/ bootstrap/ chown -R www-data:www-data storage/ bootstrap/
php /wait-for-db.php php /wait-for-db.php