diff --git a/.dockerignore b/.dockerignore index 95312fa..44ca821 100755 --- a/.dockerignore +++ b/.dockerignore @@ -16,7 +16,6 @@ yarn-error.log* /storage/framework/cache/* /storage/framework/sessions/* /storage/framework/views/* -/storage/app/* /bootstrap/cache/* # IDE and editor files @@ -54,9 +53,7 @@ phpunit.xml .phpunit.result.cache # Build tools -webpack.mix.js yarn.lock -mix-manifest.json # Temporary files *.tmp @@ -65,4 +62,10 @@ mix-manifest.json # Keep vendor assets in public folder !public/js/vendor/ !public/css/vendor/ -!public/js/locales/ \ No newline at end of file +!public/js/locales/ + +# Keep built assets +!public/js/app.js +!public/js/vendor.js +!public/css/app.css +!public/mix-manifest.json \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 85342e2..55a0eb9 100755 --- a/Dockerfile +++ b/Dockerfile @@ -64,12 +64,13 @@ RUN composer run-script post-autoload-dump && \ # Set proper permissions (for production only do this once) RUN mkdir -p storage/logs \ && mkdir -p storage/framework/{cache,sessions,views} \ - && mkdir -p storage/app \ + && mkdir -p storage/app/public \ && mkdir -p bootstrap/cache \ && chown -R www-data:www-data /var/www/html \ && chmod -R 775 storage \ && chmod -R 775 bootstrap/cache \ - && chmod -R 755 public + && chmod -R 755 public \ + && chmod -R 777 storage/app/public # Nginx config COPY ./docker/nginx.conf /etc/nginx/sites-available/default