Resolved conflict with ekwav's docker PR

Author: Silic0nS0ldier

CHANGELOG.md

@@ -6,8 +6,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+### Changed
+- Updated Docker `README.md`.
+
 ### Fixed
-- Corrected Docker `README.md` to refer to updated `sprinkles.json` and `sprinkles.example.json` locations.
 - Replaced `libpng12-dev` which has been dropped since Ubuntu 16.04 with `libpng-dev` in PHP `Dockerfile`.
 
 ## v4.1.21

docker/README.md

@@ -3,24 +3,23 @@
 First, install [Docker Compose](https://docs.docker.com/compose/install/).
 
 Second, initialize a new UserFrosting project:
-
-1. Copy `app/sprinkles.example.json` to `app/sprinkles.json`
-2. Run `chmod 777 app/{logs,cache,sessions}` to fix file permissions for web server. (NOTE: File
-   permissions should be properly secured in a production environment!)
-2. Run `docker-compose run composer install` to install all composer modules.
-3. Run `docker-compose run node npm install` to install all npm modules.
+1. Clone the repository `git clone https://github.com/userfrosting/UserFrosting.git .` and change into that directory `cd userfrosting`
+1. Run `cp app/sprinkles.example.json app/sprinkles.json` or upload your own (also upload your sprinkles if you have some)
+2. Run `sudo chown -R 33 app/{logs,cache,sessions}` (Changes the user to the www-data user of the image, more information [here](https://serversforhackers.com/c/dckr-file-permissions) )
+2. Run `sudo docker-compose run composer install` to install all composer modules.
+3. Run `sudo docker-compose run node npm install` to install all npm modules.
 
 Now you can start up the entire Nginx + PHP + MySQL stack using docker with:
 
-    $ docker-compose up
+    $ sudo docker-compose up -d
 
-On the first run you need to init the database (your container name may be different depending on the name of your root directory):
+On the first run you need to init the database (Be sure to execute this in the same directory, `${PWD##*/}` is a statement to get your current working directorys name. Docker uses it to name your container):
 
-    $ docker exec -it -u www-data userfrosting_php_1 bash -c 'php bakery migrate'
+    $ sudo docker exec -it -u www-data ${PWD##*/}_php_1 bash -c 'php bakery migrate'
 
-You also need to setup the first admin user (again, your container name may be different depending on the name of your root directory):
+You also need to setup the first admin user (again, `${PWD##*/}` is a statement to get your current working directorys name):
 
-    $ docker exec -it -u www-data userfrosting_php_1 bash -c 'php bakery create-admin'
+    $ sudo docker exec -it -u www-data ${PWD##*/}_php_1 bash -c 'php bakery create-admin'
 
 Now visit http://localhost:8570/ to see your UserFrosting homepage!
 
@@ -33,3 +32,17 @@ You may be tempted to run with this in production but this setup has not been se
 - Database credentials are hard-coded so obviously not secure.
 - File permissions may be more open than necessary.
 - It just hasn't been thoroughly tested in the capacity of being a production system.
+
+## Updating your code
+As you might guessed you will have to run 
+
+    $ sudo docker exec -it -u www-data userfrosting_php_1 bash -c 'php bakery migrate'
+    
+again if you want to migrate tables.
+You can change `php bakery migrate` to other `bakery` commands as well.
+Be aware that the userfrosting container doesn't know about npm!  
+Similary for composer:
+
+    $ sudo docker-compose run composer update
+   
+See the [Docker](https://docs.docker.com/engine) and [Docker-compose documentation](https://docs.docker.com/compose/) for more details.

docker/php/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.0-fpm
+FROM php:7.2-fpm
 RUN apt-get update && apt-get install -y \
         libfreetype6-dev \
         libjpeg62-turbo-dev \