From 21b1d8922703b830dce5f517c86c62786955d005 Mon Sep 17 00:00:00 2001
From: Hannes Klinckaert <hannes-dev@mailbox.org>
Date: Thu, 10 Oct 2024 09:49:02 +0200
Subject: [PATCH 1/3] zess: make some fixes for faster backend compiles in dev

---
 docker-compose.yml | 82 ++++++++++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 39 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 767294a..3caa0a1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,44 +1,48 @@
 services:
-  zess-db:
-    image: postgres:alpine3.20
-    environment:
-      - POSTGRES_PASSWORD=zess
-      - POSTGRES_USER=postgres
-      - POSTGRES_DB=zess
-    volumes:
-      - db-data:/var/lib/postgresql/data
-    ports:
-      - 5432:5432
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
+    zess-db:
+        image: postgres:alpine3.20
+        environment:
+            - POSTGRES_PASSWORD=zess
+            - POSTGRES_USER=postgres
+            - POSTGRES_DB=zess
+        volumes:
+            - db-data:/var/lib/postgresql/data
+        ports:
+            - 5432:5432
+        extra_hosts:
+            - "host.docker.internal:host-gateway"
 
-  zess-backend:
-    env_file: "vingo/.env"
-    build:
-      context: vingo
-      dockerfile: Dockerfile.dev
-    ports:
-      - 4000:4000
-    volumes:
-      - ./vingo:/backend
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-    stop_grace_period: 1s
-    depends_on:
-      - zess-db
+    zess-backend:
+        env_file: "vingo/.env"
+        environment:
+            - CARGO_BUILD_TARGET_DIR=/target
+        build:
+            context: vingo
+            dockerfile: Dockerfile.dev
+        ports:
+            - 4000:4000
+        volumes:
+            - ./vingo:/backend
+            - backend-compile:/target
+        extra_hosts:
+            - "host.docker.internal:host-gateway"
+        stop_grace_period: 1s
+        depends_on:
+            - zess-db
 
-  zess-frontend:
-    build:
-      context: vinvoor
-      dockerfile: Dockerfile.dev
-    user: ${CURRENT_UID}
-    ports:
-      - 5173:5173
-    volumes:
-      - ./vinvoor:/frontend
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
+    zess-frontend:
+        build:
+            context: vinvoor
+            dockerfile: Dockerfile.dev
+        user: ${CURRENT_UID}
+        ports:
+            - 5173:5173
+        volumes:
+            - ./vinvoor:/frontend
+        extra_hosts:
+            - "host.docker.internal:host-gateway"
 
 volumes:
-  backend-packages:
-  db-data:
+    backend-compile:
+    backend-packages:
+    db-data:

From 92795367d737904c45415ebd20dca34d30173f40 Mon Sep 17 00:00:00 2001
From: Hannes Klinckaert <hannes-dev@mailbox.org>
Date: Thu, 10 Oct 2024 09:59:44 +0200
Subject: [PATCH 2/3] zess: use zess user for db

---
 docker-compose.yml | 2 +-
 vingo/dev.env      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 3caa0a1..1efa86a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ services:
         image: postgres:alpine3.20
         environment:
             - POSTGRES_PASSWORD=zess
-            - POSTGRES_USER=postgres
+            - POSTGRES_USER=zess
             - POSTGRES_DB=zess
         volumes:
             - db-data:/var/lib/postgresql/data
diff --git a/vingo/dev.env b/vingo/dev.env
index d78b9bd..6c6c3b9 100644
--- a/vingo/dev.env
+++ b/vingo/dev.env
@@ -1,7 +1,7 @@
 DEBUG_LOGIN="FALSE"
 DEVELOPMENT="TRUE"
 
-POSTGRES_CONNECTION_STRING="postgres://postgres:zess@host.docker.internal/zess?sslmode=disable"
+POSTGRES_CONNECTION_STRING="postgres://zess:zess@host.docker.internal/zess?sslmode=disable"
 ZAUTH_URL="https://zauth.zeus.gent"
 ZAUTH_CALLBACK_PATH="http://localhost:4000/api/auth/callback"
 FRONTEND_URL="http://localhost:5173/"

From d1a0431893346ea7bcd4a827a16a2518f63fe60b Mon Sep 17 00:00:00 2001
From: Hannes Klinckaert <hannes-dev@mailbox.org>
Date: Thu, 10 Oct 2024 10:05:53 +0200
Subject: [PATCH 3/3] zess: remove unused volume

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

diff --git a/docker-compose.yml b/docker-compose.yml
index 1efa86a..e3d783a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,7 +23,7 @@ services:
             - 4000:4000
         volumes:
             - ./vingo:/backend
-            - backend-compile:/target
+            - backend-target:/target
         extra_hosts:
             - "host.docker.internal:host-gateway"
         stop_grace_period: 1s
@@ -43,6 +43,5 @@ services:
             - "host.docker.internal:host-gateway"
 
 volumes:
-    backend-compile:
-    backend-packages:
+    backend-target:
     db-data: