UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 06:21:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move Dockerfiles to contrib/

Browse source
This commit is contained in:
Pierre Jaury 2018-08-23 22:43:47 +02:00
parent 83c6f4c615
commit 5224d7cd96
6 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.dockerignore
View file

@ -1,4 +1,5 @@
data data
contrib
Dockerfile Dockerfile
docker-compose*.yml docker-compose*.yml
.dockerignore .dockerignore

2
Dockerfile
View file

@ -1 +1 @@
docker/Dockerfile.apache contrib/docker/Dockerfile.apache

6
docker/Dockerfile.apache → contrib/docker/Dockerfile.apache
View file

@ -32,10 +32,12 @@ COPY . /var/www/
WORKDIR /var/www/ WORKDIR /var/www/
RUN cp -r storage storage.skel \ RUN cp -r storage storage.skel \
&& cp /var/www/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 \
@ -56,4 +58,4 @@ ENV APP_ENV=production \
REMOTE_FOLLOW=false \ REMOTE_FOLLOW=false \
ACTIVITY_PUB=false ACTIVITY_PUB=false
CMD /var/www/docker/start.sh CMD /start.sh

0
docker/Dockerfile.fpm → contrib/docker/Dockerfile.fpm
View file

0
docker/php.ini → contrib/docker/php.ini
View file

0
docker/start.sh → contrib/docker/start.sh
View file