Move Dockerfiles to contrib/

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

View File

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

View File

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

View File

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