Centralizing all docker compose files; updating logging; updating docker engine version

2023-07-30 17:30:19 -05:00 · 2023-07-30 17:30:19 -05:00 · 2ac233808d
commit 2ac233808d
parent 4bc0721a90
12 changed files with 139 additions and 3 deletions
--- a/arr_stack/bazarr/docker-compose.yml
+++ b/arr_stack/bazarr/docker-compose.yml
@ -3,6 +3,10 @@ services:
    bazarr:
        image: lscr.io/linuxserver/bazarr:latest
        container_name: bazarr
+        logging:
+          driver: journald
+          options:
+            mode: non-blocking
        environment:
          - PUID=1001
          - PGID=1001
@ -11,6 +15,7 @@ services:
          - ./config:/config
          - /mnt/media/jellymedia/movies:/movies #optional
          - /mnt/media/jellymedia/shows:/tv #optional
+          - /etc/machine-id:/etc/machine-id:ro
        ports:
          - 6767:6767
        restart: unless-stopped
--- a/arr_stack/prowlarr/docker-compose.yml
+++ b/arr_stack/prowlarr/docker-compose.yml
@ -3,12 +3,17 @@ services:
    prowlarr:
          image: lscr.io/linuxserver/prowlarr:develop
          container_name: prowlarr
+          logging:
+            driver: journald
+            options: 
+            mode: non-blocking
          environment:
            - PUID=1001
            - PGID=1001
            - TZ=America/Chicago
          volumes:
            - ./config:/config
+            - /etc/machine-id:/etc/machine-id:ro
          ports:
            - 9696:9696
          restart: unless-stopped
--- a/arr_stack/radarr/docker-compose.yml
+++ b/arr_stack/radarr/docker-compose.yml
@ -3,6 +3,10 @@ services:
    radarr:
          image: lscr.io/linuxserver/radarr:latest
          container_name: radarr
+          logging:
+            driver: journald
+            options:
+              mode: non-blocking
          environment:
            - PUID=1001
            - PGID=1001
@ -12,6 +16,7 @@ services:
            - /mnt/media/jellymedia/movies:/movies #optional
            - /mnt/media/downloads:/downloads #optional
            - /media/scratch:/media/scratch
+            - /etc/machine-id:/etc/machine-id:ro
          ports:
            - 7878:7878
          restart: unless-stopped
--- a/arr_stack/readarr/docker-compose.yml
+++ b/arr_stack/readarr/docker-compose.yml
@ -3,6 +3,10 @@ services:
  readarr:
    image: lscr.io/linuxserver/readarr:develop
    container_name: readarr
+    logging:
+      driver: journald
+      options:
+        mode: non-blocking
    environment:
      - PUID=1001
      - PGID=1001
@ -12,6 +16,7 @@ services:
      - /mnt/media/jellymedia/books:/books #optional
      - /mnt/media/downloads:/downloads #optional
      - /media/scratch:/media/scratch
+      - /etc/machine-id:/etc/machine-id:ro
    ports:
      - 8787:8787
    restart: unless-stopped
--- a/arr_stack/sonarr/docker-compose.yml
+++ b/arr_stack/sonarr/docker-compose.yml
@ -3,6 +3,10 @@ services:
    sonarr:
          image: lscr.io/linuxserver/sonarr:latest
          container_name: sonarr
+          logging:
+            driver: journald
+            options:
+              mode: non-blocking
          environment:
            - PUID=1001
            - PGID=1001
@ -12,6 +16,7 @@ services:
            - /mnt/media/jellymedia/shows:/tv #optional
            - /mnt/media/downloads:/downloads #optional
            - /media/scratch:/media/scratch
+            - /etc/machine-id:/etc/machine-id:ro
          ports:
            - 8989:8989
          restart: unless-stopped
--- a/audiobookshelf/docker-compose.yml
+++ b/audiobookshelf/docker-compose.yml
@ -2,6 +2,11 @@ version: "3.7"
 services:
  audiobookshelf:
    image: ghcr.io/advplyr/audiobookshelf:latest
+    container_name: audiobookshelf
+    logging:
+      driver: journald
+      options:
+        mode: non-blocking
    ports:
      - 13378:80
    volumes:
@ -9,6 +14,7 @@ services:
      - /mnt/media/jellymedia/podcasts:/podcasts
      - ./config:/config
      - ./metadata:/metadata
+      - /etc/machine-id:/etc/machine-id:ro
    environment:
      - PUID=1001
      - GUID=1001
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@ -1,4 +1,4 @@
-version: "3"
+version: "3.8"

 networks:
  gitea:
@ -8,6 +8,10 @@ services:
  server:
    image: gitea/gitea:latest
    container_name: gitea
+    logging:
+      driver: journald
+      options:
+        mode: non-blocking
    environment:
      - USER_UID=1000
      - USER_GID=1000
@ -21,6 +25,7 @@ services:
      - ./gitea:/data
      - /etc/timezone:/etc/timezone:ro
      - /etc/localtime:/etc/localtime:ro
+      - /etc/machine-id:/etc/machine-id:ro
    ports:
      - "3000:3000"
      - "222:22"
--- a/grafana-loki-promtail/docker-compose.yml
+++ b/grafana-loki-promtail/docker-compose.yml
@ -1,12 +1,17 @@
-version: "2"
+version: "3.8"

 services:
    loki:
        image: grafana/loki:latest
        hostname: loki
        container_name: loki
+        logging:
+          driver: journald
+          options:
+            mode: non-blocking
        volumes:
        - ./loki:/etc/loki
+        - /etc/machine-id:/etc/machine-id:ro
        ports:
          - "3100:3100"
        restart: unless-stopped
@ -15,17 +20,26 @@ services:
    promtail:
        image: grafana/promtail:latest
        container_name: promtail
+        logging:
+          driver: journald
+          options:
+            mode: non-blocking
        depends_on:
          - loki
        hostname: promtail
        volumes:
-          - /var/log:/var/log # can also map other logs if wanted
+          - /var/log:/var/log 
          - ./promtail:/etc/promtail
+          - /etc/machine-id:/etc/machine-id:ro
        restart: unless-stopped
        command: -config.file=/etc/promtail/promtail-config.yml
    grafana:
        container_name: grafana
        hostname: grafana
+        logging:
+          driver: journald
+          options:
+            mode: non-blocking
        user: 1006:1000
        ports:
         - "3000:3000"
@ -38,3 +52,4 @@ services:
          #- GF_SERVER_ROOT_URL=http://subdomain.yourdomain.tld
        volumes:
          - ./grafana:/var/lib/grafana
+          - /etc/machine-id:/etc/machine-id:ro
--- a/homepage/docker-compose.yml
+++ b/homepage/docker-compose.yml
@ -0,0 +1,16 @@
+version: "3.8"
+services:
+  homepage:
+    image: ghcr.io/benphelps/homepage:latest
+    container_name: homepage
+    logging:
+      driver: journald
+      options:
+        mode: non-blocking
+    ports:
+      - 3000:3000
+    volumes:
+      - ./config:/app/config # Make sure your local config directory exists
+      - ./images:/app/public/images # Background images
+      - /etc/machine-id:/etc/machine-id:ro
+    restart: unless-stopped
--- a/jellyfin/docker-compose.yml
+++ b/jellyfin/docker-compose.yml
@ -3,12 +3,17 @@ services:
    jellyfin:
        image: lscr.io/linuxserver/jellyfin:latest
        container_name: jellyfin
+        logging:
+          driver: journald
+          options:
+            mode: non-blocking
        volumes:
          - ./config:/config
          #- ./cache:/cache
          - /mnt/media/jellymedia:/media
          - /mnt/media/jellymedia/movies:/data/movies
          - /mnt/media/jellymedia/shows:/data/tvshows
+          - /etc/machine-id:/etc/machine-id:ro
        restart: "unless-stopped"
        environment:
          - PUID=1001
--- a/omada/docker-compose.yml
+++ b/omada/docker-compose.yml
@ -0,0 +1,36 @@
+version: "3.8"
+
+services:
+  omada-controller:
+    image: mbentley/omada-controller:latest
+    container_name: omada-controller
+    logging:
+      driver: journald
+      options:
+        mode: non-blocking
+    restart: unless-stopped
+    stop_grace_period: 60s
+    network_mode: host
+    environment:
+      - PUID=508
+      - PGID=508
+      - MANAGE_HTTP_PORT=8088
+      - MANAGE_HTTPS_PORT=8043
+      - PORTAL_HTTP_PORT=8088
+      - PORTAL_HTTPS_PORT=8843
+      - PORT_APP_DISCOVERY=27001
+      - PORT_ADOPT_V1=29812
+      - PORT_UPGRADE_V1=29813
+      - PORT_MANAGER_V1=29811
+      - PORT_MANAGER_V2=29814
+      - PORT_DISCOVERY=29810
+      - SHOW_SERVER_LOGS=true
+      - SHOW_MONGODB_LOGS=false
+        #- SSL_CERT_NAME=tls.crt
+        #- SSL_KEY_NAME=tls.key
+      - TZ=America/Chicago
+    volumes:
+      - ./omada-data:/opt/tplink/EAPController/data
+      - ./omada-logs:/opt/tplink/EAPController/logs
+      - /etc/machine-id:/etc/machine-id:ro
+
--- a/qbittorrent/docker-compose.yml
+++ b/qbittorrent/docker-compose.yml
@ -0,0 +1,28 @@
+version: "3.8"
+services:
+    qbittorrent:
+        image: lscr.io/linuxserver/qbittorrent:latest
+        container_name: qbittorrent
+        logging:
+          driver: journald
+          options:
+            mode: non-blocking
+        environment:
+          - PUID=1001
+          - PGID=1001
+          - TZ=America/Chicago
+          - WEBUI_PORT=8080
+        volumes:
+          - ./config:/config
+          - /mnt/media/downloads:/downloads
+          - /media/scratch:/media/scratch
+          - /etc/machine-id:/etc/machine-id:ro
+        ports:
+          - 8080:8080
+          - 6881:6881
+          - 6881:6881/udp
+          #- 46041:46041 #pfwg
+          #- 46041:46041/udp #pfwg
+          - 3501:3501 #ovpn
+          - 3501:3501/udp #ovpn
+        restart: unless-stopped