From 401acbfd5046d33c81891dd687484ff489ff5fd4 Mon Sep 17 00:00:00 2001
From: Akumatic <git@akumatic.eu>
Date: Fri, 31 Jan 2025 21:50:17 +0100
Subject: [PATCH] Upgrade to Postgres 17

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

diff --git a/docker-compose.yml b/docker-compose.yml
index ae82904..9a04c26 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,8 +5,7 @@ services:
     image: requarks/wiki:2
     container_name: wikijs
     depends_on:
-      - db_tmp
-      - db_17
+      - db_pg17
     restart: unless-stopped
     #ports:
     #   - "3000:3000" # http
@@ -15,7 +14,7 @@ services:
       - proxy
     environment:
       DB_TYPE: postgres
-      DB_HOST: db_tmp
+      DB_HOST: db_pg17
       DB_PORT: 5432
       DB_NAME: $DATABASE
       DB_USER: $DATABASE_USER
@@ -23,7 +22,7 @@ services:
     secrets:
       - db_pass
 
-  db_17:
+  db_pg17:
     image: postgres:17
     container_name: wikijs_db_pg17
     restart: unless-stopped    
@@ -34,28 +33,7 @@ services:
       retries: 5
       timeout: 5s
     volumes:
-      - db_17:/var/lib/postgresql/data
-    networks:
-      - internal
-    environment:
-      POSTGRES_DB: $DATABASE
-      POSTGRES_USER: $DATABASE_USER
-      POSTGRES_PASSWORD_FILE: /run/secrets/db_pass
-    secrets:
-      - db_pass
-
-  db_tmp:
-    image: postgres:15
-    container_name: wikijs_db_tmp
-    restart: unless-stopped
-    healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -d $$POSTGRES_DB -U $$POSTGRES_USER" ]
-      start_period: 20s
-      interval: 30s
-      retries: 5
-      timeout: 5s
-    volumes:
-      - db_tmp:/var/lib/postgresql/data
+      - db_pg17:/var/lib/postgresql/data
     networks:
       - internal
     environment:
@@ -66,10 +44,8 @@ services:
       - db_pass
 
 volumes:
-  db_17:
+  db_pg17:
     name: wikijs_db_pg17
-  db_tmp:
-    name: wikijs_db_tmp
 
 networks:
   internal: