Remove env_file dependencies from media and maintenance stacks - inline all non-secret values directly in compose files

2026-06-21 22:34:45 -07:00
parent a651848f48
commit b84fae335d
2 changed files with 407 additions and 322 deletions
@@ -0,0 +1,89 @@
+services:
+  cronicle:
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:rw
+      - /volume1/docker/cronicle/data:/opt/cronicle/data:rw
+      - /volume1/docker/cronicle/logs:/opt/cronicle/logs:rw
+      - /volume1/docker/cronicle/plugins:/opt/cronicle/plugins:rw
+      - /volume1/docker/cronicle/app:/opt/cronicle/app:rw
+      - /volume1/docker/cronicle/ssh_keys:/opt/cronicle/ssh_keys:rw
+#      - /volume1/docker/cronicle/conf:/opt/cronicle/conf:rw
+    hostname: schedule
+    ports:
+      - 3012:3012
+#      container_name: cronicle
+    image: bluet/cronicle-docker:latest
+    environment:
+      - CRONICLE_base_app_url=https://schedule.bryanmail.net
+#      - CRONICLE_VERSION 0.9.59
+      - CRONICLE_WebServer__http_port=3012
+      - CRONICLE_WebServer__https_port=443
+      - CRONICLE_web_socket_use_hostnames=1
+      - CRONICLE_server_comm_use_hostnames=1
+      - CRONICLE_web_direct_connect=0
+      - CRONICLE_custom_live_log_socket_url=schedule.bryanmail.net
+#      - CRONICLE_socket_io_transports=polling
+    networks:
+      traefik_backend:
+        aliases:
+          - schedule
+    deploy:
+      labels:
+        - traefik.enable=true
+        - traefik.http.routers.cron.rule=Host(`schedule.bryanmail.net`)
+        - traefik.http.routers.cron.tls=true
+        - traefik.http.routers.cron.tls.certresolver=letsencrypt
+        - traefik.http.routers.cron.entrypoints=websecure
+        - traefik.http.services.cron.loadbalancer.server.port=3012
+        - traefik.swarm.network=traefik_backend
+        - traefik.http.routers.cron.middlewares=forwardAuth-authentik@file, crowdsec@file
+        - traefik.http.routers.cron-ip.rule=Host(`schedule.bryanmail.net`) && ClientIP(`10.0.0.0/8`)
+        - traefik.http.routers.cron-ip.tls=true
+        - traefik.http.routers.cron-ip.tls.certresolver=letsencrypt
+        - traefik.http.routers.cron-ip.entrypoints=websecure
+      resources:
+        limits:
+          cpus: '2' # Limit to 0.5 CPU core
+          memory: 512M
+
+  uptime-kuma:
+    image: louislam/uptime-kuma:2
+    hostname: uptime-kuma
+#    ports:
+#      - "3001:3001"  # This maps the container port "3001" to the host port "3001"
+    volumes:
+      - /volume1/docker/uptime-kuma/data:/app/data  # Configuring persistent storage
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    environment:
+      - TZ=PST  # Set the timezone (change to your preferred local timezone so monitoring times are the same)
+      - UMASK=0022  # Set your file permissions manually
+    networks:
+      - traefik_backend  # add your own custom network config
+      - postgresql_db-backend
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:3001"]
+      interval: 30s
+      retries: 3
+      start_period: 10s
+      timeout: 5s
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
+    deploy:
+      labels:
+        - traefik.enable=true
+        - traefik.http.routers.uptime.rule=Host(`uptime.bryanmail.net`)
+        - traefik.http.routers.uptime.tls=true
+        - traefik.http.routers.uptime.tls.certresolver=letsencrypt
+        - traefik.http.routers.uptime.entrypoints=websecure
+        - traefik.http.services.uptime.loadbalancer.server.port=3001
+        - traefik.http.services.uptime.loadbalancer.server.scheme=http
+        - traefik.swarm.network=traefik_backend
+        - traefik.http.routers.uptime.middlewares=forwardAuth-authentik@file, crowdsec@file
+networks:
+  postgresql_db-backend:
+    external: true
+  traefik_backend:
+    external: true
@@ -1,7 +1,5 @@
 services:
  Plex-Media-Server-GPU:
-    env_file:
-      - media.env
    hostname: plex
    cap_add:
      - SYS_MODULE
@@ -10,10 +8,10 @@ services:
 #      - /bin/bash #turn on for DB maintenance
 #    command: -c "sleep infinity" #turn on for DB maintenance
    environment:
-      - "PUID=${PLEX_PUID}" #1027
-      - "PGID=${PLEX_PGID}" #100
+      - "PUID=0" #1027
+      - "PGID=0" #100
      - "VERSION=latest"
-      - "ADVERTISE_IP=${ADVERTISE_IP}"
+      - "ADVERTISE_IP=https://plex.bryanmail.net:443/"
    networks:
      - traefik_backend
 #    ports:
@@ -62,7 +60,7 @@ services:
    deploy:
      labels:
        - traefik.enable=true
-        - traefik.http.routers.plex.rule=Host(`${PLEX_HOST}`)
+        - traefik.http.routers.plex.rule=Host(`plex.bryanmail.net`)
        - traefik.http.routers.plex.tls=true
        - traefik.http.routers.plex.tls.certresolver=letsencrypt
        - traefik.http.routers.plex.entrypoints=websecure
@@ -85,8 +83,8 @@ services:
    entrypoint:
      - "/init"
    environment:
-      - "PUID=${PLEX_PUID}" #1027
-      - "PGID=${PLEX_PGID}" #100
+      - "PUID=0" #1027
+      - "PGID=0" #100
      - "TZ=PST"
    image: "linuxserver/radarr:latest"
 #    restart: "always"
@@ -122,7 +120,7 @@ services:
 #      endpoint_mode: dnsrr
      labels:
        - traefik.enable=true
-        - traefik.http.routers.radarr.rule=Host(`${RADARR_HOST}`)
+        - traefik.http.routers.radarr.rule=Host(`movies.bryanmail.net`)
        - traefik.http.routers.radarr.tls=true
        - traefik.http.routers.radarr.tls.certresolver=letsencrypt
        - traefik.http.routers.radarr.entrypoints=websecure
@@ -141,8 +139,8 @@ services:
      - "/init"
    environment:
      - "TZ=PST"
-      - "PUID=${PLEX_PUID}" #1027
-      - "PGID=${PLEX_PGID}" #100
+      - "PUID=0" #1027
+      - "PGID=0" #100
    image: "linuxserver/sonarr:latest"
    hostname: tv
    networks:
@@ -173,7 +171,7 @@ services:
    deploy:
      labels:
        - traefik.enable=true
-        - traefik.http.routers.sonarr.rule=Host(`${SONARR_HOST}`)
+        - traefik.http.routers.sonarr.rule=Host(`tv.bryanmail.net`)
        - traefik.http.routers.sonarr.tls=true
        - traefik.http.routers.sonarr.tls.certresolver=letsencrypt
        - traefik.http.routers.sonarr.entrypoints=websecure
@@ -188,8 +186,6 @@ services:
          memory: 512M

  TicketBox:
-    env_file:
-      - media.env
    cap_add:
      - NET_ADMIN
    environment:
@@ -200,7 +196,7 @@ services:
      - "UMASK=000"
      - "DEBUG=false"
      - "NAME_SERVERS=1.1.1.1"
-      - "LAN_NETWORK=${LAN_NETWORK}"
+      - "LAN_NETWORK=192.168.0.0/16,10.0.0.0/8,127.0.0.1/32"
      - "VPN_PROV=custom"
      - "VPN_ENABLED=yes"
      - "DELUGE_ENABLE_WEBUI_PASSWORD=no"
@@ -246,7 +242,7 @@ services:
    deploy:
      labels:
        - traefik.enable=true
-        - traefik.http.routers.ticketbox.rule=Host(`${TICKETBOX_HOST}`)
+        - traefik.http.routers.ticketbox.rule=Host(`ticketbox.bryanmail.net`)
        - traefik.http.routers.ticketbox.tls=true
        - traefik.http.routers.ticketbox.tls.certresolver=letsencrypt
        - traefik.http.routers.ticketbox.entrypoints=websecure
@@ -265,8 +261,8 @@ services:
      - "/init"
    environment:
      - "TZ=PST"
-      - "PUID=${PLEX_PUID}" #1027
-      - "PGID=${PLEX_PGID}" #100
+      - "PUID=0" #1027
+      - "PGID=0" #100
    image: "linuxserver/jackett:latest"
    hostname: jackett
 #    restart: "always"
@@ -292,8 +288,8 @@ services:
      labels:
        - traefik.enable=true
 #        - traefik.frontend.passHostHeader=true
-        - traefik.http.routers.jackett-ip.rule=Host(`${JACKETT_HOST}`) && ClientIP(`10.0.1.0/16`)
-        - traefik.http.routers.jackett-auth.rule=Host(`${JACKETT_HOST}`)
+        - traefik.http.routers.jackett-ip.rule=Host(`jackett.bryanmail.net`) && ClientIP(`10.0.1.0/16`)
+        - traefik.http.routers.jackett-auth.rule=Host(`jackett.bryanmail.net`)
        - traefik.http.routers.jackett-ip.tls=true
        - traefik.http.routers.jackett-auth.tls=true
        - traefik.http.routers.jackett-ip.tls.certresolver=letsencrypt