UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-09 16:24:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the docker build

Browse source
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 data
contrib
Dockerfile Dockerfile
contrib/docker/Dockerfile.*
docker-compose*.yml docker-compose*.yml
.dockerignore .dockerignore
.git .git

6
contrib/docker/Dockerfile.apache
View file

@ -32,12 +32,10 @@ COPY . /var/www/
WORKDIR /var/www/ WORKDIR /var/www/
RUN cp -r storage storage.skel \ 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 \ && composer install --prefer-source --no-interaction \
&& rm -rf html && ln -s public html && 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"] VOLUME ["/var/www/storage"]
ENV APP_ENV=production \ ENV APP_ENV=production \
@ -58,4 +56,4 @@ ENV APP_ENV=production \
REMOTE_FOLLOW=false \ REMOTE_FOLLOW=false \
ACTIVITY_PUB=false ACTIVITY_PUB=false
CMD /start.sh CMD /var/www/contrib/docker/start.sh