From 4f24197e304e6506aafd3bdff6d5ebe713466c07 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Wed, 26 May 2021 00:46:41 +0200
Subject: [PATCH 1/4] Want to run this thing with docker-compose

---
 frontend/Dockerfile   | 2 +-
 frontend/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index d49a86a..f53f938 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -10,7 +10,7 @@ ENV PATH /app/node_modules/.bin:$PATH
 COPY package.json ./
 COPY package-lock.json ./
 
-RUN npm install --silent
+RUN npm install 
 
 # add app
 COPY . ./
diff --git a/frontend/package.json b/frontend/package.json
index 85c3c1f..543636e 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -37,5 +37,5 @@
       "last 1 safari version"
     ]
   },
-  "proxy": "http://127.0.0.1:3000"
+  "proxy": "http://127.0.0.1:5000"
 }
-- 
2.43.4


From 5f42b54a8ac83c125c9b8a0dece4401920e7bde6 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Wed, 26 May 2021 00:47:11 +0200
Subject: [PATCH 2/4] Want to run this thing with docker-compose

---
 docker-compose.yml | 27 +++++++++++++--------------
 start.sh           |  1 -
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8625cfc..16c9aa7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,17 +14,16 @@ services:
       - 3000:3000
     environment:
       - CHOKIDAR_USEPOLLING=true
-  backend-dev:
-    container_name: backend_bt
-    build: 
-      context: ./backend
-      dockerfile: Dockerfile
-    tty: true
-    volumes:
-      - ./backend:/usr/src/app/
-    ports:
-      - 5000:5000
-    environment:
-      PORT: 5000
-      FLASK_DEBUG: 1
-
+#   backend-dev:
+#     container_name: backend_bt
+#     build: 
+#       context: ./backend
+#       dockerfile: Dockerfile
+#     tty: true
+#     volumes:
+#       - ./backend:/usr/src/app/
+#     ports:
+#       - 5000:5000
+#     environment:
+#       PORT: 5000
+#       FLASK_DEBUG: 1
diff --git a/start.sh b/start.sh
index 5b7b88e..3d71904 100644
--- a/start.sh
+++ b/start.sh
@@ -1,3 +1,2 @@
-cd frontend
 podman-compose down 
 podman-compose up 
-- 
2.43.4


From d0c30b211351144ba9a25de8f8dbfd2cb903eb31 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Wed, 26 May 2021 01:02:06 +0200
Subject: [PATCH 3/4] Removed volumes as it didn't work before

---
 docker-compose.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 16c9aa7..88b0993 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,9 +7,6 @@ services:
       context: ./frontend
       dockerfile: Dockerfile
     tty: true
-    volumes:
-      - './frontend/.:/app:z'
-      - '/app/node_modules'
     ports:
       - 3000:3000
     environment:
-- 
2.43.4


From 1d8cf9fcb3b4ded0c2bb9e87d395b678eb9447ee Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Wed, 26 May 2021 01:24:17 +0200
Subject: [PATCH 4/4] Working for docker-compose prod

---
 docker-compose.prod.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 5322f9e..d7eabfb 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -4,7 +4,7 @@ services:
   hello-world-prod:
     container_name: hello_world_cl_prod
     build:
-      context: .
+      context: ./frontend
       dockerfile: Dockerfile.prod
     ports:
-      - 8877:80
+      - 3000:80
-- 
2.43.4