From a630174f7eb41188b66634637cce9375fc503e87 Mon Sep 17 00:00:00 2001
From: Kevin Heyer <kevin@heyer.systems>
Date: Sat, 29 Mar 2025 16:28:31 +0000
Subject: [PATCH 1/2] add Wikijs container

---
 wikijs/.env-example.com   |  9 ++++++++
 wikijs/README.md          |  0
 wikijs/docker-compose.yml | 44 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 wikijs/.env-example.com
 create mode 100644 wikijs/README.md
 create mode 100644 wikijs/docker-compose.yml

diff --git a/wikijs/.env-example.com b/wikijs/.env-example.com
new file mode 100644
index 0000000..78a059f
--- /dev/null
+++ b/wikijs/.env-example.com
@@ -0,0 +1,9 @@
+# Wiki.js
+WIKIJS_VERSION=2
+WIKIJS_DOMAIN=wiki.example.com
+
+# PostgreSQL
+WIKIJS_POSTGRES_VERSION=16
+WIKIJS_POSTGRES_DATABASE=wikijs
+WIKIJS_POSTGRES_USER=wikijs
+WIKIJS_POSTGRES_PASSWORD=securepassword123
\ No newline at end of file
diff --git a/wikijs/README.md b/wikijs/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/wikijs/docker-compose.yml b/wikijs/docker-compose.yml
new file mode 100644
index 0000000..b82f0d9
--- /dev/null
+++ b/wikijs/docker-compose.yml
@@ -0,0 +1,44 @@
+---
+services:
+
+  db:
+    image: postgres:${WIKIJS_POSTGRES_VERSION:-16}
+    container_name: wikijs-db
+    restart: unless-stopped
+    environment:
+      POSTGRES_DB: ${WIKIJS_POSTGRES_DATABASE:?error}
+      POSTGRES_PASSWORD: ${WIKIJS_POSTGRES_PASSWORD:?error}
+      POSTGRES_USER: ${WIKIJS_POSTGRES_user:-wikijs}
+    logging:
+      driver: none
+    volumes:
+      - db:/var/lib/postgresql/data
+
+  wiki:
+    image: ghcr.io/requarks/wiki:${WIKIJS_VERSION:-2}
+    container_name: wikijs
+    restart: unless-stopped
+    depends_on:
+      - db
+    environment:
+      DB_TYPE: postgres
+      DB_HOST: db
+      DB_PORT: 5432
+      DB_USER: ${WIKIJS_POSTGRES_user:-wikijs}
+      DB_PASS: ${WIKIJS_POSTGRES_PASSWORD:?error}
+      DB_NAME: ${WIKIJS_POSTGRES_DATABASE:?error}
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=traefik"
+      - "traefik.http.routers.wikijs.entrypoints=http"
+      - "traefik.http.routers.wikijs.rule=Host(`${WIKIJS_DOMAIN:?error}`)"
+      - "traefik.http.middlewares.wikijs-https-redirect.redirectscheme.scheme=https"
+      - "traefik.http.routers.wikijs.middlewares=wikijs-https-redirect"
+      - "traefik.http.routers.wikijs-secure.entrypoints=https"
+      - "traefik.http.routers.wikijs-secure.rule=Host(`${WIKIJS_DOMAIN:?error}`)"
+      - "traefik.http.routers.wikijs-secure.tls=true"
+      - "traefik.http.routers.wikijs-secure.service=wikijs"
+      - "traefik.http.services.wikijs.loadbalancer.server.port=3000"
+
+volumes:
+  db:
\ No newline at end of file
-- 
2.45.3


From 6e9ca2e34545eaff1d6f21101b2f60c41b6935d8 Mon Sep 17 00:00:00 2001
From: Kevin Heyer <kevin@heyer.systems>
Date: Sat, 29 Mar 2025 17:12:11 +0000
Subject: [PATCH 2/2] fix network

---
 wikijs/docker-compose.yml | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/wikijs/docker-compose.yml b/wikijs/docker-compose.yml
index b82f0d9..05cb60b 100644
--- a/wikijs/docker-compose.yml
+++ b/wikijs/docker-compose.yml
@@ -5,6 +5,8 @@ services:
     image: postgres:${WIKIJS_POSTGRES_VERSION:-16}
     container_name: wikijs-db
     restart: unless-stopped
+    networks:
+      - wikijs
     environment:
       POSTGRES_DB: ${WIKIJS_POSTGRES_DATABASE:?error}
       POSTGRES_PASSWORD: ${WIKIJS_POSTGRES_PASSWORD:?error}
@@ -18,13 +20,14 @@ services:
     image: ghcr.io/requarks/wiki:${WIKIJS_VERSION:-2}
     container_name: wikijs
     restart: unless-stopped
-    depends_on:
-      - db
+    networks:
+      - wikijs
+      - traefik
     environment:
       DB_TYPE: postgres
       DB_HOST: db
       DB_PORT: 5432
-      DB_USER: ${WIKIJS_POSTGRES_user:-wikijs}
+      DB_USER: ${WIKIJS_POSTGRES_USER:-wikijs}
       DB_PASS: ${WIKIJS_POSTGRES_PASSWORD:?error}
       DB_NAME: ${WIKIJS_POSTGRES_DATABASE:?error}
     labels:
@@ -39,6 +42,20 @@ services:
       - "traefik.http.routers.wikijs-secure.tls=true"
       - "traefik.http.routers.wikijs-secure.service=wikijs"
       - "traefik.http.services.wikijs.loadbalancer.server.port=3000"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:3000/"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 90s
+    depends_on:
+      - db
+
+networks:
+  traefik:
+    external: true
+  wikijs:
+    driver: bridge
 
 volumes:
   db:
\ No newline at end of file
-- 
2.45.3