Merge branch 'feature/docker' into develop

Author: adenvt

Dockerfile

@@ -49,16 +49,18 @@ COPY deploy/web/site.conf /etc/nginx/sites-available/default
 COPY deploy/web/nginx.conf /etc/nginx/nginx.conf
 COPY deploy/web/mime.types /etc/nginx/mime.types
 COPY deploy/web/php.ini /usr/local/etc/php/php.ini
-COPY --from=compiler /var/www /var/www
 
 # Force HTTPS
 ARG FORCE_HTTPS=false
 RUN if [ ${FORCE_HTTPS} = true ]; then \
   sed -i 's/# fastcgi_param HTTPS/fastcgi_param HTTPS/' /etc/nginx/sites-available/default \
 ;fi
 
+COPY --from=compiler /var/www /var/www
 RUN composer dump-autoload --no-dev --optimize
-RUN php artisan config:cache \
+RUN grep -q "APP_KEY=" .env || echo "APP_KEY=" >> .env
+RUN php artisan key:generate \
+  && php artisan config:cache \
   && php artisan route:cache \
   && php artisan view:cache
 RUN chown -R www-data:www-data /var/www

README.md

@@ -58,8 +58,7 @@ npm run hot
 ## Using Docker Compose
 
 ### For Development
-
-* Create and run Container
+* Create and start Container
 ```bash
 docker-compose up -d dev
 ```
@@ -74,6 +73,7 @@ docker-compose exec dev bash
 composer install
 npm install
 ```
+
 * Compile Static Asset
 ```bash
 ## Single run compile
@@ -88,11 +88,12 @@ npm run hot
 * Open browser, goto `http://localhost:8888`
 
 ### For Production
-* Create and run Container
+* Create and start Container
 ```
 docker-compose up -d prod
 ```
-* Open browser, goto `http://localhost:88`
+
+* Open browser, goto [http://localhost:88](http://localhost:88)
 
 ## License
 This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details