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

Fix the docker build

This commit is contained in:
Pierre Jaury 2018-08-23 22:57:22 +02:00
parent 5224d7cd96
commit c82d0fb389
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.dockerignore
View File

@ -1,6 +1,6 @@
data
contrib
Dockerfile
contrib/docker/Dockerfile.*
docker-compose*.yml
.dockerignore
.git

6
contrib/docker/Dockerfile.apache
View File

@ -32,12 +32,10 @@ COPY . /var/www/
WORKDIR /var/www/
RUN cp -r storage storage.skel \
&& cp contrib/docker/php.ini /usr/local/etc/php/conf.d/pixelfed.ini \
&& composer install --prefer-source --no-interaction \
&& rm -rf html && ln -s public html
COPY contrib/docker/php.ini /usr/local/etc/php/conf.d/pixelfed.ini
COPY contrib/docker/start.sh /start.sh
VOLUME ["/var/www/storage"]
ENV APP_ENV=production \
@ -58,4 +56,4 @@ ENV APP_ENV=production \
REMOTE_FOLLOW=false \
ACTIVITY_PUB=false
CMD /start.sh
CMD /var/www/contrib/docker/start.sh