From ea028d975b469ce45d8cd829347f271f968fa80e Mon Sep 17 00:00:00 2001
From: domi41 <dominique.merle.41@gmail.com>
Date: Sat, 31 May 2025 23:58:01 +0200
Subject: [PATCH 1/3] fix: change the mounted directory of the db volume

This was the necessary fix to restore the prod database from the backup.
---
 docker-compose.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 84eae73..58a40b2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,7 +23,8 @@ services:
     ports:
       - ${DB_PORT:-5433}:5432
     volumes:
-      - db:/var/lib/mysql
+      #- db:/var/lib/mysql
+      - db:/var/lib/postgresql/data
 
   mj_api:
     profiles:
@@ -214,4 +215,4 @@ volumes:
 networks:
   lan:
   traefik_network:
-    external: true 
+    external: true

From a20352cce353032c108f16054b7c579183834c80 Mon Sep 17 00:00:00 2001
From: domi41 <dominique.merle.41@gmail.com>
Date: Sun, 1 Jun 2025 02:35:20 +0200
Subject: [PATCH 2/3] docs: explain why we've move the volume to postgresql

---
 docker-compose.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 58a40b2..c701e59 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     restart: unless-stopped
     hostname: ${DB_HOST:-mj_db}
     healthcheck:
-      start_period: 15s
+      start_period: 20s
       test: ["CMD", "pg_isready", "--user", "${DB_USER:-mj}"]
       interval: 1m
       timeout: 10s
@@ -23,7 +23,9 @@ services:
     ports:
       - ${DB_PORT:-5433}:5432
     volumes:
+      # Old mount point, before the infamous 2025-05 database wipe.
       #- db:/var/lib/mysql
+      # Restoring the volume backup only worked when we mounted it here.
       - db:/var/lib/postgresql/data
 
   mj_api:

From 6ee597e7ed17a1854ba3e86c2f4e96699aa6aff5 Mon Sep 17 00:00:00 2001
From: domi41 <dominique.merle.41@gmail.com>
Date: Sun, 1 Jun 2025 12:20:06 +0200
Subject: [PATCH 3/3] refacto: move config around without changing anything

---
 docker-compose.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index c701e59..da4a087 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -48,11 +48,6 @@ services:
     depends_on:
       mj_db:
         condition: service_healthy
-    volumes:
-      - .:/code
-    networks:
-      - lan
-      - traefik_network
     environment:
       POSTGRES_HOST: ${DB_HOST:-mj_db}
       POSTGRES_USER: "${DB_USER:-mj}"
@@ -63,6 +58,11 @@ services:
       SECRET: "${SECRET}"
     ports:
       - 8877:8877
+    volumes:
+      - .:/code
+    networks:
+      - lan
+      - traefik_network
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=traefik_network"
@@ -127,11 +127,11 @@ services:
       interval: 10m
       timeout: 10s
       retries: 3
+    volumes:
+      - imgpush:/images
     networks:
       - lan
       - traefik_network
-    volumes:
-      - imgpush:/images
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=traefik_network"
@@ -150,9 +150,6 @@ services:
     depends_on:
       mj_db:
         condition: service_healthy
-    networks:
-      - lan
-      - traefik_network
     environment:
       MB_DB_TYPE: postgres
       MB_DB_DBNAME: "${DB_NAME:-mj}"
@@ -161,6 +158,9 @@ services:
       MB_DB_USER: "${DB_USER:-mj}"
       MB_DB_PASS: "${DB_PASS}"
       TZ: ${TIMEZONE:-Europe/Paris}
+    networks:
+      - lan
+      - traefik_network
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=traefik_network"