mirror/pixelfed
1
0
Fork 1
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-23 00:05:29 +00:00
Code Issues Releases Wiki Activity

fixes docker build

Browse source 
- composer package prestissimo is deprecated as composer got faster
- `composer update` should not be required as there is a `composer.lock`, actually it was the cause for breaking docker builds as an upstream package had a broken version string in it's requirerements. Using fixed package versions prevents these kinds of problems in future.
This commit is contained in:
Ondrej Brinkel 2020-12-07 23:11:54 +01:00 committed by GitHub
parent 9211bbd6d1
commit 205705193d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/docker/Dockerfile.apache
View file

@ -92,11 +92,9 @@ RUN curl -o /tmp/composer-setup.php https://getcomposer.org/installer \
COPY . /var/www/ COPY . /var/www/
# for detail why storage is copied this way, pls refer to https://github.com/pixelfed/pixelfed/pull/2137#discussion_r434468862 # for detail why storage is copied this way, pls refer to https://github.com/pixelfed/pixelfed/pull/2137#discussion_r434468862
RUN cp -r storage storage.skel \ RUN cp -r storage storage.skel \
&& composer global require hirak/prestissimo --prefer-dist --no-interaction --no-ansi --no-suggest \
&& composer install --prefer-dist --no-interaction --no-ansi --optimize-autoloader \ && composer install --prefer-dist --no-interaction --no-ansi --optimize-autoloader \
&& composer update --prefer-dist --no-interaction --no-ansi \ && rm -rf html && ln -s public html \
&& composer global remove hirak/prestissimo --no-interaction --no-ansi \ && chown -R www-data:www-data /var/www
&& rm -rf html && ln -s public html
VOLUME /var/www/storage /var/www/bootstrap VOLUME /var/www/storage /var/www/bootstrap
CMD ["/var/www/contrib/docker/start.apache.sh"] CMD ["/var/www/contrib/docker/start.apache.sh"]