Merge branch 'preserve-uploads-dir' into 'master'
preserve user uploaded content See merge request saburly/wiaas/new-wiaas!38
This commit was merged in pull request #38.
This commit is contained in:
@@ -59,13 +59,14 @@ WORKDIR /home/wiaas/backend/
|
|||||||
RUN composer install --no-dev
|
RUN composer install --no-dev
|
||||||
|
|
||||||
WORKDIR /home/wiaas
|
WORKDIR /home/wiaas
|
||||||
|
RUN rm -rf backend/app/uploads
|
||||||
RUN cp -r backend/* /var/www/html/
|
RUN cp -r backend/* /var/www/html/
|
||||||
|
|
||||||
|
|
||||||
WORKDIR /var/www/html
|
WORKDIR /var/www/html
|
||||||
RUN ln -s ../html api
|
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 chown -R www-data:www-data /var/www/html
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ services:
|
|||||||
- WP_JWT_AUTH_SECRET_KEY
|
- WP_JWT_AUTH_SECRET_KEY
|
||||||
volumes:
|
volumes:
|
||||||
- ./log/backend/:/var/log/apache2/
|
- ./log/backend/:/var/log/apache2/
|
||||||
|
- ./docker/backend/uploads/:/var/www/html/app/uploads/
|
||||||
ports:
|
ports:
|
||||||
- '8081:80'
|
- '8081:80'
|
||||||
depends_on:
|
depends_on:
|
||||||
|
|||||||
1
docker/backend/.gitignore
vendored
Normal file
1
docker/backend/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
uploads/
|
||||||
@@ -34,5 +34,7 @@ EOF
|
|||||||
|
|
||||||
echo "Done"
|
echo "Done"
|
||||||
|
|
||||||
|
chown -R www-data:www-data /var/www/html/app/uploads
|
||||||
|
|
||||||
#start image
|
#start image
|
||||||
exec apache2-foreground
|
exec apache2-foreground
|
||||||
|
|||||||
Reference in New Issue
Block a user