Pārlūkot izejas kodu

add wikijs + use host network mode for pihole

Noah Vogt 1 mēnesi atpakaļ
vecāks
revīzija
9f1e163215
3 mainītis faili ar 44 papildinājumiem un 13 dzēšanām
  1. 1 0
      README.md
  2. 4 13
      pihole/docker-compose.yml
  3. 39 0
      wikijs/docker-compose.yml

+ 1 - 0
README.md

@@ -15,3 +15,4 @@ To run these services, replace the following example values with production valu
 |NEXTCLOUD_TRUSTED_DOMAIN|nextcloud.example.org|
 |MQTT_USER|example|
 |MQTT_PASSWORD|example_password|
+|WIKI_DB_PASS|example_password|

+ 4 - 13
pihole/docker-compose.yml

@@ -1,27 +1,18 @@
-version: "3"
-
 services:
   pihole:
     container_name: pihole
     image: pihole/pihole:latest
-    ports:
-      - "53:53/tcp"
-      - "53:53/udp"
-      - "67:67/udp"
-      - "8080:80/tcp"
+    network_mode: host
     environment:
       TZ: ${TZ}
       FTLCONF_webserver_api_password: ${PIHOLE_WEBPASSWORD}
       FTLCONF_LOCAL_IPV4: ${PIHOLE_LOCAL_IP}
+      WEB_PORT: 8080
+      FTLCONF_webserver_port: 8080
+      INTERFACE: eth0
     volumes:
       - CHANGE_TO_COMPOSE_DATA_PATH/pihole/etc-pihole:/etc/pihole
       - CHANGE_TO_COMPOSE_DATA_PATH/pihole/etc-dnsmasq.d:/etc/dnsmasq.d
     cap_add:
       - NET_ADMIN
     restart: unless-stopped
-    networks:
-      - nginx_proxy_manager
-
-networks:
-  nginx_proxy_manager:
-    external: true

+ 39 - 0
wikijs/docker-compose.yml

@@ -0,0 +1,39 @@
+services:
+  db:
+    image: postgres:16-alpine
+    container_name: wikijs-db
+    restart: unless-stopped
+    environment:
+      POSTGRES_DB: wiki
+      POSTGRES_USER: wiki
+      POSTGRES_PASSWORD: ${WIKI_DB_PASS}
+    volumes:
+      - CHANGE_TO_COMPOSE_DATA_PATH/wikijs/db:/var/lib/postgresql/data
+    networks:
+      - nginx_proxy_manager
+
+  wiki:
+    image: lscr.io/linuxserver/wikijs:latest
+    container_name: wikijs
+    restart: unless-stopped
+    depends_on:
+      - db
+    environment:
+      PUID: ${PUID:-1000}
+      PGID: ${PGID:-1000}
+      TZ: ${TZ}
+      DB_TYPE: postgres
+      DB_HOST: db
+      DB_PORT: 5432
+      DB_USER: wiki
+      DB_PASS: ${WIKI_DB_PASS}
+      DB_NAME: wiki
+    volumes:
+      - CHANGE_TO_COMPOSE_DATA_PATH/wikijs/config:/config
+      - CHANGE_TO_COMPOSE_DATA_PATH/wikijs/data:/data
+    networks:
+      - nginx_proxy_manager
+
+networks:
+  nginx_proxy_manager:
+    external: true