From aa997c70ea8c979fc1bbe0ab2069657bf0d204b9 Mon Sep 17 00:00:00 2001
From: Milas Bowman <milas.bowman@docker.com>
Date: Mon, 11 Jul 2022 15:56:04 -0400
Subject: [PATCH] nginx-golang-mysql: update README

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
---
 nginx-golang-mysql/README.md | 58 +++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/nginx-golang-mysql/README.md b/nginx-golang-mysql/README.md
index 7155be6..16c403b 100644
--- a/nginx-golang-mysql/README.md
+++ b/nginx-golang-mysql/README.md
@@ -1,5 +1,5 @@
 ## Compose sample application
-### Go server with an Nginx proxy and a MySQL database
+### Go server with an Nginx proxy and a MariaDB/MySQL database
 
 Project structure:
 ```
@@ -7,30 +7,37 @@ Project structure:
 ├── backend
 │   ├── Dockerfile
 │   ├── go.mod
+│   ├── go.sum
 │   └── main.go
 ├── db
 │   └── password.txt
-├── compose.yaml
 ├── proxy
-│   ├── conf
-│   └── Dockerfile
+│   └── nginx.conf
+├── compose.yaml
 └── README.md
 ```
 
 [_compose.yaml_](compose.yaml)
-```
+```yaml
 services:
   backend:
-    build: backend
+    build:
+      context: backend
+      target: builder
     ...
   db:
     # We use a mariadb image which supports both amd64 & arm64 architecture
-    image: mariadb:10.6.4-focal
+    image: mariadb:10-focal
     # If you really want to use MySQL, uncomment the following line
-    #image: mysql:8.0.27
+    #image: mysql:8
     ...
   proxy:
-    build: proxy
+    image: nginx
+    volumes:
+      - type: bind
+        source: ./proxy/nginx.conf
+        target: /etc/nginx/conf.d/default.conf
+        read_only: true
     ports:
     - 80:80
     ...
@@ -42,11 +49,11 @@ Make sure port 80 on the host is not already being in use.
 > ℹ️ **_INFO_**  
 > For compatibility purpose between `AMD64` and `ARM64` architecture, we use a MariaDB as database instead of MySQL.  
 > You still can use the MySQL image by uncommenting the following line in the Compose file   
-> `#image: mysql:8.0.27`
+> `#image: mysql:8`
 
 ## Deploy with docker compose
 
-```
+```shell
 $ docker compose up -d
 Creating network "nginx-golang-mysql_default" with the default driver
 Building backend
@@ -64,24 +71,33 @@ Creating nginx-golang-mysql_proxy_1   ... done
 ## Expected result
 
 Listing containers must show three containers running and the port mapping as below:
-```
-$ docker ps
-CONTAINER ID        IMAGE               COMMAND                  CREATED             STATUS              PORTS                  NAMES
-8906b14c5ad1        nginx-golang-mysql_proxy     "nginx -g 'daemon of…"   2 minutes ago       Up 2 minutes        0.0.0.0:80->80/tcp    nginx-golang-mysq
-l_proxy_1
-13e0e0a7715a        nginx-golang-mysql_backend   "/server"                2 minutes ago       Up 2 minutes        8000/tcp              nginx-golang-mysq
-l_backend_1
-ca8c5975d205        mysql:5.7                    "docker-entrypoint.s…"   2 minutes ago       Up 2 minutes        3306/tcp, 33060/tcp   nginx-golang-mysq
+```shell
+$ docker compose ps
+NAME                           COMMAND                  SERVICE             STATUS              PORTS
+nginx-golang-mysql-backend-1   "/code/bin/backend"      backend             running
+nginx-golang-mysql-db-1        "docker-entrypoint.s…"   db                  running (healthy)   3306/tcp
+nginx-golang-mysql-proxy-1     "/docker-entrypoint.…"   proxy               running             0.0.0.0:80->80/tcp
 l_db_1
 ```
 
 After the application starts, navigate to `http://localhost:80` in your web browser or run:
-```
+```shell
 $ curl localhost:80
 ["Blog post #0","Blog post #1","Blog post #2","Blog post #3","Blog post #4"]
 ```
 
 Stop and remove the containers
-```
+```shell
 $ docker compose down
 ```
+
+## Use with Docker Development Environments
+
+You can use this sample with the Dev Environments feature of Docker Desktop.
+
+![Screenshot of creating a Dev Environment in Docker Desktop](../dev-envs.png)
+
+To develop directly on the services inside containers, use the HTTPS Git url of the sample:
+```
+https://github.com/docker/awesome-compose/tree/master/nginx-golang-mysql
+```