From a07b3fb7d9c6bbc7a7c418a1afe8f0f7c6391108 Mon Sep 17 00:00:00 2001 From: Bilal Catic Date: Sun, 21 Oct 2018 19:18:54 +0200 Subject: [PATCH 1/2] preserve user uploaded content --- backend.dockerfile | 1 + docker-compose.yml | 1 + docker/backend/.gitignore | 1 + 3 files changed, 3 insertions(+) create mode 100644 docker/backend/.gitignore diff --git a/backend.dockerfile b/backend.dockerfile index a459e4e..567d87e 100644 --- a/backend.dockerfile +++ b/backend.dockerfile @@ -68,5 +68,6 @@ RUN ln -s ../html api COPY docker/php/.htaccess /var/www/html/ RUN chown -R www-data:www-data /var/www/html +RUN chmod -R 755 /var/www/html/app/uploads CMD /init-scripts/setup.sh diff --git a/docker-compose.yml b/docker-compose.yml index 091f2c1..1338b0e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,6 +23,7 @@ services: - WP_JWT_AUTH_SECRET_KEY volumes: - ./log/backend/:/var/log/apache2/ + - ./docker/backend/uploads/:/var/www/html/app/uploads/ ports: - '8081:80' depends_on: diff --git a/docker/backend/.gitignore b/docker/backend/.gitignore new file mode 100644 index 0000000..fd1f336 --- /dev/null +++ b/docker/backend/.gitignore @@ -0,0 +1 @@ +uploads/ \ No newline at end of file From 37916e4931a3a8215eaab23bfd35944ae1222bf8 Mon Sep 17 00:00:00 2001 From: Almira Krdzic Date: Mon, 22 Oct 2018 08:46:07 +0200 Subject: [PATCH 2/2] fixes --- backend.dockerfile | 4 ++-- docker/php/setup.sh | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backend.dockerfile b/backend.dockerfile index 567d87e..ec04ec9 100644 --- a/backend.dockerfile +++ b/backend.dockerfile @@ -59,15 +59,15 @@ WORKDIR /home/wiaas/backend/ RUN composer install --no-dev WORKDIR /home/wiaas +RUN rm -rf backend/app/uploads RUN cp -r backend/* /var/www/html/ WORKDIR /var/www/html RUN ln -s ../html api -COPY docker/php/.htaccess /var/www/html/ +COPY docker/php/.htaccess /var/www/html/ RUN chown -R www-data:www-data /var/www/html -RUN chmod -R 755 /var/www/html/app/uploads CMD /init-scripts/setup.sh diff --git a/docker/php/setup.sh b/docker/php/setup.sh index cd47b5b..6b2bdbd 100644 --- a/docker/php/setup.sh +++ b/docker/php/setup.sh @@ -34,5 +34,7 @@ EOF echo "Done" +chown -R www-data:www-data /var/www/html/app/uploads + #start image exec apache2-foreground