feat: ✨ allow setting container_name

Signed-off-by: Eric Nemchik <eric@nemchik.com>
GhostWriters · Jun 6, 2024 · d6c67c3 · d6c67c3
1 parent 1de873c
commit d6c67c3
Show file tree

Hide file tree

Showing 340 changed files with 340 additions and 172 deletions.
diff --git a/compose/.apps/adguard/adguard.labels.yml b/compose/.apps/adguard/adguard.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "false"
       com.dockstarter.appinfo.description: "Network-wide ads & trackers blocking DNS server"
       com.dockstarter.appinfo.nicename: "Adguard"
+      com.dockstarter.appvars.adguard_container_name: "adguard"
       com.dockstarter.appvars.adguard_enabled: "false"
       com.dockstarter.appvars.adguard_environment_serverip: "0.0.0.0"
       com.dockstarter.appvars.adguard_network_mode: ""

diff --git a/compose/.apps/adguard/adguard.yml b/compose/.apps/adguard/adguard.yml
@@ -1,6 +1,6 @@
 services:
   adguard:
-    container_name: adguard
+    container_name: ${ADGUARD_CONTAINER_NAME}
     environment:
       - TZ=${TZ}
     restart: ${ADGUARD_RESTART}

diff --git a/compose/.apps/adminer/adminer.labels.yml b/compose/.apps/adminer/adminer.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "false"
       com.dockstarter.appinfo.description: "A full-featured database management tool"
       com.dockstarter.appinfo.nicename: "adminer"
+      com.dockstarter.appvars.adminer_container_name: "adminer"
       com.dockstarter.appvars.adminer_enabled: "false"
       com.dockstarter.appvars.adminer_environment_design: ""
       com.dockstarter.appvars.adminer_environment_plugins: ""

diff --git a/compose/.apps/adminer/adminer.yml b/compose/.apps/adminer/adminer.yml
@@ -1,6 +1,6 @@
 services:
   adminer:
-    container_name: adminer
+    container_name: ${ADMINER_CONTAINER_NAME}
     environment:
       - ADMINER_DESIGN=${ADMINER_ENVIRONMENT_DESIGN}
       - ADMINER_PLUGINS=${ADMINER_ENVIRONMENT_PLUGINS}

diff --git a/compose/.apps/airdcpp/airdcpp.labels.yml b/compose/.apps/airdcpp/airdcpp.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "true"
       com.dockstarter.appinfo.description: "(DEPRECATED) No replacement"
       com.dockstarter.appinfo.nicename: "AirdcPP"
+      com.dockstarter.appvars.airdcpp_container_name: "airdcpp"
       com.dockstarter.appvars.airdcpp_enabled: "false"
       com.dockstarter.appvars.airdcpp_network_mode: ""
       com.dockstarter.appvars.airdcpp_port_21248: "21248"

diff --git a/compose/.apps/airdcpp/airdcpp.yml b/compose/.apps/airdcpp/airdcpp.yml
@@ -1,6 +1,6 @@
 services:
   airdcpp:
-    container_name: airdcpp
+    container_name: ${AIRDCPP_CONTAINER_NAME}
     environment:
       - HTTP_PORT=${AIRDCPP_PORT_5600}
       - HTTPS_PORT=${AIRDCPP_PORT_5601}

diff --git a/compose/.apps/airsonic/airsonic.labels.yml b/compose/.apps/airsonic/airsonic.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "true"
       com.dockstarter.appinfo.description: "(DEPRECATED) Use AirsonicAdvanced"
       com.dockstarter.appinfo.nicename: "Airsonic"
+      com.dockstarter.appvars.airsonic_container_name: "airsonic"
       com.dockstarter.appvars.airsonic_enabled: "false"
       com.dockstarter.appvars.airsonic_environment_context_path: "/airsonic"
       com.dockstarter.appvars.airsonic_environment_java_opts: ""

diff --git a/compose/.apps/airsonic/airsonic.yml b/compose/.apps/airsonic/airsonic.yml
@@ -1,6 +1,6 @@
 services:
   airsonic:
-    container_name: airsonic
+    container_name: ${AIRSONIC_CONTAINER_NAME}
     environment:
       - CONTEXT_PATH=${AIRSONIC_ENVIRONMENT_CONTEXT_PATH}
       - JAVA_OPTS=${AIRSONIC_ENVIRONMENT_JAVA_OPTS}

diff --git a/compose/.apps/airsonicadvanced/airsonicadvanced.labels.yml b/compose/.apps/airsonicadvanced/airsonicadvanced.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "false"
       com.dockstarter.appinfo.description: "Web-based media streamer providing ubiquitous access to your music"
       com.dockstarter.appinfo.nicename: "AirsonicAdvanced"
+      com.dockstarter.appvars.airsonicadvanced_container_name: "airsonicadvanced"
       com.dockstarter.appvars.airsonicadvanced_enabled: "false"
       com.dockstarter.appvars.airsonicadvanced_environment_context_path: "/airsonic"
       com.dockstarter.appvars.airsonicadvanced_environment_java_opts: ""

diff --git a/compose/.apps/airsonicadvanced/airsonicadvanced.yml b/compose/.apps/airsonicadvanced/airsonicadvanced.yml
@@ -1,6 +1,6 @@
 services:
   airsonicadvanced:
-    container_name: airsonicadvanced
+    container_name: ${AIRSONICADVANCED_CONTAINER_NAME}
     environment:
       - CONTEXT_PATH=${AIRSONICADVANCED_ENVIRONMENT_CONTEXT_PATH}
       - JAVA_OPTS=${AIRSONICADVANCED_ENVIRONMENT_JAVA_OPTS}

diff --git a/compose/.apps/amd/amd.labels.yml b/compose/.apps/amd/amd.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "false"
       com.dockstarter.appinfo.description: "Lidarr companion script to automatically download music for Lidarr"
       com.dockstarter.appinfo.nicename: "AMD"
+      com.dockstarter.appvars.amd_container_name: "amd"
       com.dockstarter.appvars.amd_enabled: "false"
       com.dockstarter.appvars.amd_environment_arl_token: ""
       com.dockstarter.appvars.amd_environment_autostart: "true"

diff --git a/compose/.apps/amd/amd.yml b/compose/.apps/amd/amd.yml
@@ -1,6 +1,6 @@
 services:
   amd:
-    container_name: amd
+    container_name: ${AMD_CONTAINER_NAME}
     environment:
       - ARL_TOKEN=${AMD_ENVIRONMENT_ARL_TOKEN}
       - AUTOSTART=${AMD_ENVIRONMENT_AUTOSTART}

diff --git a/compose/.apps/apcupsd/apcupsd.labels.yml b/compose/.apps/apcupsd/apcupsd.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "false"
       com.dockstarter.appinfo.description: "Dockerized Python script that will send data from apcupsd to influxdb."
       com.dockstarter.appinfo.nicename: "apcupsd"
+      com.dockstarter.appvars.apcupsd_container_name: "apcupsd"
       com.dockstarter.appvars.apcupsd_enabled: "false"
       com.dockstarter.appvars.apcupsd_environment_debug: "false"
       com.dockstarter.appvars.apcupsd_environment_host: ""

diff --git a/compose/.apps/apcupsd/apcupsd.yml b/compose/.apps/apcupsd/apcupsd.yml
@@ -1,6 +1,6 @@
 services:
   apcupsd:
-    container_name: apcupsd
+    container_name: ${APCUPSD_CONTAINER_NAME}
     environment:
       - APCUPSD_HOST=${APCUPSD_ENVIRONMENT_HOST}
       - INFLUXDB_HOST=${APCUPSD_ENVIRONMENT_INFLUXDB_HOST}

diff --git a/compose/.apps/apprise/apprise.labels.yml b/compose/.apps/apprise/apprise.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "false"
       com.dockstarter.appinfo.description: "Apprise API - Push Notifications that work with just about every platform"
       com.dockstarter.appinfo.nicename: "Apprise"
+      com.dockstarter.appvars.apprise_container_name: "apprise"
       com.dockstarter.appvars.apprise_enabled: "false"
       com.dockstarter.appvars.apprise_network_mode: ""
       com.dockstarter.appvars.apprise_port_8000: "8000"

diff --git a/compose/.apps/apprise/apprise.yml b/compose/.apps/apprise/apprise.yml
@@ -1,6 +1,6 @@
 services:
   apprise:
-    container_name: apprise
+    container_name: ${APPRISE_CONTAINER_NAME}
     environment:
       - PGID=${PGID}
       - PUID=${PUID}

diff --git a/compose/.apps/audiobookshelf/audiobookshelf.labels.yml b/compose/.apps/audiobookshelf/audiobookshelf.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "false"
       com.dockstarter.appinfo.description: "Self-hosted audiobook and podcast server"
       com.dockstarter.appinfo.nicename: "audiobookshelf"
+      com.dockstarter.appvars.audiobookshelf_container_name: "audiobookshelf"
       com.dockstarter.appvars.audiobookshelf_enabled: "false"
       com.dockstarter.appvars.audiobookshelf_network_mode: ""
       com.dockstarter.appvars.audiobookshelf_port_80: "13378"

diff --git a/compose/.apps/audiobookshelf/audiobookshelf.yml b/compose/.apps/audiobookshelf/audiobookshelf.yml
@@ -1,6 +1,6 @@
 services:
   audiobookshelf:
-    container_name: audiobookshelf
+    container_name: ${AUDIOBOOKSHELF_CONTAINER_NAME}
     environment:
       - CONFIG_PATH=/config
       - HOME=/config/.home

diff --git a/compose/.apps/autobrr/autobrr.labels.yml b/compose/.apps/autobrr/autobrr.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "false"
       com.dockstarter.appinfo.description: "autobrr is the modern download automation tool for torrents and usenet."
       com.dockstarter.appinfo.nicename: "autobrr"
+      com.dockstarter.appvars.autobrr_container_name: "autobrr"
       com.dockstarter.appvars.autobrr_enabled: "false"
       com.dockstarter.appvars.autobrr_network_mode: ""
       com.dockstarter.appvars.autobrr_port_7474: "7474"

diff --git a/compose/.apps/autobrr/autobrr.yml b/compose/.apps/autobrr/autobrr.yml
@@ -1,6 +1,6 @@
 services:
   autobrr:
-    container_name: autobrr
+    container_name: ${AUTOBRR_CONTAINER_NAME}
     environment:
       - TZ=${TZ}
     restart: ${AUTOBRR_RESTART}

diff --git a/compose/.apps/azuracast/azuracast.labels.yml b/compose/.apps/azuracast/azuracast.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "false"
       com.dockstarter.appinfo.description: "Web radio management suite with Liquidsoap and Icecast."
       com.dockstarter.appinfo.nicename: "AzuraCast"
+      com.dockstarter.appvars.azuracast_container_name: "azuracast"
       com.dockstarter.appvars.azuracast_enabled: "false"
       com.dockstarter.appvars.azuracast_environment_application_env: "production"
       com.dockstarter.appvars.azuracast_environment_enable_redis: "true"

diff --git a/compose/.apps/azuracast/azuracast.yml b/compose/.apps/azuracast/azuracast.yml
@@ -1,6 +1,6 @@
 services:
   azuracast:
-    container_name: azuracast
+    container_name: ${AZURACAST_CONTAINER_NAME}
     environment:
       - PGID=${PGID}
       - PUID=${PUID}

diff --git a/compose/.apps/bazarr/bazarr.labels.yml b/compose/.apps/bazarr/bazarr.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "false"
       com.dockstarter.appinfo.description: "Companion to Sonarr to manage and download subtitles"
       com.dockstarter.appinfo.nicename: "Bazarr"
+      com.dockstarter.appvars.bazarr_container_name: "bazarr"
       com.dockstarter.appvars.bazarr_enabled: "false"
       com.dockstarter.appvars.bazarr_network_mode: ""
       com.dockstarter.appvars.bazarr_port_6767: "6767"

diff --git a/compose/.apps/bazarr/bazarr.yml b/compose/.apps/bazarr/bazarr.yml
@@ -1,6 +1,6 @@
 services:
   bazarr:
-    container_name: bazarr
+    container_name: ${BAZARR_CONTAINER_NAME}
     environment:
       - PGID=${PGID}
       - PUID=${PUID}

diff --git a/compose/.apps/beets/beets.labels.yml b/compose/.apps/beets/beets.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "false"
       com.dockstarter.appinfo.description: "Music library manager and MusicBrainz tagger"
       com.dockstarter.appinfo.nicename: "Beets"
+      com.dockstarter.appvars.beets_container_name: "beets"
       com.dockstarter.appvars.beets_enabled: "false"
       com.dockstarter.appvars.beets_network_mode: ""
       com.dockstarter.appvars.beets_port_8337: "8337"

diff --git a/compose/.apps/beets/beets.yml b/compose/.apps/beets/beets.yml
@@ -1,6 +1,6 @@
 services:
   beets:
-    container_name: beets
+    container_name: ${BEETS_CONTAINER_NAME}
     environment:
       - PGID=${PGID}
       - PUID=${PUID}

diff --git a/compose/.apps/bitwarden/bitwarden.labels.yml b/compose/.apps/bitwarden/bitwarden.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "false"
       com.dockstarter.appinfo.description: "Free and open source password management solution"
       com.dockstarter.appinfo.nicename: "Bitwarden"
+      com.dockstarter.appvars.bitwarden_container_name: "bitwarden"
       com.dockstarter.appvars.bitwarden_enabled: "false"
       com.dockstarter.appvars.bitwarden_environment_admin_token: ""
       com.dockstarter.appvars.bitwarden_environment_database_url: "data/db.sqlite3"

diff --git a/compose/.apps/bitwarden/bitwarden.yml b/compose/.apps/bitwarden/bitwarden.yml
@@ -1,6 +1,6 @@
 services:
   bitwarden:
-    container_name: bitwarden
+    container_name: ${BITWARDEN_CONTAINER_NAME}
     environment:
       - ADMIN_TOKEN=${BITWARDEN_ENVIRONMENT_ADMIN_TOKEN}
       - DATABASE_URL=${BITWARDEN_ENVIRONMENT_DATABASE_URL}

diff --git a/compose/.apps/booksonic/booksonic.labels.yml b/compose/.apps/booksonic/booksonic.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "true"
       com.dockstarter.appinfo.description: "(DEPRECATED) Use BooksonicAir"
       com.dockstarter.appinfo.nicename: "Booksonic"
+      com.dockstarter.appvars.booksonic_container_name: "booksonic"
       com.dockstarter.appvars.booksonic_enabled: "false"
       com.dockstarter.appvars.booksonic_environment_context_path: "/booksonic"
       com.dockstarter.appvars.booksonic_network_mode: ""

diff --git a/compose/.apps/booksonic/booksonic.yml b/compose/.apps/booksonic/booksonic.yml
@@ -1,6 +1,6 @@
 services:
   booksonic:
-    container_name: booksonic
+    container_name: ${BOOKSONIC_CONTAINER_NAME}
     environment:
       - CONTEXT_PATH=${BOOKSONIC_ENVIRONMENT_CONTEXT_PATH}
       - PGID=${PGID}

diff --git a/compose/.apps/booksonicair/booksonicair.labels.yml b/compose/.apps/booksonicair/booksonicair.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "false"
       com.dockstarter.appinfo.description: "Web-based streamer for your audiobooks."
       com.dockstarter.appinfo.nicename: "Booksonicair"
+      com.dockstarter.appvars.booksonicair_container_name: "booksonicair"
       com.dockstarter.appvars.booksonicair_enabled: "false"
       com.dockstarter.appvars.booksonicair_environment_context_path: "/booksonicair"
       com.dockstarter.appvars.booksonicair_network_mode: ""

diff --git a/compose/.apps/booksonicair/booksonicair.yml b/compose/.apps/booksonicair/booksonicair.yml
@@ -1,6 +1,6 @@
 services:
   booksonicair:
-    container_name: booksonicair
+    container_name: ${BOOKSONICAIR_CONTAINER_NAME}
     environment:
       - CONTEXT_PATH=${BOOKSONICAIR_ENVIRONMENT_CONTEXT_PATH}
       - PGID=${PGID}

diff --git a/compose/.apps/bookstack/bookstack.labels.yml b/compose/.apps/bookstack/bookstack.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "false"
       com.dockstarter.appinfo.description: "Platform for storing and organising information and documentation"
       com.dockstarter.appinfo.nicename: "BookStack"
+      com.dockstarter.appvars.bookstack_container_name: "bookstack"
       com.dockstarter.appvars.bookstack_enabled: "false"
       com.dockstarter.appvars.bookstack_environment_app_url: ""
       com.dockstarter.appvars.bookstack_environment_db_database: ""

diff --git a/compose/.apps/bookstack/bookstack.yml b/compose/.apps/bookstack/bookstack.yml
@@ -1,6 +1,6 @@
 services:
   bookstack:
-    container_name: bookstack
+    container_name: ${BOOKSTACK_CONTAINER_NAME}
     environment:
       - APP_URL=${BOOKSTACK_ENVIRONMENT_APP_URL}
       - DB_DATABASE=${BOOKSTACK_ENVIRONMENT_DB_DATABASE}

diff --git a/compose/.apps/calibre/calibre.labels.yml b/compose/.apps/calibre/calibre.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "false"
       com.dockstarter.appinfo.description: "Easy to use e-book manager"
       com.dockstarter.appinfo.nicename: "Calibre"
+      com.dockstarter.appvars.calibre_container_name: "calibre"
       com.dockstarter.appvars.calibre_enabled: "false"
       com.dockstarter.appvars.calibre_environment_cli_args: ""
       com.dockstarter.appvars.calibre_environment_guac_pass: ""

diff --git a/compose/.apps/calibre/calibre.yml b/compose/.apps/calibre/calibre.yml
@@ -1,6 +1,6 @@
 services:
   calibre:
-    container_name: calibre
+    container_name: ${CALIBRE_CONTAINER_NAME}
     environment:
       - CALIBRE_USE_DARK_PALETTE=${CALIBRE_ENVIRONMENT_USE_DARK_PALETTE}
       - CLI_ARGS=${CALIBRE_ENVIRONMENT_CLI_ARGS}

diff --git a/compose/.apps/calibreweb/calibreweb.labels.yml b/compose/.apps/calibreweb/calibreweb.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "false"
       com.dockstarter.appinfo.description: "Web app for browsing, reading and downloading eBooks"
       com.dockstarter.appinfo.nicename: "CalibreWeb"
+      com.dockstarter.appvars.calibreweb_container_name: "calibreweb"
       com.dockstarter.appvars.calibreweb_enabled: "false"
       com.dockstarter.appvars.calibreweb_network_mode: ""
       com.dockstarter.appvars.calibreweb_port_8083: "8083"

diff --git a/compose/.apps/calibreweb/calibreweb.yml b/compose/.apps/calibreweb/calibreweb.yml
@@ -1,6 +1,6 @@
 services:
   calibreweb:
-    container_name: calibreweb
+    container_name: ${CALIBREWEB_CONTAINER_NAME}
     environment:
       - PGID=${PGID}
       - PUID=${PUID}

diff --git a/compose/.apps/cloudcmd/cloudcmd.labels.yml b/compose/.apps/cloudcmd/cloudcmd.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "false"
       com.dockstarter.appinfo.description: "A web file manager with console and editor"
       com.dockstarter.appinfo.nicename: "CloudCMD"
+      com.dockstarter.appvars.cloudcmd_container_name: "cloudcmd"
       com.dockstarter.appvars.cloudcmd_enabled: "false"
       com.dockstarter.appvars.cloudcmd_network_mode: ""
       com.dockstarter.appvars.cloudcmd_port_8000: "8000"

diff --git a/compose/.apps/cloudcmd/cloudcmd.yml b/compose/.apps/cloudcmd/cloudcmd.yml
@@ -1,6 +1,6 @@
 services:
   cloudcmd:
-    container_name: cloudcmd
+    container_name: ${CLOUDCMD_CONTAINER_NAME}
     environment:
       - TZ=${TZ}
     restart: ${CLOUDCMD_RESTART}

diff --git a/compose/.apps/cloudflareddns/cloudflareddns.labels.yml b/compose/.apps/cloudflareddns/cloudflareddns.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "false"
       com.dockstarter.appinfo.description: "Free service which will point a DNS to an IP of your choice"
       com.dockstarter.appinfo.nicename: "CloudFlareDDNS"
+      com.dockstarter.appvars.cloudflareddns_container_name: "cloudflareddns"
       com.dockstarter.appvars.cloudflareddns_enabled: "false"
       com.dockstarter.appvars.cloudflareddns_environment_apikey: ""
       com.dockstarter.appvars.cloudflareddns_environment_apitoken: ""

diff --git a/compose/.apps/cloudflareddns/cloudflareddns.yml b/compose/.apps/cloudflareddns/cloudflareddns.yml
@@ -1,6 +1,6 @@
 services:
   cloudflareddns:
-    container_name: cloudflareddns
+    container_name: ${CLOUDFLAREDDNS_CONTAINER_NAME}
     environment:
       - ARGS=${CLOUDFLAREDDNS_ENVIRONMENT_ARGS}
       - CF_APIKEY=${CLOUDFLAREDDNS_ENVIRONMENT_APIKEY}

diff --git a/compose/.apps/codeserver/codeserver.labels.yml b/compose/.apps/codeserver/codeserver.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "false"
       com.dockstarter.appinfo.description: "VS Code running on a remote server, accessible through the browser"
       com.dockstarter.appinfo.nicename: "codeserver"
+      com.dockstarter.appvars.codeserver_container_name: "codeserver"
       com.dockstarter.appvars.codeserver_enabled: "false"
       com.dockstarter.appvars.codeserver_environment_password: ""
       com.dockstarter.appvars.codeserver_environment_sudo_password: ""

diff --git a/compose/.apps/codeserver/codeserver.yml b/compose/.apps/codeserver/codeserver.yml
@@ -1,6 +1,6 @@
 services:
   codeserver:
-    container_name: codeserver
+    container_name: ${CODESERVER_CONTAINER_NAME}
     environment:
       - PASSWORD=${CODESERVER_ENVIRONMENT_PASSWORD}
       - PGID=${PGID}

diff --git a/compose/.apps/couchpotato/couchpotato.labels.yml b/compose/.apps/couchpotato/couchpotato.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "true"
       com.dockstarter.appinfo.description: "(DEPRECATED) Use Radarr"
       com.dockstarter.appinfo.nicename: "CouchPotato"
+      com.dockstarter.appvars.couchpotato_container_name: "couchpotato"
       com.dockstarter.appvars.couchpotato_enabled: "false"
       com.dockstarter.appvars.couchpotato_network_mode: ""
       com.dockstarter.appvars.couchpotato_port_5050: "5050"

diff --git a/compose/.apps/couchpotato/couchpotato.yml b/compose/.apps/couchpotato/couchpotato.yml
@@ -1,6 +1,6 @@
 services:
   couchpotato:
-    container_name: couchpotato
+    container_name: ${COUCHPOTATO_CONTAINER_NAME}
     environment:
       - PGID=${PGID}
       - PUID=${PUID}

diff --git a/compose/.apps/dasshio/dasshio.labels.yml b/compose/.apps/dasshio/dasshio.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "false"
       com.dockstarter.appinfo.description: "Use Amazon Dash buttons to communicate with Home Assistant."
       com.dockstarter.appinfo.nicename: "Dasshio"
+      com.dockstarter.appvars.dasshio_container_name: "dasshio"
       com.dockstarter.appvars.dasshio_enabled: "false"
       com.dockstarter.appvars.dasshio_environment_homeassistant_auth_token: ""
       com.dockstarter.appvars.dasshio_environment_homeassistant_url: ""

diff --git a/compose/.apps/dasshio/dasshio.yml b/compose/.apps/dasshio/dasshio.yml
@@ -1,6 +1,6 @@
 services:
   dasshio:
-    container_name: dasshio
+    container_name: ${DASSHIO_CONTAINER_NAME}
     environment:
       - HA_BASE_URL=${DASSHIO_ENVIRONMENT_HOMEASSISTANT_URL}
       - HASSIO_TOKEN=${DASSHIO_ENVIRONMENT_HOMEASSISTANT_AUTH_TOKEN}

diff --git a/compose/.apps/ddclient/ddclient.labels.yml b/compose/.apps/ddclient/ddclient.labels.yml
@@ -4,6 +4,7 @@ services:
       com.dockstarter.appinfo.deprecated: "false"
       com.dockstarter.appinfo.description: "Update dynamic DNS entries"
       com.dockstarter.appinfo.nicename: "DDClient"
+      com.dockstarter.appvars.ddclient_container_name: "ddclient"
       com.dockstarter.appvars.ddclient_enabled: "false"
       com.dockstarter.appvars.ddclient_network_mode: ""
       com.dockstarter.appvars.ddclient_restart: "unless-stopped"

diff --git a/compose/.apps/ddclient/ddclient.yml b/compose/.apps/ddclient/ddclient.yml
@@ -1,6 +1,6 @@
 services:
   ddclient:
-    container_name: ddclient
+    container_name: ${DDCLIENT_CONTAINER_NAME}
     environment:
       - PGID=${PGID}
       - PUID=${PUID}