From c82d0fb3890f3b445e541feee204edccb464aa8e Mon Sep 17 00:00:00 2001 From: Pierre Jaury Date: Thu, 23 Aug 2018 22:57:22 +0200 Subject: [PATCH] Fix the docker build --- .dockerignore | 2 +- contrib/docker/Dockerfile.apache | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.dockerignore b/.dockerignore index 53c27d576..70376cdf4 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,6 @@ data -contrib Dockerfile +contrib/docker/Dockerfile.* docker-compose*.yml .dockerignore .git diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index 7db56d9e8..481db4647 100644 --- a/contrib/docker/Dockerfile.apache +++ b/contrib/docker/Dockerfile.apache @@ -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