From 9e8fe3fbfec816f9babeb72b2da1b908ce80496a Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Thu, 21 Dec 2023 02:28:27 +0000
Subject: [PATCH 1/3] chore(deps): update flyway/flyway docker tag to v9.22

---
 backend/db/Dockerfile | 2 +-
 docker-compose.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/db/Dockerfile b/backend/db/Dockerfile
index 1bbc26c7a..41aeb1b5b 100644
--- a/backend/db/Dockerfile
+++ b/backend/db/Dockerfile
@@ -1,4 +1,4 @@
-FROM flyway/flyway:9.19-alpine
+FROM flyway/flyway:9.22-alpine
 
 # Non-root user
 RUN adduser -D app.ts
diff --git a/docker-compose.yml b/docker-compose.yml
index 160c591f1..319ab0b30 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
     networks:
       - default
   database-migrations:
-    image: flyway/flyway:9.19-alpine
+    image: flyway/flyway:9.22-alpine
     container_name: backend-migrations
     command:
       - info

From d74b4372223bd0d37c4b797759fb4adabc4bbcec Mon Sep 17 00:00:00 2001
From: Sukanya Rath <sukanyarath1987@gmail.com>
Date: Wed, 20 Dec 2023 18:37:14 -0800
Subject: [PATCH 2/3] update to flyway 10

Signed-off-by: Sukanya Rath <sukanyarath1987@gmail.com>
---
 backend/db/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/db/Dockerfile b/backend/db/Dockerfile
index 41aeb1b5b..9852c3ac7 100644
--- a/backend/db/Dockerfile
+++ b/backend/db/Dockerfile
@@ -1,7 +1,7 @@
-FROM flyway/flyway:9.22-alpine
+FROM flyway/flyway:10-alpine
 
 # Non-root user
-RUN adduser -D app.ts
+RUN adduser -D app
 USER app
 
 # Copy migrations

From 28fec0fe1d3635af97fad4259035bdc3bcf56037 Mon Sep 17 00:00:00 2001
From: Sukanya Rath <sukanyarath1987@gmail.com>
Date: Wed, 20 Dec 2023 18:46:48 -0800
Subject: [PATCH 3/3] fix docker compose file

Signed-off-by: Sukanya Rath <sukanyarath1987@gmail.com>
---
 docker-compose.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 319ab0b30..80d568500 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
     networks:
       - default
   database-migrations:
-    image: flyway/flyway:9.22-alpine
+    image: flyway/flyway:10-alpine
     container_name: backend-migrations
     command:
       - info
@@ -70,24 +70,22 @@ services:
       - default
   frontend:
     container_name: frontend
-    entrypoint:
-      - "sh"
-      - "-c"
-      - "chown -R root . && npm ci && npm run dev"
+    build:
+      context: frontend
+      dockerfile: Dockerfile
     environment:
       NODE_ENV: development
       BACKEND_URL: backend
     hostname: frontend
-    image: registry.access.redhat.com/ubi8/nodejs-18-minimal
     links:
       - backend
     ports:
       - "3000:3000"
     volumes:
-      - ./frontend:/app.ts:z
-      - /app.ts/node_modules
+      - ./frontend:/app:z
+      - /app/node_modules
     user: root
-    working_dir: "/app.ts"
+    working_dir: "/app"
     depends_on:
       backend:
         condition: service_healthy