Merge branch 'master' of https://github.com/acedanger/docker

Add gluetun service_healthy dependency to sabnzbd

gitea/docker-compose.yml

@@ -22,6 +22,19 @@ services:
       - ${GITEA_SSH_PORT:-2229}:22
     depends_on:
       - db
+    labels:
+      - diun.enable=true
+    healthcheck:
+      test:
+        - CMD
+        - curl
+        - -f
+        - http://localhost
+      interval: 10s
+      retries: 3
+      start_period: 30s
+      timeout: 10s
+      
   db:
     image: docker.io/library/postgres:14
     restart: always
@@ -33,11 +46,30 @@ services:
       - gitea
     volumes:
       - postgres:/var/lib/postgresql/data
+
+  runner:
+    image: gitea/act_runner:latest
+    container_name: gitea-runner
+    restart: always
+    networks:
+      - gitea
+    volumes:
+      - runner:/data
+      - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      - GITEA_INSTANCE_URL=http://server:3000
+      - GITEA_RUNNER_REGISTRATION_TOKEN=${GITEA_RUNNER_REGISTRATION_TOKEN}
+      - GITEA_RUNNER_NAME=docker-runner
+    depends_on:
+      - server
+    labels:
+      - diun.enable=true
+
 networks:
   gitea:
     external: false
+    
 volumes:
   gitea:
-    driver: local
   postgres:
-    driver: local
+  runner:

karakeep/docker-compose.yml

@@ -21,7 +21,7 @@ services:
     labels:
       - diun.enable=true
   chrome:
-    image: gcr.io/zenika-hub/alpine-chrome:123
+    image: gcr.io/zenika-hub/alpine-chrome:124
     restart: unless-stopped
     labels:
       - diun.enable=true
@@ -33,7 +33,7 @@ services:
       - --remote-debugging-port=9222
       - --hide-scrollbars
   meilisearch:
-    image: getmeili/meilisearch:v1.11.1
+    image: getmeili/meilisearch:v1.13.3
     restart: unless-stopped
     environment:
       MEILI_NO_ANALYTICS: true

media/docker-compose.yml

@@ -21,6 +21,7 @@ services:
       - WIREGUARD_PRIVATE_KEY=${WIREGUARD_PRIVATE_KEY}
       - WIREGUARD_PRESHARED_KEY=${WIREGUARD_PRESHARED_KEY}
       - WIREGUARD_ADDRESSES=${WIREGUARD_ADDRESSES}
+      - UPDATER_PERIOD:24h
       - TZ=America/New_York # Timezone for accurate log times
       - SERVER_COUNTRIES=United States
     restart: always
@@ -151,9 +152,53 @@ services:
       - TZ=America/New_York
     labels:
       - diun.enable=true
-
+  jellystat-db:
+    image: postgres:15.2
+    shm_size: 1gb
+    container_name: jellystat-db
+    restart: unless-stopped
+    logging:
+      driver: json-file
+      options:
+        max-file: "5"
+        max-size: 10m
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: ${JELLYSTAT_POSTGRES_PASSWORD}
+    labels:
+      - diun.enable=true
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+  jellystat:
+    image: cyfershepard/jellystat:latest
+    container_name: jellystat
+    restart: unless-stopped
+    logging:
+      driver: json-file
+      options:
+        max-file: "5"
+        max-size: 10m
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: ${JELLYSTAT_POSTGRES_PASSWORD}
+      POSTGRES_IP: jellystat-db
+      POSTGRES_PORT: 5432
+      JWT_SECRET: ${JELLYSTAT_JWT_SECRET}
+      TZ: America/New_York
+    labels:
+      - diun.enable=true
+    volumes:
+      - jellystat-backup-data:/app/backend/backup-data
+    ports:
+      - 3200:3000
+    depends_on:
+      - jellystat-db
+networks:
+  default: null
 volumes:
   gluetun_data: null
   sabnzbd_data: null
   tautulli: null
   huntarr_data: null
+  postgres_data: null
+  jellystat-backup-data: null