From 331c2780b4a841d6018b525ca66aed7bf252ba89 Mon Sep 17 00:00:00 2001
From: leinadsened <84383252+leinadsened@users.noreply.github.com>
Date: Mon, 7 Oct 2024 17:26:59 +0200
Subject: [PATCH 1/8] Add docker-compose-yml

Add Docker Compose for running front- and back-end
After running "docker-compose up --build" the app should be available on localhost:8080
---
 docker-compose.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..eec69a3b
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,27 @@
+version: '3.8'
+
+services:
+  backend:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - "8001:8001"
+    volumes:
+      - ./:/app
+    environment:
+      - PYTHONDONTWRITEBYTECODE=1
+      - PYTHONUNBUFFERED=1
+    command: >
+      bash -c "source /opt/venv/bin/activate && python main.py --config ./config.yaml llm"
+
+  frontend:
+    build:
+      context: ./ui
+      dockerfile: Dockerfile
+    ports:
+      - "8080:8080"
+    volumes:
+      - ./ui:/app
+    depends_on:
+      - backend
\ No newline at end of file

From 797899c179d8de5eeded2f956bd843948af3fc78 Mon Sep 17 00:00:00 2001
From: leinadsened <84383252+leinadsened@users.noreply.github.com>
Date: Tue, 8 Oct 2024 13:25:14 +0200
Subject: [PATCH 2/8] Update Dockerfile

Set the environment variable as a build argument
---
 ui/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/Dockerfile b/ui/Dockerfile
index e7cca755..748b9150 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -1,5 +1,7 @@
 FROM node:20-alpine AS build
 
+ARG VITE_API_URL
+
 WORKDIR /app
 
 COPY package.json package-lock.json ./
@@ -7,7 +9,7 @@ RUN npm ci
 
 COPY . .
 
-COPY .env .env
+ENV VITE_API_URL=$VITE_API_URL
 
 RUN npm run build
 

From 061c4868d94bc6fcd2160404dab25815623f3443 Mon Sep 17 00:00:00 2001
From: leinadsened <84383252+leinadsened@users.noreply.github.com>
Date: Tue, 8 Oct 2024 13:27:21 +0200
Subject: [PATCH 3/8] Update docker-compose.yml

Add environment variable to frontend arguments
---
 docker-compose.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index eec69a3b..42e5eca9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,9 +19,11 @@ services:
     build:
       context: ./ui
       dockerfile: Dockerfile
+      args:
+        - VITE_API_URL=${VITE_API_URL}
     ports:
       - "8080:8080"
     volumes:
       - ./ui:/app
     depends_on:
-      - backend
\ No newline at end of file
+      - backend

From 48b6eadc6c7f2d082f75a112e83a94ac589c7e55 Mon Sep 17 00:00:00 2001
From: leinadsened <84383252+leinadsened@users.noreply.github.com>
Date: Tue, 8 Oct 2024 17:41:34 +0200
Subject: [PATCH 4/8] Update docker-compose.yml

Simplify command
---
 docker-compose.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 42e5eca9..24c2c344 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,8 +12,7 @@ services:
     environment:
       - PYTHONDONTWRITEBYTECODE=1
       - PYTHONUNBUFFERED=1
-    command: >
-      bash -c "source /opt/venv/bin/activate && python main.py --config ./config.yaml llm"
+    command: 'python3 main.py --config ./config.yaml llm'
 
   frontend:
     build:

From eb1da40bc3158c8a4c0f23a962f6f404392dc9bf Mon Sep 17 00:00:00 2001
From: leinadsened <84383252+leinadsened@users.noreply.github.com>
Date: Wed, 9 Oct 2024 11:24:54 +0200
Subject: [PATCH 5/8] Update Dockerfile

Update ARG variable's name
---
 ui/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/Dockerfile b/ui/Dockerfile
index 748b9150..71f3bfed 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -1,6 +1,6 @@
 FROM node:20-alpine AS build
 
-ARG VITE_API_URL
+ARG BACKEND_URL
 
 WORKDIR /app
 

From 1d3ca3318995b1227c11c0b2188a8d675375daff Mon Sep 17 00:00:00 2001
From: leinadsened <84383252+leinadsened@users.noreply.github.com>
Date: Wed, 9 Oct 2024 11:30:37 +0200
Subject: [PATCH 6/8] Update docker-compose.yml

Update target port and arg variable
---
 docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 24c2c344..fed0567a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,9 +19,9 @@ services:
       context: ./ui
       dockerfile: Dockerfile
       args:
-        - VITE_API_URL=${VITE_API_URL}
+        - BACKEND_URL=${BACKEND_URL}
     ports:
-      - "8080:8080"
+      - "8080:5000"
     volumes:
       - ./ui:/app
     depends_on:

From cce8f85c3b59f955e68c5fd89eb654d6e48982a0 Mon Sep 17 00:00:00 2001
From: leinadsened <84383252+leinadsened@users.noreply.github.com>
Date: Wed, 9 Oct 2024 11:32:18 +0200
Subject: [PATCH 7/8] Update Dockerfile

Update env variable
---
 ui/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/Dockerfile b/ui/Dockerfile
index 71f3bfed..e2cd70bf 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -9,7 +9,7 @@ RUN npm ci
 
 COPY . .
 
-ENV VITE_API_URL=$VITE_API_URL
+ENV VITE_BACKEND_URL=$BACKEND_URL
 
 RUN npm run build
 

From 67cbeb7a6d90fad536512b8980b173c3d53497dd Mon Sep 17 00:00:00 2001
From: leinadsened <84383252+leinadsened@users.noreply.github.com>
Date: Wed, 9 Oct 2024 11:53:02 +0200
Subject: [PATCH 8/8] Update docker-compose.yml

Update BACKEND_URL value
---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index fed0567a..708a6e2d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,7 +19,7 @@ services:
       context: ./ui
       dockerfile: Dockerfile
       args:
-        - BACKEND_URL=${BACKEND_URL}
+        - BACKEND_URL=http://localhost:8001
     ports:
       - "8080:5000"
     volumes: