From 038455b3150d417020d9a07cf2e0fb81c3ec54e3 Mon Sep 17 00:00:00 2001
From: Jason Zhu <jasonzhuyq@outlook.com>
Date: Fri, 5 May 2023 00:16:21 +1000
Subject: [PATCH] eg3 finished and test proxy

---
 eg3/README.md           | 22 +++++++++++++++++++++-
 eg3/docker-compose.yaml | 20 ++++++++++----------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/eg3/README.md b/eg3/README.md
index 1199649..007cefa 100644
--- a/eg3/README.md
+++ b/eg3/README.md
@@ -34,4 +34,24 @@ Steps:
 7. Test network:
    1. Enter frontend container: `docker exec -it frontend /bin/sh`
    2. Make a request to backend: `curl http://backend:5000`
-   3. Get response `{"version": "1.0.0"}`
\ No newline at end of file
+   3. Get response `{"version": "1.0.0"}`
+
+# Proxy using nginx
+
+In this section, we test we can reach both frontend and backend from proxy container or computer itself
+
+Steps:
+1. Uncomment all container in `docker-compose.yaml`
+2. Build container and initiate them via `docker compose up`
+3. These container are not in `mynetwork`
+4. Enter proxy container via `docker exec -it proxy /bin/sh`
+5. From the proxy container, try to reach other containers
+   1. Frontend
+      1. `curl http://frontend`
+      2. `curl http://localhost` to visit port 80
+   2. Backend
+      1. `curl http://backend:5000`
+      2. `curl http://localhost/api`
+6. Exit the container; In normal terminal, we can still reach frontend and backend
+   1. `curl http://localhost` to visit frontend
+   2. `curl http://localhost/api` to visit backend
\ No newline at end of file
diff --git a/eg3/docker-compose.yaml b/eg3/docker-compose.yaml
index c34fb6b..77da5a8 100644
--- a/eg3/docker-compose.yaml
+++ b/eg3/docker-compose.yaml
@@ -1,16 +1,16 @@
 version: '3.8'
 
 services:
-  # proxy:
-  #   container_name: proxy
-  #   build:
-  #     context: ./proxy
-  #     dockerfile: Dockerfile
-  #   ports:
-  #     - "80:80"
-  #   depends_on:
-  #     - frontend
-  #     - backend
+  proxy:
+    container_name: proxy
+    build:
+      context: ./proxy
+      dockerfile: Dockerfile
+    ports:
+      - "80:80"
+    depends_on:
+      - frontend
+      - backend
 
   frontend:
     container_name: frontend