#120 Switch all env_file parameters to long format

2024-02-15 02:05:23 -08:00 · 2024-02-15 02:05:23 -08:00 · 7880f1d341
commit 7880f1d341
parent 2da418fe02
16 changed files with 90 additions and 44 deletions
--- a/druid/config/vaultwarden/docker-compose.yml
+++ b/druid/config/vaultwarden/docker-compose.yml
@ -5,7 +5,8 @@ services:
    container_name: vaultwarden_vaultwarden
    restart: "no"
    env_file:
-      - vaultwarden_secrets.env
+      - path: ./vaultwarden_secrets.env
+        required: false
    networks:
      - web
    volumes:
--- a/druid/config/wireguard/docker-compose.yml
+++ b/druid/config/wireguard/docker-compose.yml
@ -5,8 +5,10 @@ services:
    container_name: wireguard_wg-easy
    restart: "no"
    env_file:
-      - wireguard.env
-      - wireguard_secrets.env
+      - path: ./wireguard.env
+        required: true
+      - path: ./wireguard_secrets.env
+        required: false
    ports:
      - 53820:51820/udp
    networks:
--- a/fighter/config/autopirate/docker-compose.yml
+++ b/fighter/config/autopirate/docker-compose.yml
@ -6,7 +6,8 @@ services:
    networks:
      - web
    env_file:
-      - autopirate.env
+      - path: ./autopirate.env
+        required: true
    volumes:
      - "${MEDIA_DIR}/Video/Movies:/movies"
      - "${DOCKER_DATA}/radarr_config:/config"
@ -23,7 +24,8 @@ services:
    networks:
      - web
    env_file:
-      - autopirate.env
+      - path: ./autopirate.env
+        required: true
    volumes:
      - "${MEDIA_DIR}/Video/Shows:/shows"
      - "${DOCKER_DATA}/sonarr_config:/config"
@ -40,7 +42,8 @@ services:
    networks:
      - web
    env_file:
-      - autopirate.env
+      - path: ./autopirate.env
+        required: true
    volumes:
      - "${DOCKER_DATA_LOCAL}/bazarr:/config"
      - "${MEDIA_DIR}/Video/Movies:/movies"
@ -57,7 +60,8 @@ services:
    networks:
      - web
    env_file:
-      - autopirate.env
+      - path: ./autopirate.env
+        required: true
    volumes:
      - "${DOCKER_DATA}/nzbhydra2_config:/config"
      - "${NZB_DIR}:/downloads"
@ -74,7 +78,8 @@ services:
      - web
      - monitoring
    env_file:
-      - autopirate.env
+      - path: ./autopirate.env
+        required: true
    ports:
      - 8085:8080
    volumes:
@ -107,8 +112,10 @@ services:
      - traefik.http.routers.tdarr.middlewares=lan-only@file,traefik-forward-auth-privileged@file
      - traefik.http.services.tdarr.loadbalancer.server.port=8265
    env_file:
-      - autopirate.env
-      - tdarr.env
+      - path: ./autopirate.env
+        required: true
+      - path: ./tdarr.env
+        required: true
    volumes:
      - ${DOCKER_DATA}/tdarr/server:/app/server
      - ${DOCKER_DATA}/tdarr/configs:/app/configs
@ -124,8 +131,10 @@ services:
      tdarr:
        ipv4_address: 172.110.0.20
    env_file:
-      - autopirate.env
-      - tdarr_node.env
+      - path: ./autopirate.env
+        required: true
+      - path: ./tdarr_node.env
+        required: true
    volumes:
      - ${DOCKER_DATA}/tdarr/configs:/app/configs
      - ${DOCKER_DATA}/tdarr/logs:/app/logs
@ -139,8 +148,10 @@ services:
    networks:
      - web
    env_file:
-      - autopirate.env
-      - jackett.env
+      - path: ./autopirate.env
+        required: true
+      - path: ./jackett.env
+        required: true
    volumes:
      - "${DOCKER_DATA}/jackett_config:/config"
      - "${NZB_DIR}:/downloads"
@ -157,8 +168,10 @@ services:
    networks:
      - monitoring
    env_file:
-      - exporter-sabnzbd.env
-      - exporter-sabnzbd_secrets.env
+      - path: ./exporter-sabnzbd.env
+        required: true
+      - path: ./exporter-sabnzbd_secrets.env
+        required: false

 networks:
  tdarr:
--- a/fighter/config/calibre-web/docker-compose.yml
+++ b/fighter/config/calibre-web/docker-compose.yml
@ -4,7 +4,8 @@ services:
    image: linuxserver/calibre-web
    container_name: calibre-web_rpg
    env_file:
-      - calibre-web.env
+      - path: ./calibre-web.env
+        required: true
    volumes:
      - calibre-web-rpg_data:/config
      - $LIBRARY_DIR/rpg:/books
@ -18,7 +19,8 @@ services:
    image: linuxserver/calibre-web
    container_name: calibre-web_sff
    env_file:
-      - calibre-web.env
+      - path: ./calibre-web.env
+        required: true
    volumes:
      - calibre-web-sff_data:/config
      - $LIBRARY_DIR/sff:/books
--- a/fighter/config/ddns/docker-compose.yml
+++ b/fighter/config/ddns/docker-compose.yml
@ -7,7 +7,8 @@ services:
    networks:
      - ddns
    env_file:
-      - ddclient.env
+      - path: ./ddclient.env
+        required: true
    volumes:
      - ./ddclient:/config
    labels:
--- a/fighter/config/megan-portfolio/docker-compose.yml
+++ b/fighter/config/megan-portfolio/docker-compose.yml
@ -6,7 +6,8 @@ services:
    container_name: wordpress_megan-portfolio
    restart: "no"
    env_file:
-      - megan-portfolio.env
+      - path: ./megan-portfolio.env
+        required: true
    volumes:
      - ${DOCKER_DATA}/html:/var/www/html
      - ./upload.ini:/usr/local/etc/php/conf.d/uploads.ini
@ -26,7 +27,8 @@ services:
    networks:
      - portfolio
    env_file:
-      - megan-portfolio-db.env
+      - path: ./megan-portfolio-db.env
+        required: true
    volumes:
      - ${DOCKER_DATA}/db:/var/lib/mysql
    labels:
--- a/fighter/config/minecraft/docker-compose.yml
+++ b/fighter/config/minecraft/docker-compose.yml
@ -19,17 +19,21 @@ services:
      - monitoring
      - minecraft
    env_file:
-      - exporter.env
+      - path: ./exporter.env
+        required: true
    labels:
      - traefik.enable=false

  prominence:
    image: itzg/minecraft-server:latest
    container_name: minecraft_prominence
-    env_file: 
-      - minecraft.env
-      - minecraft_secrets.env
-      - prominence.env
+    env_file:
+      - path: ./minecraft.env
+        required: true
+      - path: ./minecraft_secrets.env
+        required: false
+      - path: ./prominence.env
+        required: true
    volumes:
      - $DOCKER_DATA/prominence:/data:rw
    networks:
--- a/fighter/config/monitoring/docker-compose.yml
+++ b/fighter/config/monitoring/docker-compose.yml
@ -61,8 +61,10 @@ services:
    image: ekofr/pihole-exporter:latest
    container_name: monitoring_exporter-pihole
    env_file:
-      - exporter-pihole_secrets.env
-      - exporter-pihole.env
+      - path: ./exporter-pihole.env
+        required: true
+      - path: ./exporter-pihole_secrets.env
+        required: false
    restart: "no"
    networks:
      - monitoring
--- a/fighter/config/nextcloud/docker-compose.yml
+++ b/fighter/config/nextcloud/docker-compose.yml
@ -4,7 +4,8 @@ services:
    image: lscr.io/linuxserver/nextcloud:latest
    container_name: nextcloud_nextcloud
    env_file:
-      - nextcloud.env
+      - path: ./nextcloud.env
+        required: true
    depends_on:
      - mariadb
    labels:
@ -26,8 +27,10 @@ services:
    networks:
      - nextcloud
    env_file:
-      - mariadb.env
-      - mariadb_secrets.env
+      - path: ./mariadb.env
+        required: true
+      - path: ./mariadb_secrets
+        required: false
    volumes:
      - $DOCKER_DATA/mariadb:/config

--- a/fighter/config/plex/docker-compose.yml
+++ b/fighter/config/plex/docker-compose.yml
@ -18,9 +18,12 @@ services:
      - 32413:32413/udp
      - 32414:32414/udp
    env_file:
-      - plex_stack.env
-      - plex.env
-      - plex_secrets.env
+      - path: ./plex.env
+        required: true
+      - path: ./plex_stack.env
+        required: true
+      - path: ./plex_secrets.env
+        required: false
    volumes:
      - "${MEDIA_DIR}/Video/Movies:/movies"
      - "${MEDIA_DIR}/Video/Shows:/shows"
@ -30,6 +33,7 @@ services:
      - traefik.http.routers.plex.rule=Host(`plex.jafner.net`)
      - traefik.http.routers.plex.tls.certresolver=lets-encrypt
      - traefik.http.services.plex.loadbalancer.server.port=32400
+
  ombi:
    image: ghcr.io/linuxserver/ombi
    container_name: plex_ombi
@ -37,7 +41,8 @@ services:
    networks:
      - web
    env_file:
-      - plex_stack.env
+      - path: ./plex_stack.env
+        required: true
    volumes:
      - "${DOCKER_DATA}/ombi:/config"
    labels:
@ -46,6 +51,7 @@ services:
      - traefik.http.routers.ombi.tls.options=tls12@file
      - traefik.http.routers.ombi.middlewares=securityheaders@file
      - traefik.http.services.ombi.loadbalancer.server.port=3579   
+
  exporter-plex:
    image: granra/plex_exporter
    container_name: plex_exporter
--- a/fighter/config/qbittorrent/docker-compose.yml
+++ b/fighter/config/qbittorrent/docker-compose.yml
@ -14,7 +14,8 @@ services:
      - $DOCKER_DATA:/config
      - $TORRENT_DATA:/torrenting
    env_file:
-      - qbittorrent.env
+      - path: ./qbittorrent.env
+        required: true
    ports:
      - 49510:49510
    labels:
@ -22,11 +23,13 @@ services:
      - traefik.http.routers.qbt.tls.certresolver=lets-encrypt
      - traefik.http.routers.qbt.middlewares=traefik-forward-auth-privileged@file
      - traefik.http.services.qbt.loadbalancer.server.port=8080
+
  exporter-qbittorrent:
    image: esanchezm/prometheus-qbittorrent-exporter
    container_name: qbittorrent_exporter
    env_file:
-      - exporter.env
+      - path: ./exporter.env
+        required: true
    restart: "no"
    networks:
      - monitoring
--- a/fighter/config/send/docker-compose.yml
+++ b/fighter/config/send/docker-compose.yml
@ -9,7 +9,8 @@ services:
      - send
      - web
    env_file:
-      - send.env
+      - path: ./send.env
+        required: true
    volumes:
      - ${DOCKER_DATA}/uploads:/uploads
    labels:
--- a/fighter/config/stashapp/docker-compose.yml
+++ b/fighter/config/stashapp/docker-compose.yml
@ -13,7 +13,8 @@ services:
      - $MEDIA_DIR/Galleries:/media/Galleries
      - $DOCKER_DATA:/root/.stash
    env_file:
-      - stashapp.env
+      - path: ./stashapp.env
+        required: true
    networks:
      - web
    labels:
--- a/fighter/config/unifi_controller/docker-compose.yml
+++ b/fighter/config/unifi_controller/docker-compose.yml
@ -7,7 +7,8 @@ services:
    networks:
      - web
    env_file:
-      - unifi_controller.env
+      - path: ./unifi_controller.env
+        required: true
    volumes:
      - ${DOCKER_DATA}/config:/config
    ports:
--- a/fighter/config/vandam/docker-compose.yml
+++ b/fighter/config/vandam/docker-compose.yml
@ -5,7 +5,8 @@ services:
    image: ghcr.io/floppy/van_dam:latest
    container_name: vandam_vandam
    env_file:
-        - vandam_secrets.env
+      - path: ./vandam_secrets.env
+        required: false
    volumes:
      - ${STL_DIR}:/libraries
    networks:
@ -25,7 +26,8 @@ services:
    networks:
      - vandam
    env_file:
-      - db_secrets.env
+      - path: ./db_secrets.env
+        required: false
    volumes:
      - db_data:/var/lib/postgresql/data

--- a/fighter/config/wireguard/docker-compose.yml
+++ b/fighter/config/wireguard/docker-compose.yml
@ -5,8 +5,10 @@ services:
    container_name: wireguard_wg-easy
    restart: "no"
    env_file:
-      - wireguard.env
-      - wireguard_secrets.env
+      - path: ./wireguard.env
+        required: true
+      - path: ./wireguard_secrets.env
+        required: false
    ports:
      - 53820:51820/udp
    networks: