Merge remote-tracking branch 'upstream/master'

nginx-flask-mysql/README.md

@@ -21,14 +21,14 @@ services:
     build: backend
     ...
   db:
-    image: mysql:5.7
+    image: mysql:8.0.19
     ...
   proxy:
     build: proxy
     ...
 ```
 The compose file defines an application with three services `proxy`, `backend` and `db`.
-When deploying the application, docker-compose maps port 80 of the proxy service container to port 80 of the host as specified in the file.
+When deploying the application, docker-compose maps port 80 of the proxy service container to port 8080 of the host as specified in the file.
 Make sure port 80 on the host is not already being in use.
 
 ## Deploy with docker-compose
@@ -36,7 +36,7 @@ Make sure port 80 on the host is not already being in use.
 ```
 $ docker-compose up -d
 Creating network "nginx-flask-mysql_default" with the default driver
-Pulling db (mysql:5.7)...
+Pulling db (mysql:8.0.19)...
 5.7: Pulling from library/mysql
 ...
 ...
@@ -52,15 +52,17 @@ Listing containers must show two containers running and the port mapping as belo
 ```
 $ docker ps
 CONTAINER ID        IMAGE                       COMMAND                  CREATED             STATUS              PORTS                    NAMES
-c65ecef87e85        nginx-flask-mysql_proxy     "nginx -g 'daemon of…"   About a minute ago   Up About a minute   0.0.0.0:80->80/tcp    nginx-flask-mysql_proxy_1
-96ccc0a5342f        nginx-flask-mysql_backend   "/bin/sh -c 'flask r…"   About a minute ago   Up About a minute   5000/tcp              nginx-flask-mysql_backend_1
-39327313a142        mysql:5.7                   "docker-entrypoint.s…"   About a minute ago   Up About a minute   3306/tcp, 33060/tcp   nginx-flask-mysql_db_1
+c2c703b66b19        nginx-flask-mysql_proxy     "nginx -g 'daemon of…"   39 seconds ago      Up 38 seconds       0.0.0.0:8080->80/tcp     nginx-flask-mysql_proxy_1
+2b8a21508c3c        nginx-flask-mysql_backend   "/bin/sh -c 'flask r…"   9 minutes ago       Up 38 seconds       0.0.0.0:5000->5000/tcp   nginx-flask-mysql_backend_1
+0e6a96ea2028        mysql:8.0.19                "docker-entrypoint.s…"   9 minutes ago       Up 38 seconds       3306/tcp, 33060/tcp      nginx-flask-mysql_db_1
+
+
 ```
 
 After the application starts, navigate to `http://localhost:80` in your web browser or run:
 ```
-$ curl localhost:80
-Hello world
+$ curl localhost:8080
+<div>Blog post #1</div><div>Blog post #2</div><div>Blog post #3</div><div>Blog post #4</div>
 ```
 
 Stop and remove the containers