mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #2477 from der-On/patch-1 

fixes docker build
This commit is contained in:
daniel 2020-12-09 22:44:39 -07:00 committed by GitHub
parent 2c95fd77c9 205705193d
commit ef45c4b21b
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/
# 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 \
&& composer global require hirak/prestissimo --prefer-dist --no-interaction --no-ansi --no-suggest \
&& composer install --prefer-dist --no-interaction --no-ansi --optimize-autoloader \
&& composer update --prefer-dist --no-interaction --no-ansi \
&& composer global remove hirak/prestissimo --no-interaction --no-ansi \
&& rm -rf html && ln -s public html
&& rm -rf html && ln -s public html \
&& chown -R www-data:www-data /var/www
VOLUME /var/www/storage /var/www/bootstrap
CMD ["/var/www/contrib/docker/start.apache.sh"]