From 2ce0341f7da5ffa27b96f46df79153d4e9736ece Mon Sep 17 00:00:00 2001 From: CLHatch Date: Tue, 17 Sep 2024 19:09:04 -0500 Subject: [PATCH 1/2] Replace all app names with variables in templates --- compose/.apps/adguard/adguard.aarch64.yml | 4 +- compose/.apps/adguard/adguard.hostname.yml | 2 +- compose/.apps/adguard/adguard.labels.yml | 28 ++--- compose/.apps/adguard/adguard.netmode.yml | 4 +- compose/.apps/adguard/adguard.ports.yml | 20 +-- compose/.apps/adguard/adguard.x86_64.yml | 4 +- compose/.apps/adguard/adguard.yml | 10 +- compose/.apps/adminer/adminer.aarch64.yml | 4 +- compose/.apps/adminer/adminer.hostname.yml | 2 +- compose/.apps/adminer/adminer.labels.yml | 18 +-- compose/.apps/adminer/adminer.netmode.yml | 4 +- compose/.apps/adminer/adminer.ports.yml | 4 +- compose/.apps/adminer/adminer.x86_64.yml | 4 +- compose/.apps/adminer/adminer.yml | 12 +- compose/.apps/airdcpp/airdcpp.hostname.yml | 2 +- compose/.apps/airdcpp/airdcpp.labels.yml | 22 ++-- compose/.apps/airdcpp/airdcpp.netmode.yml | 4 +- compose/.apps/airdcpp/airdcpp.ports.yml | 12 +- compose/.apps/airdcpp/airdcpp.x86_64.yml | 4 +- compose/.apps/airdcpp/airdcpp.yml | 20 +-- compose/.apps/airsonic/airsonic.aarch64.yml | 4 +- compose/.apps/airsonic/airsonic.hostname.yml | 2 +- compose/.apps/airsonic/airsonic.labels.yml | 18 +-- compose/.apps/airsonic/airsonic.netmode.yml | 4 +- compose/.apps/airsonic/airsonic.ports.yml | 4 +- compose/.apps/airsonic/airsonic.x86_64.yml | 4 +- compose/.apps/airsonic/airsonic.yml | 12 +- .../airsonicadvanced.aarch64.yml | 4 +- .../airsonicadvanced.hostname.yml | 2 +- .../airsonicadvanced.labels.yml | 18 +-- .../airsonicadvanced.netmode.yml | 4 +- .../airsonicadvanced.ports.yml | 4 +- .../airsonicadvanced.x86_64.yml | 4 +- .../airsonicadvanced/airsonicadvanced.yml | 12 +- compose/.apps/amd/amd.aarch64.yml | 4 +- compose/.apps/amd/amd.hostname.yml | 2 +- compose/.apps/amd/amd.labels.yml | 50 ++++---- compose/.apps/amd/amd.netmode.yml | 4 +- compose/.apps/amd/amd.x86_64.yml | 4 +- compose/.apps/amd/amd.yml | 46 +++---- compose/.apps/apcupsd/apcupsd.hostname.yml | 2 +- compose/.apps/apcupsd/apcupsd.labels.yml | 28 ++--- compose/.apps/apcupsd/apcupsd.netmode.yml | 4 +- compose/.apps/apcupsd/apcupsd.x86_64.yml | 4 +- compose/.apps/apcupsd/apcupsd.yml | 24 ++-- compose/.apps/apprise/apprise.aarch64.yml | 4 +- compose/.apps/apprise/apprise.hostname.yml | 2 +- compose/.apps/apprise/apprise.labels.yml | 14 +-- compose/.apps/apprise/apprise.netmode.yml | 4 +- compose/.apps/apprise/apprise.ports.yml | 4 +- compose/.apps/apprise/apprise.x86_64.yml | 4 +- compose/.apps/apprise/apprise.yml | 8 +- .../audiobookshelf/audiobookshelf.aarch64.yml | 4 +- .../audiobookshelf.hostname.yml | 2 +- .../audiobookshelf/audiobookshelf.labels.yml | 14 +-- .../audiobookshelf/audiobookshelf.netmode.yml | 4 +- .../audiobookshelf/audiobookshelf.ports.yml | 4 +- .../audiobookshelf/audiobookshelf.x86_64.yml | 4 +- .../.apps/audiobookshelf/audiobookshelf.yml | 10 +- compose/.apps/autobrr/autobrr.aarch64.yml | 4 +- compose/.apps/autobrr/autobrr.hostname.yml | 2 +- compose/.apps/autobrr/autobrr.labels.yml | 14 +-- compose/.apps/autobrr/autobrr.netmode.yml | 4 +- compose/.apps/autobrr/autobrr.ports.yml | 4 +- compose/.apps/autobrr/autobrr.x86_64.yml | 4 +- compose/.apps/autobrr/autobrr.yml | 8 +- compose/.apps/azuracast/azuracast.aarch64.yml | 4 +- .../.apps/azuracast/azuracast.hostname.yml | 2 +- compose/.apps/azuracast/azuracast.labels.yml | 40 +++--- compose/.apps/azuracast/azuracast.netmode.yml | 4 +- compose/.apps/azuracast/azuracast.ports.yml | 10 +- compose/.apps/azuracast/azuracast.x86_64.yml | 4 +- compose/.apps/azuracast/azuracast.yml | 32 ++--- compose/.apps/bazarr/bazarr.aarch64.yml | 4 +- compose/.apps/bazarr/bazarr.hostname.yml | 2 +- compose/.apps/bazarr/bazarr.labels.yml | 14 +-- compose/.apps/bazarr/bazarr.netmode.yml | 4 +- compose/.apps/bazarr/bazarr.ports.yml | 4 +- compose/.apps/bazarr/bazarr.x86_64.yml | 4 +- compose/.apps/bazarr/bazarr.yml | 8 +- compose/.apps/beets/beets.aarch64.yml | 4 +- compose/.apps/beets/beets.hostname.yml | 2 +- compose/.apps/beets/beets.labels.yml | 14 +-- compose/.apps/beets/beets.netmode.yml | 4 +- compose/.apps/beets/beets.ports.yml | 4 +- compose/.apps/beets/beets.x86_64.yml | 4 +- compose/.apps/beets/beets.yml | 8 +- compose/.apps/bitwarden/bitwarden.aarch64.yml | 4 +- .../.apps/bitwarden/bitwarden.hostname.yml | 2 +- compose/.apps/bitwarden/bitwarden.labels.yml | 36 +++--- compose/.apps/bitwarden/bitwarden.netmode.yml | 4 +- compose/.apps/bitwarden/bitwarden.ports.yml | 6 +- compose/.apps/bitwarden/bitwarden.x86_64.yml | 4 +- compose/.apps/bitwarden/bitwarden.yml | 28 ++--- compose/.apps/booksonic/booksonic.aarch64.yml | 4 +- .../.apps/booksonic/booksonic.hostname.yml | 2 +- compose/.apps/booksonic/booksonic.labels.yml | 16 +-- compose/.apps/booksonic/booksonic.netmode.yml | 4 +- compose/.apps/booksonic/booksonic.ports.yml | 4 +- compose/.apps/booksonic/booksonic.x86_64.yml | 4 +- compose/.apps/booksonic/booksonic.yml | 10 +- .../booksonicair/booksonicair.aarch64.yml | 4 +- .../booksonicair/booksonicair.hostname.yml | 2 +- .../booksonicair/booksonicair.labels.yml | 16 +-- .../booksonicair/booksonicair.netmode.yml | 4 +- .../.apps/booksonicair/booksonicair.ports.yml | 4 +- .../booksonicair/booksonicair.x86_64.yml | 4 +- compose/.apps/booksonicair/booksonicair.yml | 10 +- compose/.apps/bookstack/bookstack.aarch64.yml | 4 +- .../.apps/bookstack/bookstack.hostname.yml | 2 +- compose/.apps/bookstack/bookstack.labels.yml | 24 ++-- compose/.apps/bookstack/bookstack.netmode.yml | 4 +- compose/.apps/bookstack/bookstack.ports.yml | 4 +- compose/.apps/bookstack/bookstack.x86_64.yml | 4 +- compose/.apps/bookstack/bookstack.yml | 18 +-- compose/.apps/calibre/calibre.aarch64.yml | 4 +- compose/.apps/calibre/calibre.hostname.yml | 2 +- compose/.apps/calibre/calibre.labels.yml | 24 ++-- compose/.apps/calibre/calibre.netmode.yml | 4 +- compose/.apps/calibre/calibre.ports.yml | 6 +- compose/.apps/calibre/calibre.x86_64.yml | 4 +- compose/.apps/calibre/calibre.yml | 16 +-- .../.apps/calibreweb/calibreweb.aarch64.yml | 4 +- .../.apps/calibreweb/calibreweb.hostname.yml | 2 +- .../.apps/calibreweb/calibreweb.labels.yml | 14 +-- .../.apps/calibreweb/calibreweb.netmode.yml | 4 +- compose/.apps/calibreweb/calibreweb.ports.yml | 4 +- .../.apps/calibreweb/calibreweb.x86_64.yml | 4 +- compose/.apps/calibreweb/calibreweb.yml | 8 +- compose/.apps/cloudcmd/cloudcmd.hostname.yml | 2 +- compose/.apps/cloudcmd/cloudcmd.labels.yml | 16 +-- compose/.apps/cloudcmd/cloudcmd.netmode.yml | 4 +- compose/.apps/cloudcmd/cloudcmd.ports.yml | 4 +- compose/.apps/cloudcmd/cloudcmd.x86_64.yml | 4 +- compose/.apps/cloudcmd/cloudcmd.yml | 10 +- .../cloudflareddns/cloudflareddns.aarch64.yml | 4 +- .../cloudflareddns.hostname.yml | 2 +- .../cloudflareddns/cloudflareddns.labels.yml | 30 ++--- .../cloudflareddns/cloudflareddns.netmode.yml | 4 +- .../cloudflareddns/cloudflareddns.x86_64.yml | 4 +- .../.apps/cloudflareddns/cloudflareddns.yml | 28 ++--- .../.apps/codeserver/codeserver.aarch64.yml | 4 +- .../.apps/codeserver/codeserver.hostname.yml | 2 +- .../.apps/codeserver/codeserver.labels.yml | 18 +-- .../.apps/codeserver/codeserver.netmode.yml | 4 +- compose/.apps/codeserver/codeserver.ports.yml | 4 +- .../.apps/codeserver/codeserver.x86_64.yml | 4 +- compose/.apps/codeserver/codeserver.yml | 12 +- .../.apps/couchpotato/couchpotato.aarch64.yml | 4 +- .../couchpotato/couchpotato.hostname.yml | 2 +- .../.apps/couchpotato/couchpotato.labels.yml | 14 +-- .../.apps/couchpotato/couchpotato.netmode.yml | 4 +- .../.apps/couchpotato/couchpotato.ports.yml | 4 +- .../.apps/couchpotato/couchpotato.x86_64.yml | 4 +- compose/.apps/couchpotato/couchpotato.yml | 8 +- compose/.apps/dasshio/dasshio.aarch64.yml | 4 +- compose/.apps/dasshio/dasshio.hostname.yml | 2 +- compose/.apps/dasshio/dasshio.labels.yml | 18 +-- compose/.apps/dasshio/dasshio.netmode.yml | 4 +- compose/.apps/dasshio/dasshio.ports.yml | 4 +- compose/.apps/dasshio/dasshio.x86_64.yml | 4 +- compose/.apps/dasshio/dasshio.yml | 12 +- compose/.apps/ddclient/ddclient.aarch64.yml | 4 +- compose/.apps/ddclient/ddclient.hostname.yml | 2 +- compose/.apps/ddclient/ddclient.labels.yml | 12 +- compose/.apps/ddclient/ddclient.netmode.yml | 4 +- compose/.apps/ddclient/ddclient.x86_64.yml | 4 +- compose/.apps/ddclient/ddclient.yml | 8 +- compose/.apps/deemix/deemix.aarch64.yml | 4 +- compose/.apps/deemix/deemix.hostname.yml | 2 +- compose/.apps/deemix/deemix.labels.yml | 14 +-- compose/.apps/deemix/deemix.netmode.yml | 4 +- compose/.apps/deemix/deemix.ports.yml | 4 +- compose/.apps/deemix/deemix.x86_64.yml | 4 +- compose/.apps/deemix/deemix.yml | 8 +- compose/.apps/deluge/deluge.aarch64.yml | 4 +- compose/.apps/deluge/deluge.hostname.yml | 2 +- compose/.apps/deluge/deluge.labels.yml | 22 ++-- compose/.apps/deluge/deluge.netmode.yml | 4 +- compose/.apps/deluge/deluge.ports.yml | 16 +-- compose/.apps/deluge/deluge.x86_64.yml | 4 +- compose/.apps/deluge/deluge.yml | 8 +- compose/.apps/delugevpn/delugevpn.aarch64.yml | 4 +- .../.apps/delugevpn/delugevpn.hostname.yml | 2 +- compose/.apps/delugevpn/delugevpn.labels.yml | 42 +++---- compose/.apps/delugevpn/delugevpn.netmode.yml | 4 +- compose/.apps/delugevpn/delugevpn.ports.yml | 12 +- compose/.apps/delugevpn/delugevpn.x86_64.yml | 4 +- compose/.apps/delugevpn/delugevpn.yml | 30 ++--- compose/.apps/doplarr/doplarr.aarch64.yml | 4 +- compose/.apps/doplarr/doplarr.hostname.yml | 2 +- compose/.apps/doplarr/doplarr.labels.yml | 48 ++++---- compose/.apps/doplarr/doplarr.netmode.yml | 4 +- compose/.apps/doplarr/doplarr.x86_64.yml | 4 +- compose/.apps/doplarr/doplarr.yml | 44 +++---- compose/.apps/dozzle/dozzle.aarch64.yml | 4 +- compose/.apps/dozzle/dozzle.hostname.yml | 2 +- compose/.apps/dozzle/dozzle.labels.yml | 24 ++-- compose/.apps/dozzle/dozzle.netmode.yml | 4 +- compose/.apps/dozzle/dozzle.ports.yml | 4 +- compose/.apps/dozzle/dozzle.x86_64.yml | 4 +- compose/.apps/dozzle/dozzle.yml | 16 +-- compose/.apps/duckdns/duckdns.aarch64.yml | 4 +- compose/.apps/duckdns/duckdns.hostname.yml | 2 +- compose/.apps/duckdns/duckdns.labels.yml | 18 +-- compose/.apps/duckdns/duckdns.netmode.yml | 4 +- compose/.apps/duckdns/duckdns.x86_64.yml | 4 +- compose/.apps/duckdns/duckdns.yml | 14 +-- compose/.apps/duplicacy/duplicacy.aarch64.yml | 4 +- .../.apps/duplicacy/duplicacy.hostname.yml | 2 +- compose/.apps/duplicacy/duplicacy.labels.yml | 20 +-- compose/.apps/duplicacy/duplicacy.netmode.yml | 4 +- compose/.apps/duplicacy/duplicacy.ports.yml | 4 +- compose/.apps/duplicacy/duplicacy.x86_64.yml | 4 +- compose/.apps/duplicacy/duplicacy.yml | 18 +-- compose/.apps/duplicati/duplicati.aarch64.yml | 4 +- .../.apps/duplicati/duplicati.hostname.yml | 2 +- compose/.apps/duplicati/duplicati.labels.yml | 18 +-- compose/.apps/duplicati/duplicati.netmode.yml | 4 +- compose/.apps/duplicati/duplicati.ports.yml | 4 +- compose/.apps/duplicati/duplicati.x86_64.yml | 4 +- compose/.apps/duplicati/duplicati.yml | 12 +- compose/.apps/emby/emby.aarch64.yml | 4 +- compose/.apps/emby/emby.hostname.yml | 2 +- compose/.apps/emby/emby.labels.yml | 18 +-- compose/.apps/emby/emby.netmode.yml | 4 +- compose/.apps/emby/emby.ports.yml | 6 +- compose/.apps/emby/emby.x86_64.yml | 4 +- compose/.apps/emby/emby.yml | 10 +- compose/.apps/fail2ban/fail2ban.aarch64.yml | 2 +- compose/.apps/fail2ban/fail2ban.labels.yml | 10 +- compose/.apps/fail2ban/fail2ban.netmode.yml | 2 +- compose/.apps/fail2ban/fail2ban.x86_64.yml | 2 +- compose/.apps/fail2ban/fail2ban.yml | 6 +- compose/.apps/filebot/filebot.hostname.yml | 2 +- compose/.apps/filebot/filebot.labels.yml | 18 +-- compose/.apps/filebot/filebot.netmode.yml | 4 +- compose/.apps/filebot/filebot.ports.yml | 4 +- compose/.apps/filebot/filebot.x86_64.yml | 4 +- compose/.apps/filebot/filebot.yml | 12 +- .../.apps/filebrowser/filebrowser.aarch64.yml | 4 +- .../filebrowser/filebrowser.hostname.yml | 2 +- .../.apps/filebrowser/filebrowser.labels.yml | 22 ++-- .../.apps/filebrowser/filebrowser.netmode.yml | 4 +- .../.apps/filebrowser/filebrowser.ports.yml | 4 +- .../.apps/filebrowser/filebrowser.x86_64.yml | 4 +- compose/.apps/filebrowser/filebrowser.yml | 18 +-- .../.apps/fireflyiii/fireflyiii.aarch64.yml | 4 +- .../.apps/fireflyiii/fireflyiii.hostname.yml | 2 +- .../.apps/fireflyiii/fireflyiii.labels.yml | 30 ++--- .../.apps/fireflyiii/fireflyiii.netmode.yml | 4 +- compose/.apps/fireflyiii/fireflyiii.ports.yml | 4 +- .../.apps/fireflyiii/fireflyiii.x86_64.yml | 4 +- compose/.apps/fireflyiii/fireflyiii.yml | 26 ++-- compose/.apps/flame/flame.aarch64.yml | 4 +- compose/.apps/flame/flame.hostname.yml | 2 +- compose/.apps/flame/flame.labels.yml | 18 +-- compose/.apps/flame/flame.netmode.yml | 4 +- compose/.apps/flame/flame.ports.yml | 4 +- compose/.apps/flame/flame.x86_64.yml | 4 +- compose/.apps/flame/flame.yml | 10 +- .../flaresolverr/flaresolverr.aarch64.yml | 4 +- .../flaresolverr/flaresolverr.hostname.yml | 2 +- .../flaresolverr/flaresolverr.labels.yml | 20 +-- .../flaresolverr/flaresolverr.netmode.yml | 4 +- .../.apps/flaresolverr/flaresolverr.ports.yml | 4 +- .../flaresolverr/flaresolverr.x86_64.yml | 4 +- compose/.apps/flaresolverr/flaresolverr.yml | 14 +-- compose/.apps/freshrss/freshrss.aarch64.yml | 4 +- compose/.apps/freshrss/freshrss.hostname.yml | 2 +- compose/.apps/freshrss/freshrss.labels.yml | 14 +-- compose/.apps/freshrss/freshrss.netmode.yml | 4 +- compose/.apps/freshrss/freshrss.ports.yml | 4 +- compose/.apps/freshrss/freshrss.x86_64.yml | 4 +- compose/.apps/freshrss/freshrss.yml | 8 +- compose/.apps/gitea/gitea.hostname.yml | 2 +- compose/.apps/gitea/gitea.labels.yml | 14 +-- compose/.apps/gitea/gitea.netmode.yml | 4 +- compose/.apps/gitea/gitea.ports.yml | 4 +- compose/.apps/gitea/gitea.x86_64.yml | 4 +- compose/.apps/gitea/gitea.yml | 8 +- compose/.apps/glances/glances.hostname.yml | 2 +- compose/.apps/glances/glances.labels.yml | 20 +-- compose/.apps/glances/glances.netmode.yml | 4 +- compose/.apps/glances/glances.ports.yml | 6 +- compose/.apps/glances/glances.x86_64.yml | 4 +- compose/.apps/glances/glances.yml | 12 +- compose/.apps/gluetun/gluetun.aarch64.yml | 4 +- compose/.apps/gluetun/gluetun.hostname.yml | 2 +- compose/.apps/gluetun/gluetun.labels.yml | 114 +++++++++--------- compose/.apps/gluetun/gluetun.netmode.yml | 4 +- compose/.apps/gluetun/gluetun.ports.yml | 10 +- compose/.apps/gluetun/gluetun.x86_64.yml | 4 +- compose/.apps/gluetun/gluetun.yml | 102 ++++++++-------- compose/.apps/goaccess/goaccess.hostname.yml | 2 +- compose/.apps/goaccess/goaccess.labels.yml | 16 +-- compose/.apps/goaccess/goaccess.netmode.yml | 4 +- compose/.apps/goaccess/goaccess.ports.yml | 4 +- compose/.apps/goaccess/goaccess.x86_64.yml | 4 +- compose/.apps/goaccess/goaccess.yml | 10 +- compose/.apps/grafana/grafana.aarch64.yml | 4 +- compose/.apps/grafana/grafana.hostname.yml | 2 +- compose/.apps/grafana/grafana.labels.yml | 16 +-- compose/.apps/grafana/grafana.netmode.yml | 4 +- compose/.apps/grafana/grafana.ports.yml | 4 +- compose/.apps/grafana/grafana.x86_64.yml | 4 +- compose/.apps/grafana/grafana.yml | 10 +- compose/.apps/grocy/grocy.aarch64.yml | 4 +- compose/.apps/grocy/grocy.hostname.yml | 2 +- compose/.apps/grocy/grocy.labels.yml | 14 +-- compose/.apps/grocy/grocy.netmode.yml | 4 +- compose/.apps/grocy/grocy.ports.yml | 4 +- compose/.apps/grocy/grocy.x86_64.yml | 4 +- compose/.apps/grocy/grocy.yml | 8 +- compose/.apps/guacamole/guacamole.aarch64.yml | 4 +- .../.apps/guacamole/guacamole.hostname.yml | 2 +- compose/.apps/guacamole/guacamole.labels.yml | 16 +-- compose/.apps/guacamole/guacamole.netmode.yml | 4 +- compose/.apps/guacamole/guacamole.ports.yml | 4 +- compose/.apps/guacamole/guacamole.x86_64.yml | 4 +- compose/.apps/guacamole/guacamole.yml | 10 +- compose/.apps/h5ai/h5ai.labels.yml | 14 +-- compose/.apps/h5ai/h5ai.netmode.yml | 2 +- compose/.apps/h5ai/h5ai.ports.yml | 2 +- compose/.apps/h5ai/h5ai.x86_64.yml | 2 +- compose/.apps/h5ai/h5ai.yml | 6 +- .../.apps/handbrake/handbrake.hostname.yml | 2 +- compose/.apps/handbrake/handbrake.labels.yml | 18 +-- compose/.apps/handbrake/handbrake.netmode.yml | 4 +- compose/.apps/handbrake/handbrake.ports.yml | 4 +- compose/.apps/handbrake/handbrake.x86_64.yml | 4 +- compose/.apps/handbrake/handbrake.yml | 12 +- .../.apps/headphones/headphones.aarch64.yml | 4 +- .../.apps/headphones/headphones.hostname.yml | 2 +- .../.apps/headphones/headphones.labels.yml | 14 +-- .../.apps/headphones/headphones.netmode.yml | 4 +- compose/.apps/headphones/headphones.ports.yml | 4 +- .../.apps/headphones/headphones.x86_64.yml | 4 +- compose/.apps/headphones/headphones.yml | 8 +- compose/.apps/heimdall/heimdall.aarch64.yml | 4 +- compose/.apps/heimdall/heimdall.hostname.yml | 2 +- compose/.apps/heimdall/heimdall.labels.yml | 16 +-- compose/.apps/heimdall/heimdall.netmode.yml | 4 +- compose/.apps/heimdall/heimdall.ports.yml | 6 +- compose/.apps/heimdall/heimdall.x86_64.yml | 4 +- compose/.apps/heimdall/heimdall.yml | 8 +- .../homeassistant/homeassistant.aarch64.yml | 4 +- .../homeassistant/homeassistant.hostname.yml | 2 +- .../homeassistant/homeassistant.labels.yml | 14 +-- .../homeassistant/homeassistant.netmode.yml | 4 +- .../homeassistant/homeassistant.ports.yml | 4 +- .../homeassistant/homeassistant.x86_64.yml | 4 +- compose/.apps/homeassistant/homeassistant.yml | 8 +- .../.apps/homebridge/homebridge.aarch64.yml | 4 +- .../.apps/homebridge/homebridge.hostname.yml | 2 +- .../.apps/homebridge/homebridge.labels.yml | 16 +-- .../.apps/homebridge/homebridge.netmode.yml | 4 +- compose/.apps/homebridge/homebridge.ports.yml | 4 +- .../.apps/homebridge/homebridge.x86_64.yml | 4 +- compose/.apps/homebridge/homebridge.yml | 10 +- compose/.apps/homepage/homepage.aarch64.yml | 4 +- compose/.apps/homepage/homepage.hostname.yml | 2 +- compose/.apps/homepage/homepage.labels.yml | 16 +-- compose/.apps/homepage/homepage.netmode.yml | 4 +- compose/.apps/homepage/homepage.ports.yml | 4 +- compose/.apps/homepage/homepage.x86_64.yml | 4 +- compose/.apps/homepage/homepage.yml | 10 +- compose/.apps/homer/homer.aarch64.yml | 4 +- compose/.apps/homer/homer.hostname.yml | 2 +- compose/.apps/homer/homer.labels.yml | 18 +-- compose/.apps/homer/homer.netmode.yml | 4 +- compose/.apps/homer/homer.ports.yml | 4 +- compose/.apps/homer/homer.x86_64.yml | 4 +- compose/.apps/homer/homer.yml | 12 +- .../.apps/htpcmanager/htpcmanager.aarch64.yml | 4 +- .../htpcmanager/htpcmanager.hostname.yml | 2 +- .../.apps/htpcmanager/htpcmanager.labels.yml | 14 +-- .../.apps/htpcmanager/htpcmanager.netmode.yml | 4 +- .../.apps/htpcmanager/htpcmanager.ports.yml | 4 +- .../.apps/htpcmanager/htpcmanager.x86_64.yml | 4 +- compose/.apps/htpcmanager/htpcmanager.yml | 8 +- .../.apps/httpserver/httpserver.hostname.yml | 2 +- .../.apps/httpserver/httpserver.labels.yml | 20 +-- .../.apps/httpserver/httpserver.netmode.yml | 4 +- compose/.apps/httpserver/httpserver.ports.yml | 4 +- .../.apps/httpserver/httpserver.x86_64.yml | 4 +- compose/.apps/httpserver/httpserver.yml | 12 +- compose/.apps/huginn/huginn.hostname.yml | 2 +- compose/.apps/huginn/huginn.labels.yml | 24 ++-- compose/.apps/huginn/huginn.netmode.yml | 4 +- compose/.apps/huginn/huginn.ports.yml | 4 +- compose/.apps/huginn/huginn.x86_64.yml | 4 +- compose/.apps/huginn/huginn.yml | 16 +-- compose/.apps/hydra2/hydra2.aarch64.yml | 2 +- compose/.apps/hydra2/hydra2.netmode.yml | 2 +- compose/.apps/hydra2/hydra2.ports.yml | 2 +- compose/.apps/hydra2/hydra2.x86_64.yml | 2 +- compose/.apps/hydra2/hydra2.yml | 6 +- compose/.apps/influxdb/influxdb.aarch64.yml | 4 +- compose/.apps/influxdb/influxdb.hostname.yml | 2 +- compose/.apps/influxdb/influxdb.labels.yml | 14 +-- compose/.apps/influxdb/influxdb.netmode.yml | 4 +- compose/.apps/influxdb/influxdb.ports.yml | 4 +- compose/.apps/influxdb/influxdb.x86_64.yml | 4 +- compose/.apps/influxdb/influxdb.yml | 8 +- compose/.apps/jackett/jackett.aarch64.yml | 4 +- compose/.apps/jackett/jackett.hostname.yml | 2 +- compose/.apps/jackett/jackett.labels.yml | 14 +-- compose/.apps/jackett/jackett.netmode.yml | 4 +- compose/.apps/jackett/jackett.ports.yml | 4 +- compose/.apps/jackett/jackett.x86_64.yml | 4 +- compose/.apps/jackett/jackett.yml | 8 +- compose/.apps/jellyfin/jellyfin.aarch64.yml | 4 +- compose/.apps/jellyfin/jellyfin.hostname.yml | 2 +- compose/.apps/jellyfin/jellyfin.labels.yml | 18 +-- compose/.apps/jellyfin/jellyfin.netmode.yml | 4 +- compose/.apps/jellyfin/jellyfin.ports.yml | 6 +- compose/.apps/jellyfin/jellyfin.x86_64.yml | 4 +- compose/.apps/jellyfin/jellyfin.yml | 10 +- compose/.apps/jfago/jfago.aarch64.yml | 4 +- compose/.apps/jfago/jfago.hostname.yml | 2 +- compose/.apps/jfago/jfago.labels.yml | 14 +-- compose/.apps/jfago/jfago.netmode.yml | 4 +- compose/.apps/jfago/jfago.ports.yml | 4 +- compose/.apps/jfago/jfago.x86_64.yml | 4 +- compose/.apps/jfago/jfago.yml | 10 +- compose/.apps/kanboard/kanboard.aarch64.yml | 4 +- compose/.apps/kanboard/kanboard.hostname.yml | 2 +- compose/.apps/kanboard/kanboard.labels.yml | 14 +-- compose/.apps/kanboard/kanboard.netmode.yml | 4 +- compose/.apps/kanboard/kanboard.ports.yml | 4 +- compose/.apps/kanboard/kanboard.x86_64.yml | 4 +- compose/.apps/kanboard/kanboard.yml | 8 +- compose/.apps/kitana/kitana.aarch64.yml | 4 +- compose/.apps/kitana/kitana.hostname.yml | 2 +- compose/.apps/kitana/kitana.labels.yml | 14 +-- compose/.apps/kitana/kitana.netmode.yml | 4 +- compose/.apps/kitana/kitana.ports.yml | 4 +- compose/.apps/kitana/kitana.x86_64.yml | 4 +- compose/.apps/kitana/kitana.yml | 8 +- .../.apps/kiwixserve/kiwixserve.aarch64.yml | 4 +- .../.apps/kiwixserve/kiwixserve.hostname.yml | 2 +- .../.apps/kiwixserve/kiwixserve.labels.yml | 16 +-- .../.apps/kiwixserve/kiwixserve.netmode.yml | 4 +- compose/.apps/kiwixserve/kiwixserve.ports.yml | 4 +- .../.apps/kiwixserve/kiwixserve.x86_64.yml | 4 +- compose/.apps/kiwixserve/kiwixserve.yml | 10 +- compose/.apps/komga/komga.aarch64.yml | 4 +- compose/.apps/komga/komga.hostname.yml | 2 +- compose/.apps/komga/komga.labels.yml | 18 +-- compose/.apps/komga/komga.netmode.yml | 4 +- compose/.apps/komga/komga.ports.yml | 4 +- compose/.apps/komga/komga.x86_64.yml | 4 +- compose/.apps/komga/komga.yml | 12 +- .../lazylibrarian/lazylibrarian.aarch64.yml | 4 +- .../lazylibrarian/lazylibrarian.hostname.yml | 2 +- .../lazylibrarian/lazylibrarian.labels.yml | 14 +-- .../lazylibrarian/lazylibrarian.netmode.yml | 4 +- .../lazylibrarian/lazylibrarian.ports.yml | 4 +- .../lazylibrarian/lazylibrarian.x86_64.yml | 4 +- compose/.apps/lazylibrarian/lazylibrarian.yml | 8 +- compose/.apps/ldapauth/ldapauth.aarch64.yml | 4 +- compose/.apps/ldapauth/ldapauth.hostname.yml | 2 +- compose/.apps/ldapauth/ldapauth.labels.yml | 22 ++-- compose/.apps/ldapauth/ldapauth.netmode.yml | 4 +- compose/.apps/ldapauth/ldapauth.ports.yml | 6 +- compose/.apps/ldapauth/ldapauth.x86_64.yml | 4 +- compose/.apps/ldapauth/ldapauth.yml | 12 +- .../.apps/letsencrypt/letsencrypt.aarch64.yml | 4 +- .../letsencrypt/letsencrypt.hostname.yml | 2 +- .../.apps/letsencrypt/letsencrypt.labels.yml | 32 ++--- .../.apps/letsencrypt/letsencrypt.netmode.yml | 4 +- .../.apps/letsencrypt/letsencrypt.ports.yml | 6 +- .../.apps/letsencrypt/letsencrypt.x86_64.yml | 4 +- compose/.apps/letsencrypt/letsencrypt.yml | 24 ++-- .../.apps/librespeed/librespeed.aarch64.yml | 4 +- .../.apps/librespeed/librespeed.hostname.yml | 2 +- .../.apps/librespeed/librespeed.labels.yml | 26 ++-- .../.apps/librespeed/librespeed.netmode.yml | 4 +- compose/.apps/librespeed/librespeed.ports.yml | 4 +- .../.apps/librespeed/librespeed.x86_64.yml | 4 +- compose/.apps/librespeed/librespeed.yml | 20 +-- compose/.apps/lidarr/lidarr.aarch64.yml | 4 +- compose/.apps/lidarr/lidarr.hostname.yml | 2 +- compose/.apps/lidarr/lidarr.labels.yml | 14 +-- compose/.apps/lidarr/lidarr.netmode.yml | 4 +- compose/.apps/lidarr/lidarr.ports.yml | 4 +- compose/.apps/lidarr/lidarr.x86_64.yml | 4 +- compose/.apps/lidarr/lidarr.yml | 8 +- compose/.apps/limnoria/limnoria.aarch64.yml | 4 +- compose/.apps/limnoria/limnoria.hostname.yml | 2 +- compose/.apps/limnoria/limnoria.labels.yml | 14 +-- compose/.apps/limnoria/limnoria.netmode.yml | 4 +- compose/.apps/limnoria/limnoria.ports.yml | 4 +- compose/.apps/limnoria/limnoria.x86_64.yml | 4 +- compose/.apps/limnoria/limnoria.yml | 8 +- compose/.apps/logarr/logarr.hostname.yml | 2 +- compose/.apps/logarr/logarr.labels.yml | 14 +-- compose/.apps/logarr/logarr.netmode.yml | 4 +- compose/.apps/logarr/logarr.ports.yml | 4 +- compose/.apps/logarr/logarr.x86_64.yml | 4 +- compose/.apps/logarr/logarr.yml | 8 +- .../logitechmediaserver.aarch64.yml | 4 +- .../logitechmediaserver.hostname.yml | 2 +- .../logitechmediaserver.labels.yml | 18 +-- .../logitechmediaserver.netmode.yml | 4 +- .../logitechmediaserver.ports.yml | 10 +- .../logitechmediaserver.x86_64.yml | 4 +- .../logitechmediaserver.yml | 8 +- compose/.apps/makemkv/makemkv.hostname.yml | 2 +- compose/.apps/makemkv/makemkv.labels.yml | 16 +-- compose/.apps/makemkv/makemkv.netmode.yml | 4 +- compose/.apps/makemkv/makemkv.ports.yml | 4 +- compose/.apps/makemkv/makemkv.x86_64.yml | 4 +- compose/.apps/makemkv/makemkv.yml | 10 +- compose/.apps/mariadb/mariadb.aarch64.yml | 4 +- compose/.apps/mariadb/mariadb.hostname.yml | 2 +- compose/.apps/mariadb/mariadb.labels.yml | 16 +-- compose/.apps/mariadb/mariadb.netmode.yml | 4 +- compose/.apps/mariadb/mariadb.ports.yml | 4 +- compose/.apps/mariadb/mariadb.x86_64.yml | 4 +- compose/.apps/mariadb/mariadb.yml | 10 +- .../.apps/mcmyadmin2/mcmyadmin2.netmode.yml | 2 +- compose/.apps/mcmyadmin2/mcmyadmin2.ports.yml | 4 +- .../.apps/mcmyadmin2/mcmyadmin2.x86_64.yml | 2 +- compose/.apps/mcmyadmin2/mcmyadmin2.yml | 6 +- compose/.apps/medusa/medusa.aarch64.yml | 4 +- compose/.apps/medusa/medusa.hostname.yml | 2 +- compose/.apps/medusa/medusa.labels.yml | 14 +-- compose/.apps/medusa/medusa.netmode.yml | 4 +- compose/.apps/medusa/medusa.ports.yml | 4 +- compose/.apps/medusa/medusa.x86_64.yml | 4 +- compose/.apps/medusa/medusa.yml | 8 +- .../minecraftbedrockserver.hostname.yml | 2 +- .../minecraftbedrockserver.labels.yml | 18 +-- .../minecraftbedrockserver.netmode.yml | 4 +- .../minecraftbedrockserver.ports.yml | 4 +- .../minecraftbedrockserver.x86_64.yml | 4 +- .../minecraftbedrockserver.yml | 12 +- .../minecraftserver.aarch64.yml | 4 +- .../minecraftserver.hostname.yml | 2 +- .../minecraftserver.labels.yml | 20 +-- .../minecraftserver.netmode.yml | 4 +- .../minecraftserver/minecraftserver.ports.yml | 4 +- .../minecraftserver.x86_64.yml | 4 +- .../.apps/minecraftserver/minecraftserver.yml | 14 +-- compose/.apps/monitorr/monitorr.hostname.yml | 2 +- compose/.apps/monitorr/monitorr.labels.yml | 14 +-- compose/.apps/monitorr/monitorr.netmode.yml | 4 +- compose/.apps/monitorr/monitorr.ports.yml | 4 +- compose/.apps/monitorr/monitorr.x86_64.yml | 4 +- compose/.apps/monitorr/monitorr.yml | 8 +- compose/.apps/mosquitto/mosquitto.aarch64.yml | 4 +- .../.apps/mosquitto/mosquitto.hostname.yml | 2 +- compose/.apps/mosquitto/mosquitto.labels.yml | 16 +-- compose/.apps/mosquitto/mosquitto.netmode.yml | 4 +- compose/.apps/mosquitto/mosquitto.ports.yml | 6 +- compose/.apps/mosquitto/mosquitto.x86_64.yml | 4 +- compose/.apps/mosquitto/mosquitto.yml | 12 +- .../.apps/moviematch/moviematch.aarch64.yml | 4 +- .../.apps/moviematch/moviematch.hostname.yml | 2 +- .../.apps/moviematch/moviematch.labels.yml | 20 +-- .../.apps/moviematch/moviematch.netmode.yml | 4 +- compose/.apps/moviematch/moviematch.ports.yml | 4 +- .../.apps/moviematch/moviematch.x86_64.yml | 4 +- compose/.apps/moviematch/moviematch.yml | 14 +-- compose/.apps/murmur/murmur.hostname.yml | 2 +- compose/.apps/murmur/murmur.labels.yml | 16 +-- compose/.apps/murmur/murmur.netmode.yml | 4 +- compose/.apps/murmur/murmur.ports.yml | 6 +- compose/.apps/murmur/murmur.x86_64.yml | 4 +- compose/.apps/murmur/murmur.yml | 16 +-- compose/.apps/muximux/muximux.aarch64.yml | 4 +- compose/.apps/muximux/muximux.hostname.yml | 2 +- compose/.apps/muximux/muximux.labels.yml | 14 +-- compose/.apps/muximux/muximux.netmode.yml | 4 +- compose/.apps/muximux/muximux.ports.yml | 4 +- compose/.apps/muximux/muximux.x86_64.yml | 4 +- compose/.apps/muximux/muximux.yml | 8 +- compose/.apps/mylar/mylar.aarch64.yml | 4 +- compose/.apps/mylar/mylar.hostname.yml | 2 +- compose/.apps/mylar/mylar.labels.yml | 14 +-- compose/.apps/mylar/mylar.netmode.yml | 4 +- compose/.apps/mylar/mylar.ports.yml | 4 +- compose/.apps/mylar/mylar.x86_64.yml | 4 +- compose/.apps/mylar/mylar.yml | 8 +- compose/.apps/mylar3/mylar3.aarch64.yml | 2 +- compose/.apps/mylar3/mylar3.labels.yml | 12 +- compose/.apps/mylar3/mylar3.netmode.yml | 2 +- compose/.apps/mylar3/mylar3.ports.yml | 2 +- compose/.apps/mylar3/mylar3.x86_64.yml | 2 +- compose/.apps/mylar3/mylar3.yml | 6 +- compose/.apps/netdata/netdata.aarch64.yml | 4 +- compose/.apps/netdata/netdata.hostname.yml | 2 +- compose/.apps/netdata/netdata.labels.yml | 16 +-- compose/.apps/netdata/netdata.netmode.yml | 4 +- compose/.apps/netdata/netdata.ports.yml | 4 +- compose/.apps/netdata/netdata.x86_64.yml | 4 +- compose/.apps/netdata/netdata.yml | 8 +- compose/.apps/nextcloud/nextcloud.aarch64.yml | 4 +- .../.apps/nextcloud/nextcloud.hostname.yml | 2 +- compose/.apps/nextcloud/nextcloud.labels.yml | 16 +-- compose/.apps/nextcloud/nextcloud.netmode.yml | 4 +- compose/.apps/nextcloud/nextcloud.ports.yml | 4 +- compose/.apps/nextcloud/nextcloud.x86_64.yml | 4 +- compose/.apps/nextcloud/nextcloud.yml | 10 +- compose/.apps/nodered/nodered.aarch64.yml | 4 +- compose/.apps/nodered/nodered.hostname.yml | 2 +- compose/.apps/nodered/nodered.labels.yml | 14 +-- compose/.apps/nodered/nodered.netmode.yml | 4 +- compose/.apps/nodered/nodered.ports.yml | 4 +- compose/.apps/nodered/nodered.x86_64.yml | 4 +- compose/.apps/nodered/nodered.yml | 8 +- compose/.apps/nzbget/nzbget.aarch64.yml | 4 +- compose/.apps/nzbget/nzbget.hostname.yml | 2 +- compose/.apps/nzbget/nzbget.labels.yml | 14 +-- compose/.apps/nzbget/nzbget.netmode.yml | 4 +- compose/.apps/nzbget/nzbget.ports.yml | 4 +- compose/.apps/nzbget/nzbget.x86_64.yml | 4 +- compose/.apps/nzbget/nzbget.yml | 8 +- .../.apps/nzbgetvpn/nzbgetvpn.hostname.yml | 2 +- compose/.apps/nzbgetvpn/nzbgetvpn.labels.yml | 38 +++--- compose/.apps/nzbgetvpn/nzbgetvpn.netmode.yml | 4 +- compose/.apps/nzbgetvpn/nzbgetvpn.ports.yml | 6 +- compose/.apps/nzbgetvpn/nzbgetvpn.x86_64.yml | 4 +- compose/.apps/nzbgetvpn/nzbgetvpn.yml | 30 ++--- compose/.apps/nzbhydra2/nzbhydra2.aarch64.yml | 2 +- compose/.apps/nzbhydra2/nzbhydra2.labels.yml | 12 +- compose/.apps/nzbhydra2/nzbhydra2.netmode.yml | 2 +- compose/.apps/nzbhydra2/nzbhydra2.ports.yml | 2 +- compose/.apps/nzbhydra2/nzbhydra2.x86_64.yml | 2 +- compose/.apps/nzbhydra2/nzbhydra2.yml | 6 +- .../omadacontroller.aarch64.yml | 4 +- .../omadacontroller.hostname.yml | 2 +- .../omadacontroller.labels.yml | 34 +++--- .../omadacontroller.netmode.yml | 4 +- .../omadacontroller/omadacontroller.ports.yml | 18 +-- .../omadacontroller.x86_64.yml | 4 +- .../.apps/omadacontroller/omadacontroller.yml | 34 +++--- compose/.apps/ombi/ombi.aarch64.yml | 4 +- compose/.apps/ombi/ombi.hostname.yml | 2 +- compose/.apps/ombi/ombi.labels.yml | 14 +-- compose/.apps/ombi/ombi.netmode.yml | 4 +- compose/.apps/ombi/ombi.ports.yml | 4 +- compose/.apps/ombi/ombi.x86_64.yml | 4 +- compose/.apps/ombi/ombi.yml | 8 +- compose/.apps/openldap/openldap.aarch64.yml | 4 +- compose/.apps/openldap/openldap.hostname.yml | 2 +- compose/.apps/openldap/openldap.labels.yml | 32 ++--- compose/.apps/openldap/openldap.netmode.yml | 4 +- compose/.apps/openldap/openldap.ports.yml | 6 +- compose/.apps/openldap/openldap.x86_64.yml | 4 +- compose/.apps/openldap/openldap.yml | 26 ++-- .../openspeedtest/openspeedtest.aarch64.yml | 4 +- .../openspeedtest/openspeedtest.hostname.yml | 2 +- .../openspeedtest/openspeedtest.labels.yml | 18 +-- .../openspeedtest/openspeedtest.netmode.yml | 4 +- .../openspeedtest/openspeedtest.ports.yml | 6 +- .../openspeedtest/openspeedtest.x86_64.yml | 4 +- compose/.apps/openspeedtest/openspeedtest.yml | 10 +- .../.apps/openvpnas/openvpnas.hostname.yml | 2 +- compose/.apps/openvpnas/openvpnas.labels.yml | 20 +-- compose/.apps/openvpnas/openvpnas.netmode.yml | 4 +- compose/.apps/openvpnas/openvpnas.ports.yml | 8 +- compose/.apps/openvpnas/openvpnas.x86_64.yml | 4 +- compose/.apps/openvpnas/openvpnas.yml | 10 +- compose/.apps/organizr/organizr.aarch64.yml | 4 +- compose/.apps/organizr/organizr.hostname.yml | 2 +- compose/.apps/organizr/organizr.labels.yml | 18 +-- compose/.apps/organizr/organizr.netmode.yml | 4 +- compose/.apps/organizr/organizr.ports.yml | 4 +- compose/.apps/organizr/organizr.x86_64.yml | 4 +- compose/.apps/organizr/organizr.yml | 12 +- compose/.apps/ouroboros/ouroboros.aarch64.yml | 4 +- .../.apps/ouroboros/ouroboros.hostname.yml | 2 +- compose/.apps/ouroboros/ouroboros.labels.yml | 32 ++--- compose/.apps/ouroboros/ouroboros.netmode.yml | 4 +- compose/.apps/ouroboros/ouroboros.x86_64.yml | 4 +- compose/.apps/ouroboros/ouroboros.yml | 26 ++-- compose/.apps/overseerr/overseerr.aarch64.yml | 4 +- .../.apps/overseerr/overseerr.hostname.yml | 2 +- compose/.apps/overseerr/overseerr.labels.yml | 14 +-- compose/.apps/overseerr/overseerr.netmode.yml | 4 +- compose/.apps/overseerr/overseerr.ports.yml | 4 +- compose/.apps/overseerr/overseerr.x86_64.yml | 4 +- compose/.apps/overseerr/overseerr.yml | 8 +- compose/.apps/petio/petio.aarch64.yml | 4 +- compose/.apps/petio/petio.hostname.yml | 2 +- compose/.apps/petio/petio.labels.yml | 14 +-- compose/.apps/petio/petio.netmode.yml | 4 +- compose/.apps/petio/petio.ports.yml | 4 +- compose/.apps/petio/petio.x86_64.yml | 4 +- compose/.apps/petio/petio.yml | 10 +- compose/.apps/pgadmin/pgadmin.aarch64.yml | 4 +- compose/.apps/pgadmin/pgadmin.hostname.yml | 2 +- compose/.apps/pgadmin/pgadmin.labels.yml | 20 +-- compose/.apps/pgadmin/pgadmin.netmode.yml | 4 +- compose/.apps/pgadmin/pgadmin.ports.yml | 4 +- compose/.apps/pgadmin/pgadmin.x86_64.yml | 4 +- compose/.apps/pgadmin/pgadmin.yml | 14 +-- compose/.apps/pgbackup/pgbackup.aarch64.yml | 4 +- compose/.apps/pgbackup/pgbackup.hostname.yml | 2 +- compose/.apps/pgbackup/pgbackup.labels.yml | 30 ++--- compose/.apps/pgbackup/pgbackup.netmode.yml | 4 +- compose/.apps/pgbackup/pgbackup.x86_64.yml | 4 +- compose/.apps/pgbackup/pgbackup.yml | 24 ++-- compose/.apps/photoshow/photoshow.aarch64.yml | 4 +- .../.apps/photoshow/photoshow.hostname.yml | 2 +- compose/.apps/photoshow/photoshow.labels.yml | 18 +-- compose/.apps/photoshow/photoshow.netmode.yml | 4 +- compose/.apps/photoshow/photoshow.ports.yml | 4 +- compose/.apps/photoshow/photoshow.x86_64.yml | 4 +- compose/.apps/photoshow/photoshow.yml | 12 +- .../photostructure.hostname.yml | 2 +- .../photostructure/photostructure.labels.yml | 22 ++-- .../photostructure/photostructure.netmode.yml | 4 +- .../photostructure/photostructure.ports.yml | 4 +- .../photostructure/photostructure.x86_64.yml | 4 +- .../.apps/photostructure/photostructure.yml | 18 +-- .../.apps/phpmyadmin/phpmyadmin.aarch64.yml | 4 +- .../.apps/phpmyadmin/phpmyadmin.hostname.yml | 2 +- .../.apps/phpmyadmin/phpmyadmin.labels.yml | 20 +-- .../.apps/phpmyadmin/phpmyadmin.netmode.yml | 4 +- compose/.apps/phpmyadmin/phpmyadmin.ports.yml | 4 +- .../.apps/phpmyadmin/phpmyadmin.x86_64.yml | 4 +- compose/.apps/phpmyadmin/phpmyadmin.yml | 14 +-- compose/.apps/picard/picard.hostname.yml | 2 +- compose/.apps/picard/picard.labels.yml | 14 +-- compose/.apps/picard/picard.netmode.yml | 4 +- compose/.apps/picard/picard.ports.yml | 4 +- compose/.apps/picard/picard.x86_64.yml | 4 +- compose/.apps/picard/picard.yml | 8 +- compose/.apps/pihole/pihole.aarch64.yml | 4 +- compose/.apps/pihole/pihole.hostname.yml | 2 +- compose/.apps/pihole/pihole.labels.yml | 28 ++--- compose/.apps/pihole/pihole.netmode.yml | 4 +- compose/.apps/pihole/pihole.ports.yml | 12 +- compose/.apps/pihole/pihole.x86_64.yml | 4 +- compose/.apps/pihole/pihole.yml | 22 ++-- compose/.apps/piwigo/piwigo.aarch64.yml | 4 +- compose/.apps/piwigo/piwigo.hostname.yml | 2 +- compose/.apps/piwigo/piwigo.labels.yml | 14 +-- compose/.apps/piwigo/piwigo.netmode.yml | 4 +- compose/.apps/piwigo/piwigo.ports.yml | 4 +- compose/.apps/piwigo/piwigo.x86_64.yml | 4 +- compose/.apps/piwigo/piwigo.yml | 8 +- compose/.apps/plex/plex.aarch64.yml | 4 +- compose/.apps/plex/plex.hostname.yml | 2 +- compose/.apps/plex/plex.labels.yml | 36 +++--- compose/.apps/plex/plex.netmode.yml | 4 +- compose/.apps/plex/plex.ports.yml | 22 ++-- compose/.apps/plex/plex.x86_64.yml | 4 +- compose/.apps/plex/plex.yml | 12 +- .../.apps/plexanisync/plexanisync.aarch64.yml | 4 +- .../plexanisync/plexanisync.hostname.yml | 2 +- .../.apps/plexanisync/plexanisync.labels.yml | 24 ++-- .../.apps/plexanisync/plexanisync.netmode.yml | 4 +- .../.apps/plexanisync/plexanisync.x86_64.yml | 4 +- compose/.apps/plexanisync/plexanisync.yml | 18 +-- .../plexrequests/plexrequests.hostname.yml | 2 +- .../plexrequests/plexrequests.labels.yml | 2 +- .../plexrequests/plexrequests.netmode.yml | 4 +- .../.apps/plexrequests/plexrequests.ports.yml | 4 +- .../plexrequests/plexrequests.x86_64.yml | 4 +- compose/.apps/plexrequests/plexrequests.yml | 8 +- compose/.apps/portainer/portainer.aarch64.yml | 4 +- .../.apps/portainer/portainer.hostname.yml | 2 +- compose/.apps/portainer/portainer.labels.yml | 16 +-- compose/.apps/portainer/portainer.netmode.yml | 4 +- compose/.apps/portainer/portainer.ports.yml | 4 +- compose/.apps/portainer/portainer.x86_64.yml | 4 +- compose/.apps/portainer/portainer.yml | 10 +- .../portaineragent/portaineragent.aarch64.yml | 4 +- .../portaineragent.hostname.yml | 2 +- .../portaineragent/portaineragent.labels.yml | 18 +-- .../portaineragent/portaineragent.netmode.yml | 4 +- .../portaineragent/portaineragent.ports.yml | 4 +- .../portaineragent/portaineragent.x86_64.yml | 4 +- .../.apps/portaineragent/portaineragent.yml | 10 +- compose/.apps/postgres/postgres.aarch64.yml | 4 +- compose/.apps/postgres/postgres.hostname.yml | 2 +- compose/.apps/postgres/postgres.labels.yml | 18 +-- compose/.apps/postgres/postgres.netmode.yml | 4 +- compose/.apps/postgres/postgres.ports.yml | 4 +- compose/.apps/postgres/postgres.x86_64.yml | 4 +- compose/.apps/postgres/postgres.yml | 12 +- .../.apps/privoxyvpn/privoxyvpn.aarch64.yml | 4 +- .../.apps/privoxyvpn/privoxyvpn.hostname.yml | 2 +- .../.apps/privoxyvpn/privoxyvpn.labels.yml | 46 +++---- .../.apps/privoxyvpn/privoxyvpn.netmode.yml | 4 +- compose/.apps/privoxyvpn/privoxyvpn.ports.yml | 6 +- .../.apps/privoxyvpn/privoxyvpn.x86_64.yml | 4 +- compose/.apps/privoxyvpn/privoxyvpn.yml | 38 +++--- .../.apps/prometheus/prometheus.hostname.yml | 2 +- .../.apps/prometheus/prometheus.labels.yml | 14 +-- .../.apps/prometheus/prometheus.netmode.yml | 4 +- compose/.apps/prometheus/prometheus.ports.yml | 4 +- .../.apps/prometheus/prometheus.x86_64.yml | 4 +- compose/.apps/prometheus/prometheus.yml | 10 +- compose/.apps/prowlarr/prowlarr.aarch64.yml | 4 +- compose/.apps/prowlarr/prowlarr.hostname.yml | 2 +- compose/.apps/prowlarr/prowlarr.labels.yml | 14 +-- compose/.apps/prowlarr/prowlarr.netmode.yml | 4 +- compose/.apps/prowlarr/prowlarr.ports.yml | 4 +- compose/.apps/prowlarr/prowlarr.x86_64.yml | 4 +- compose/.apps/prowlarr/prowlarr.yml | 8 +- compose/.apps/pyload/pyload.aarch64.yml | 4 +- compose/.apps/pyload/pyload.hostname.yml | 2 +- compose/.apps/pyload/pyload.labels.yml | 14 +-- compose/.apps/pyload/pyload.netmode.yml | 4 +- compose/.apps/pyload/pyload.ports.yml | 4 +- compose/.apps/pyload/pyload.x86_64.yml | 4 +- compose/.apps/pyload/pyload.yml | 8 +- .../.apps/qbittorrent/qbittorrent.aarch64.yml | 4 +- .../qbittorrent/qbittorrent.hostname.yml | 2 +- .../.apps/qbittorrent/qbittorrent.labels.yml | 18 +-- .../.apps/qbittorrent/qbittorrent.netmode.yml | 4 +- .../.apps/qbittorrent/qbittorrent.ports.yml | 12 +- .../.apps/qbittorrent/qbittorrent.x86_64.yml | 4 +- compose/.apps/qbittorrent/qbittorrent.yml | 10 +- .../qbittorrentvpn/qbittorrentvpn.aarch64.yml | 4 +- .../qbittorrentvpn.hostname.yml | 2 +- .../qbittorrentvpn/qbittorrentvpn.labels.yml | 40 +++--- .../qbittorrentvpn/qbittorrentvpn.netmode.yml | 4 +- .../qbittorrentvpn/qbittorrentvpn.ports.yml | 10 +- .../qbittorrentvpn/qbittorrentvpn.x86_64.yml | 4 +- .../.apps/qbittorrentvpn/qbittorrentvpn.yml | 32 ++--- .../.apps/quasselcore/quasselcore.aarch64.yml | 4 +- .../quasselcore/quasselcore.hostname.yml | 2 +- .../.apps/quasselcore/quasselcore.labels.yml | 16 +-- .../.apps/quasselcore/quasselcore.netmode.yml | 4 +- .../.apps/quasselcore/quasselcore.ports.yml | 6 +- .../.apps/quasselcore/quasselcore.x86_64.yml | 4 +- compose/.apps/quasselcore/quasselcore.yml | 8 +- .../.apps/quasselweb/quasselweb.aarch64.yml | 4 +- .../.apps/quasselweb/quasselweb.hostname.yml | 2 +- .../.apps/quasselweb/quasselweb.labels.yml | 24 ++-- .../.apps/quasselweb/quasselweb.netmode.yml | 4 +- compose/.apps/quasselweb/quasselweb.ports.yml | 6 +- .../.apps/quasselweb/quasselweb.x86_64.yml | 4 +- compose/.apps/quasselweb/quasselweb.yml | 16 +-- compose/.apps/radarr/radarr.aarch64.yml | 4 +- compose/.apps/radarr/radarr.hostname.yml | 2 +- compose/.apps/radarr/radarr.labels.yml | 14 +-- compose/.apps/radarr/radarr.netmode.yml | 4 +- compose/.apps/radarr/radarr.ports.yml | 4 +- compose/.apps/radarr/radarr.x86_64.yml | 4 +- compose/.apps/radarr/radarr.yml | 8 +- compose/.apps/readarr/readarr.aarch64.yml | 4 +- compose/.apps/readarr/readarr.hostname.yml | 2 +- compose/.apps/readarr/readarr.labels.yml | 14 +-- compose/.apps/readarr/readarr.netmode.yml | 4 +- compose/.apps/readarr/readarr.ports.yml | 4 +- compose/.apps/readarr/readarr.x86_64.yml | 4 +- compose/.apps/readarr/readarr.yml | 8 +- compose/.apps/recyclarr/recyclarr.aarch64.yml | 4 +- .../.apps/recyclarr/recyclarr.hostname.yml | 2 +- compose/.apps/recyclarr/recyclarr.labels.yml | 14 +-- compose/.apps/recyclarr/recyclarr.netmode.yml | 4 +- compose/.apps/recyclarr/recyclarr.x86_64.yml | 4 +- compose/.apps/recyclarr/recyclarr.yml | 10 +- compose/.apps/requestrr/requestrr.aarch64.yml | 4 +- .../.apps/requestrr/requestrr.hostname.yml | 2 +- compose/.apps/requestrr/requestrr.labels.yml | 14 +-- compose/.apps/requestrr/requestrr.netmode.yml | 4 +- compose/.apps/requestrr/requestrr.ports.yml | 4 +- compose/.apps/requestrr/requestrr.x86_64.yml | 4 +- compose/.apps/requestrr/requestrr.yml | 8 +- .../.apps/resiliosync/resiliosync.aarch64.yml | 4 +- .../resiliosync/resiliosync.hostname.yml | 2 +- .../.apps/resiliosync/resiliosync.labels.yml | 18 +-- .../.apps/resiliosync/resiliosync.netmode.yml | 4 +- .../.apps/resiliosync/resiliosync.ports.yml | 6 +- .../.apps/resiliosync/resiliosync.x86_64.yml | 4 +- compose/.apps/resiliosync/resiliosync.yml | 10 +- compose/.apps/rsnapshot/rsnapshot.aarch64.yml | 4 +- .../.apps/rsnapshot/rsnapshot.hostname.yml | 2 +- compose/.apps/rsnapshot/rsnapshot.labels.yml | 18 +-- compose/.apps/rsnapshot/rsnapshot.netmode.yml | 4 +- compose/.apps/rsnapshot/rsnapshot.x86_64.yml | 4 +- compose/.apps/rsnapshot/rsnapshot.yml | 14 +-- .../rtorrentvpn/rtorrentvpn.hostname.yml | 2 +- .../.apps/rtorrentvpn/rtorrentvpn.labels.yml | 40 +++--- .../.apps/rtorrentvpn/rtorrentvpn.netmode.yml | 4 +- .../.apps/rtorrentvpn/rtorrentvpn.ports.yml | 16 +-- .../.apps/rtorrentvpn/rtorrentvpn.x86_64.yml | 4 +- compose/.apps/rtorrentvpn/rtorrentvpn.yml | 26 ++-- compose/.apps/rustdesk/rustdesk.aarch64.yml | 4 +- compose/.apps/rustdesk/rustdesk.hostname.yml | 2 +- compose/.apps/rustdesk/rustdesk.labels.yml | 24 ++-- compose/.apps/rustdesk/rustdesk.netmode.yml | 4 +- compose/.apps/rustdesk/rustdesk.ports.yml | 14 +-- compose/.apps/rustdesk/rustdesk.x86_64.yml | 4 +- compose/.apps/rustdesk/rustdesk.yml | 10 +- compose/.apps/rutorrent/rutorrent.aarch64.yml | 4 +- .../.apps/rutorrent/rutorrent.hostname.yml | 2 +- compose/.apps/rutorrent/rutorrent.labels.yml | 20 +-- compose/.apps/rutorrent/rutorrent.netmode.yml | 4 +- compose/.apps/rutorrent/rutorrent.ports.yml | 14 +-- compose/.apps/rutorrent/rutorrent.x86_64.yml | 4 +- compose/.apps/rutorrent/rutorrent.yml | 8 +- compose/.apps/sabnzbd/sabnzbd.aarch64.yml | 4 +- compose/.apps/sabnzbd/sabnzbd.hostname.yml | 2 +- compose/.apps/sabnzbd/sabnzbd.labels.yml | 14 +-- compose/.apps/sabnzbd/sabnzbd.netmode.yml | 4 +- compose/.apps/sabnzbd/sabnzbd.ports.yml | 4 +- compose/.apps/sabnzbd/sabnzbd.x86_64.yml | 4 +- compose/.apps/sabnzbd/sabnzbd.yml | 8 +- .../.apps/sabnzbdvpn/sabnzbdvpn.hostname.yml | 2 +- .../.apps/sabnzbdvpn/sabnzbdvpn.labels.yml | 40 +++--- .../.apps/sabnzbdvpn/sabnzbdvpn.netmode.yml | 4 +- compose/.apps/sabnzbdvpn/sabnzbdvpn.ports.yml | 8 +- .../.apps/sabnzbdvpn/sabnzbdvpn.x86_64.yml | 4 +- compose/.apps/sabnzbdvpn/sabnzbdvpn.yml | 30 ++--- compose/.apps/samba/samba.aarch64.yml | 4 +- compose/.apps/samba/samba.hostname.yml | 2 +- compose/.apps/samba/samba.labels.yml | 30 ++--- compose/.apps/samba/samba.netmode.yml | 4 +- compose/.apps/samba/samba.ports.yml | 10 +- compose/.apps/samba/samba.x86_64.yml | 4 +- compose/.apps/samba/samba.yml | 18 +-- compose/.apps/sickchill/sickchill.aarch64.yml | 4 +- .../.apps/sickchill/sickchill.hostname.yml | 2 +- compose/.apps/sickchill/sickchill.labels.yml | 14 +-- compose/.apps/sickchill/sickchill.netmode.yml | 4 +- compose/.apps/sickchill/sickchill.ports.yml | 4 +- compose/.apps/sickchill/sickchill.x86_64.yml | 4 +- compose/.apps/sickchill/sickchill.yml | 8 +- compose/.apps/smokeping/smokeping.aarch64.yml | 4 +- .../.apps/smokeping/smokeping.hostname.yml | 2 +- compose/.apps/smokeping/smokeping.labels.yml | 20 +-- compose/.apps/smokeping/smokeping.netmode.yml | 4 +- compose/.apps/smokeping/smokeping.ports.yml | 4 +- compose/.apps/smokeping/smokeping.x86_64.yml | 4 +- compose/.apps/smokeping/smokeping.yml | 14 +-- compose/.apps/sonarr/sonarr.aarch64.yml | 4 +- compose/.apps/sonarr/sonarr.hostname.yml | 2 +- compose/.apps/sonarr/sonarr.labels.yml | 14 +-- compose/.apps/sonarr/sonarr.netmode.yml | 4 +- compose/.apps/sonarr/sonarr.ports.yml | 4 +- compose/.apps/sonarr/sonarr.x86_64.yml | 4 +- compose/.apps/sonarr/sonarr.yml | 8 +- compose/.apps/speedtest/speedtest.aarch64.yml | 4 +- .../.apps/speedtest/speedtest.hostname.yml | 2 +- compose/.apps/speedtest/speedtest.labels.yml | 18 +-- compose/.apps/speedtest/speedtest.netmode.yml | 4 +- compose/.apps/speedtest/speedtest.ports.yml | 4 +- compose/.apps/speedtest/speedtest.x86_64.yml | 4 +- compose/.apps/speedtest/speedtest.yml | 12 +- compose/.apps/swag/swag.aarch64.yml | 4 +- compose/.apps/swag/swag.hostname.yml | 2 +- compose/.apps/swag/swag.labels.yml | 30 ++--- compose/.apps/swag/swag.netmode.yml | 4 +- compose/.apps/swag/swag.ports.yml | 6 +- compose/.apps/swag/swag.x86_64.yml | 4 +- compose/.apps/swag/swag.yml | 22 ++-- .../.apps/synclounge/synclounge.aarch64.yml | 4 +- .../.apps/synclounge/synclounge.hostname.yml | 2 +- .../.apps/synclounge/synclounge.labels.yml | 28 ++--- .../.apps/synclounge/synclounge.netmode.yml | 4 +- compose/.apps/synclounge/synclounge.ports.yml | 6 +- .../.apps/synclounge/synclounge.x86_64.yml | 4 +- compose/.apps/synclounge/synclounge.yml | 18 +-- compose/.apps/syncthing/syncthing.aarch64.yml | 4 +- .../.apps/syncthing/syncthing.hostname.yml | 2 +- compose/.apps/syncthing/syncthing.labels.yml | 20 +-- compose/.apps/syncthing/syncthing.netmode.yml | 4 +- compose/.apps/syncthing/syncthing.ports.yml | 8 +- compose/.apps/syncthing/syncthing.x86_64.yml | 4 +- compose/.apps/syncthing/syncthing.yml | 10 +- compose/.apps/tandoor/tandoor.aarch64.yml | 4 +- compose/.apps/tandoor/tandoor.hostname.yml | 2 +- compose/.apps/tandoor/tandoor.labels.yml | 24 ++-- compose/.apps/tandoor/tandoor.netmode.yml | 4 +- compose/.apps/tandoor/tandoor.ports.yml | 4 +- compose/.apps/tandoor/tandoor.x86_64.yml | 4 +- compose/.apps/tandoor/tandoor.yml | 22 ++-- compose/.apps/tautulli/tautulli.aarch64.yml | 4 +- compose/.apps/tautulli/tautulli.hostname.yml | 2 +- compose/.apps/tautulli/tautulli.labels.yml | 14 +-- compose/.apps/tautulli/tautulli.netmode.yml | 4 +- compose/.apps/tautulli/tautulli.ports.yml | 4 +- compose/.apps/tautulli/tautulli.x86_64.yml | 4 +- compose/.apps/tautulli/tautulli.yml | 8 +- compose/.apps/tdarr/tdarr.hostname.yml | 2 +- compose/.apps/tdarr/tdarr.labels.yml | 20 +-- compose/.apps/tdarr/tdarr.netmode.yml | 4 +- compose/.apps/tdarr/tdarr.ports.yml | 6 +- compose/.apps/tdarr/tdarr.x86_64.yml | 4 +- compose/.apps/tdarr/tdarr.yml | 16 +-- .../.apps/tdarrnode/tdarrnode.hostname.yml | 2 +- compose/.apps/tdarrnode/tdarrnode.labels.yml | 24 ++-- compose/.apps/tdarrnode/tdarrnode.netmode.yml | 4 +- compose/.apps/tdarrnode/tdarrnode.ports.yml | 4 +- compose/.apps/tdarrnode/tdarrnode.x86_64.yml | 4 +- compose/.apps/tdarrnode/tdarrnode.yml | 18 +-- compose/.apps/telegraf/telegraf.aarch64.yml | 4 +- compose/.apps/telegraf/telegraf.hostname.yml | 2 +- compose/.apps/telegraf/telegraf.labels.yml | 20 +-- compose/.apps/telegraf/telegraf.netmode.yml | 4 +- compose/.apps/telegraf/telegraf.ports.yml | 8 +- compose/.apps/telegraf/telegraf.x86_64.yml | 4 +- compose/.apps/telegraf/telegraf.yml | 10 +- compose/.apps/thelounge/thelounge.aarch64.yml | 4 +- .../.apps/thelounge/thelounge.hostname.yml | 2 +- compose/.apps/thelounge/thelounge.labels.yml | 14 +-- compose/.apps/thelounge/thelounge.netmode.yml | 4 +- compose/.apps/thelounge/thelounge.ports.yml | 4 +- compose/.apps/thelounge/thelounge.x86_64.yml | 4 +- compose/.apps/thelounge/thelounge.yml | 8 +- .../.apps/timemachine/timemachine.aarch64.yml | 4 +- .../timemachine/timemachine.hostname.yml | 2 +- .../.apps/timemachine/timemachine.labels.yml | 58 ++++----- .../.apps/timemachine/timemachine.netmode.yml | 4 +- .../.apps/timemachine/timemachine.ports.yml | 10 +- .../.apps/timemachine/timemachine.x86_64.yml | 4 +- compose/.apps/timemachine/timemachine.yml | 50 ++++---- compose/.apps/traefik/traefik.aarch64.yml | 4 +- compose/.apps/traefik/traefik.hostname.yml | 2 +- compose/.apps/traefik/traefik.labels.yml | 20 +-- compose/.apps/traefik/traefik.netmode.yml | 4 +- compose/.apps/traefik/traefik.ports.yml | 8 +- compose/.apps/traefik/traefik.x86_64.yml | 4 +- compose/.apps/traefik/traefik.yml | 10 +- compose/.apps/traktarr/traktarr.aarch64.yml | 4 +- compose/.apps/traktarr/traktarr.hostname.yml | 2 +- compose/.apps/traktarr/traktarr.labels.yml | 12 +- compose/.apps/traktarr/traktarr.netmode.yml | 4 +- compose/.apps/traktarr/traktarr.x86_64.yml | 4 +- compose/.apps/traktarr/traktarr.yml | 8 +- .../transmission/transmission.aarch64.yml | 4 +- .../transmission/transmission.hostname.yml | 2 +- .../transmission/transmission.labels.yml | 18 +-- .../transmission/transmission.netmode.yml | 4 +- .../.apps/transmission/transmission.ports.yml | 12 +- .../transmission/transmission.x86_64.yml | 4 +- compose/.apps/transmission/transmission.yml | 8 +- .../transmissionvpn.aarch64.yml | 4 +- .../transmissionvpn.hostname.yml | 2 +- .../transmissionvpn.labels.yml | 30 ++--- .../transmissionvpn.netmode.yml | 4 +- .../transmissionvpn/transmissionvpn.ports.yml | 4 +- .../transmissionvpn.x86_64.yml | 4 +- .../.apps/transmissionvpn/transmissionvpn.yml | 24 ++-- compose/.apps/tvheadend/tvheadend.aarch64.yml | 4 +- .../.apps/tvheadend/tvheadend.hostname.yml | 2 +- compose/.apps/tvheadend/tvheadend.labels.yml | 20 +-- compose/.apps/tvheadend/tvheadend.netmode.yml | 4 +- compose/.apps/tvheadend/tvheadend.ports.yml | 6 +- compose/.apps/tvheadend/tvheadend.x86_64.yml | 4 +- compose/.apps/tvheadend/tvheadend.yml | 12 +- compose/.apps/ubooquity/ubooquity.aarch64.yml | 4 +- .../.apps/ubooquity/ubooquity.hostname.yml | 2 +- compose/.apps/ubooquity/ubooquity.labels.yml | 20 +-- compose/.apps/ubooquity/ubooquity.netmode.yml | 4 +- compose/.apps/ubooquity/ubooquity.ports.yml | 6 +- compose/.apps/ubooquity/ubooquity.x86_64.yml | 4 +- compose/.apps/ubooquity/ubooquity.yml | 12 +- compose/.apps/unifi/unifi.aarch64.yml | 4 +- compose/.apps/unifi/unifi.hostname.yml | 2 +- compose/.apps/unifi/unifi.labels.yml | 2 +- compose/.apps/unifi/unifi.netmode.yml | 4 +- compose/.apps/unifi/unifi.ports.yml | 18 +-- compose/.apps/unifi/unifi.x86_64.yml | 4 +- compose/.apps/unifi/unifi.yml | 8 +- .../unificontroller.aarch64.yml | 4 +- .../unificontroller.hostname.yml | 2 +- .../unificontroller.labels.yml | 28 ++--- .../unificontroller.netmode.yml | 4 +- .../unificontroller/unificontroller.ports.yml | 18 +-- .../unificontroller.x86_64.yml | 4 +- .../.apps/unificontroller/unificontroller.yml | 8 +- compose/.apps/unmanic/unmanic.hostname.yml | 2 +- compose/.apps/unmanic/unmanic.labels.yml | 16 +-- compose/.apps/unmanic/unmanic.netmode.yml | 4 +- compose/.apps/unmanic/unmanic.ports.yml | 4 +- compose/.apps/unmanic/unmanic.x86_64.yml | 4 +- compose/.apps/unmanic/unmanic.yml | 10 +- compose/.apps/unpackerr/unpackerr.aarch64.yml | 4 +- .../.apps/unpackerr/unpackerr.hostname.yml | 2 +- compose/.apps/unpackerr/unpackerr.labels.yml | 34 +++--- compose/.apps/unpackerr/unpackerr.netmode.yml | 4 +- compose/.apps/unpackerr/unpackerr.x86_64.yml | 4 +- compose/.apps/unpackerr/unpackerr.yml | 30 ++--- .../.apps/uptimekuma/uptimekuma.aarch64.yml | 4 +- .../.apps/uptimekuma/uptimekuma.hostname.yml | 2 +- .../.apps/uptimekuma/uptimekuma.labels.yml | 14 +-- .../.apps/uptimekuma/uptimekuma.netmode.yml | 4 +- compose/.apps/uptimekuma/uptimekuma.ports.yml | 4 +- .../.apps/uptimekuma/uptimekuma.x86_64.yml | 4 +- compose/.apps/uptimekuma/uptimekuma.yml | 8 +- compose/.apps/varken/varken.aarch64.yml | 4 +- compose/.apps/varken/varken.hostname.yml | 2 +- compose/.apps/varken/varken.labels.yml | 12 +- compose/.apps/varken/varken.netmode.yml | 4 +- compose/.apps/varken/varken.x86_64.yml | 4 +- compose/.apps/varken/varken.yml | 8 +- compose/.apps/vsftpd/vsftpd.hostname.yml | 2 +- compose/.apps/vsftpd/vsftpd.labels.yml | 20 +-- compose/.apps/vsftpd/vsftpd.netmode.yml | 4 +- compose/.apps/vsftpd/vsftpd.ports.yml | 4 +- compose/.apps/vsftpd/vsftpd.x86_64.yml | 4 +- compose/.apps/vsftpd/vsftpd.yml | 12 +- .../.apps/watchtower/watchtower.aarch64.yml | 4 +- .../.apps/watchtower/watchtower.hostname.yml | 2 +- .../.apps/watchtower/watchtower.labels.yml | 36 +++--- .../.apps/watchtower/watchtower.netmode.yml | 4 +- .../.apps/watchtower/watchtower.x86_64.yml | 4 +- compose/.apps/watchtower/watchtower.yml | 30 ++--- compose/.apps/wireguard/wireguard.aarch64.yml | 4 +- .../.apps/wireguard/wireguard.hostname.yml | 2 +- compose/.apps/wireguard/wireguard.labels.yml | 24 ++-- compose/.apps/wireguard/wireguard.netmode.yml | 4 +- compose/.apps/wireguard/wireguard.ports.yml | 4 +- compose/.apps/wireguard/wireguard.x86_64.yml | 4 +- compose/.apps/wireguard/wireguard.yml | 20 +-- compose/.apps/xbackbone/xbackbone.aarch64.yml | 4 +- .../.apps/xbackbone/xbackbone.hostname.yml | 2 +- compose/.apps/xbackbone/xbackbone.labels.yml | 16 +-- compose/.apps/xbackbone/xbackbone.netmode.yml | 4 +- compose/.apps/xbackbone/xbackbone.ports.yml | 4 +- compose/.apps/xbackbone/xbackbone.x86_64.yml | 4 +- compose/.apps/xbackbone/xbackbone.yml | 10 +- compose/.apps/xteve/xteve.hostname.yml | 2 +- compose/.apps/xteve/xteve.labels.yml | 18 +-- compose/.apps/xteve/xteve.netmode.yml | 4 +- compose/.apps/xteve/xteve.ports.yml | 4 +- compose/.apps/xteve/xteve.x86_64.yml | 4 +- compose/.apps/xteve/xteve.yml | 14 +-- compose/.apps/yacht/yacht.aarch64.yml | 4 +- compose/.apps/yacht/yacht.hostname.yml | 2 +- compose/.apps/yacht/yacht.labels.yml | 22 ++-- compose/.apps/yacht/yacht.netmode.yml | 4 +- compose/.apps/yacht/yacht.ports.yml | 4 +- compose/.apps/yacht/yacht.x86_64.yml | 4 +- compose/.apps/yacht/yacht.yml | 16 +-- .../.apps/youtubedl/youtubedl.hostname.yml | 2 +- compose/.apps/youtubedl/youtubedl.labels.yml | 18 +-- compose/.apps/youtubedl/youtubedl.netmode.yml | 4 +- compose/.apps/youtubedl/youtubedl.ports.yml | 4 +- compose/.apps/youtubedl/youtubedl.x86_64.yml | 4 +- compose/.apps/youtubedl/youtubedl.yml | 12 +- compose/.apps/znc/znc.aarch64.yml | 4 +- compose/.apps/znc/znc.hostname.yml | 2 +- compose/.apps/znc/znc.labels.yml | 14 +-- compose/.apps/znc/znc.netmode.yml | 4 +- compose/.apps/znc/znc.ports.yml | 4 +- compose/.apps/znc/znc.x86_64.yml | 4 +- compose/.apps/znc/znc.yml | 8 +- docs/assets/icon.png | Bin 17189 -> 17188 bytes docs/assets/logo.png | Bin 38416 -> 38415 bytes 1151 files changed, 4500 insertions(+), 4500 deletions(-) diff --git a/compose/.apps/adguard/adguard.aarch64.yml b/compose/.apps/adguard/adguard.aarch64.yml index 7cea650822..5e44cec50b 100644 --- a/compose/.apps/adguard/adguard.aarch64.yml +++ b/compose/.apps/adguard/adguard.aarch64.yml @@ -1,3 +1,3 @@ services: - adguard: - image: adguard/adguardhome:${ADGUARD_TAG} + ${_appname_}: + image: adguard/adguardhome:${${_APPNAME_}_TAG} diff --git a/compose/.apps/adguard/adguard.hostname.yml b/compose/.apps/adguard/adguard.hostname.yml index c2695e35b4..4dc53c3782 100644 --- a/compose/.apps/adguard/adguard.hostname.yml +++ b/compose/.apps/adguard/adguard.hostname.yml @@ -1,3 +1,3 @@ services: - adguard: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/adguard/adguard.labels.yml b/compose/.apps/adguard/adguard.labels.yml index 87a234aa73..64c3c2ac15 100644 --- a/compose/.apps/adguard/adguard.labels.yml +++ b/compose/.apps/adguard/adguard.labels.yml @@ -1,19 +1,19 @@ services: - adguard: + ${_appname_}: labels: 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: "" - com.dockstarter.appvars.adguard_port_3000: "3000" - com.dockstarter.appvars.adguard_port_443: "446" - com.dockstarter.appvars.adguard_port_53: "53" - com.dockstarter.appvars.adguard_port_67: "67" - com.dockstarter.appvars.adguard_port_68: "68" - com.dockstarter.appvars.adguard_port_80: "8008" - com.dockstarter.appvars.adguard_port_853: "853" - com.dockstarter.appvars.adguard_restart: "unless-stopped" - com.dockstarter.appvars.adguard_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_serverip: "0.0.0.0" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_3000: "3000" + com.dockstarter.appvars.${_appname_}_port_443: "446" + com.dockstarter.appvars.${_appname_}_port_53: "53" + com.dockstarter.appvars.${_appname_}_port_67: "67" + com.dockstarter.appvars.${_appname_}_port_68: "68" + com.dockstarter.appvars.${_appname_}_port_80: "8008" + com.dockstarter.appvars.${_appname_}_port_853: "853" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/adguard/adguard.netmode.yml b/compose/.apps/adguard/adguard.netmode.yml index 6f379ad168..f36884ffb9 100644 --- a/compose/.apps/adguard/adguard.netmode.yml +++ b/compose/.apps/adguard/adguard.netmode.yml @@ -1,3 +1,3 @@ services: - adguard: - network_mode: ${ADGUARD_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/adguard/adguard.ports.yml b/compose/.apps/adguard/adguard.ports.yml index 966aff6e38..6dfff48e8b 100644 --- a/compose/.apps/adguard/adguard.ports.yml +++ b/compose/.apps/adguard/adguard.ports.yml @@ -1,12 +1,12 @@ services: - adguard: + ${_appname_}: ports: - - ${ADGUARD_PORT_3000}:3000 - - ${ADGUARD_PORT_443}:443 - - ${ADGUARD_PORT_80}:80 - - ${ADGUARD_PORT_853}:853 - - ${ADGUARD_ENVIRONMENT_SERVERIP}:${ADGUARD_PORT_53}:53 - - ${ADGUARD_ENVIRONMENT_SERVERIP}:${ADGUARD_PORT_53}:53/udp - - ${ADGUARD_ENVIRONMENT_SERVERIP}:${ADGUARD_PORT_67}:67/udp - - ${ADGUARD_ENVIRONMENT_SERVERIP}:${ADGUARD_PORT_68}:68 - - ${ADGUARD_ENVIRONMENT_SERVERIP}:${ADGUARD_PORT_68}:68/udp + - ${${_APPNAME_}_PORT_3000}:3000 + - ${${_APPNAME_}_PORT_443}:443 + - ${${_APPNAME_}_PORT_80}:80 + - ${${_APPNAME_}_PORT_853}:853 + - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${${_APPNAME_}_PORT_53}:53 + - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${${_APPNAME_}_PORT_53}:53/udp + - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${${_APPNAME_}_67}:67/udp + - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${${_APPNAME_}_PORT_68}:68 + - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${${_APPNAME_}_PORT_68}:68/udp diff --git a/compose/.apps/adguard/adguard.x86_64.yml b/compose/.apps/adguard/adguard.x86_64.yml index 7cea650822..5e44cec50b 100644 --- a/compose/.apps/adguard/adguard.x86_64.yml +++ b/compose/.apps/adguard/adguard.x86_64.yml @@ -1,3 +1,3 @@ services: - adguard: - image: adguard/adguardhome:${ADGUARD_TAG} + ${_appname_}: + image: adguard/adguardhome:${${_APPNAME_}_TAG} diff --git a/compose/.apps/adguard/adguard.yml b/compose/.apps/adguard/adguard.yml index c14f81e648..617ff19ec3 100644 --- a/compose/.apps/adguard/adguard.yml +++ b/compose/.apps/adguard/adguard.yml @@ -1,11 +1,11 @@ services: - adguard: - container_name: ${ADGUARD_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${ADGUARD_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/adguard/work:/opt/adguardhome/work - - ${DOCKER_VOLUME_CONFIG}/adguard/conf:/opt/adguardhome/conf + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/work:/opt/adguardhome/work + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/conf:/opt/adguardhome/conf - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/adminer/adminer.aarch64.yml b/compose/.apps/adminer/adminer.aarch64.yml index c4cccccfef..32f8f58efd 100644 --- a/compose/.apps/adminer/adminer.aarch64.yml +++ b/compose/.apps/adminer/adminer.aarch64.yml @@ -1,3 +1,3 @@ services: - adminer: - image: adminer:${ADMINER_TAG} + ${_appname_}: + image: adminer:${${_APPNAME_}_TAG} diff --git a/compose/.apps/adminer/adminer.hostname.yml b/compose/.apps/adminer/adminer.hostname.yml index b46c5f0cfd..4dc53c3782 100644 --- a/compose/.apps/adminer/adminer.hostname.yml +++ b/compose/.apps/adminer/adminer.hostname.yml @@ -1,3 +1,3 @@ services: - adminer: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/adminer/adminer.labels.yml b/compose/.apps/adminer/adminer.labels.yml index f76e3b634e..57678bd6b0 100644 --- a/compose/.apps/adminer/adminer.labels.yml +++ b/compose/.apps/adminer/adminer.labels.yml @@ -1,14 +1,14 @@ services: - adminer: + ${_appname_}: labels: 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: "" - com.dockstarter.appvars.adminer_network_mode: "" - com.dockstarter.appvars.adminer_port_8080: "8080" - com.dockstarter.appvars.adminer_restart: "unless-stopped" - com.dockstarter.appvars.adminer_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_design: "" + com.dockstarter.appvars.${_appname_}_environment_plugins: "" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8080: "8080" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/adminer/adminer.netmode.yml b/compose/.apps/adminer/adminer.netmode.yml index b48a6bca02..f36884ffb9 100644 --- a/compose/.apps/adminer/adminer.netmode.yml +++ b/compose/.apps/adminer/adminer.netmode.yml @@ -1,3 +1,3 @@ services: - adminer: - network_mode: ${ADMINER_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/adminer/adminer.ports.yml b/compose/.apps/adminer/adminer.ports.yml index ea3882dd8b..7d1c7e4455 100644 --- a/compose/.apps/adminer/adminer.ports.yml +++ b/compose/.apps/adminer/adminer.ports.yml @@ -1,4 +1,4 @@ services: - adminer: + ${_appname_}: ports: - - ${ADMINER_PORT_8080}:8080 + - ${${_APPNAME_}_PORT_8080}:8080 diff --git a/compose/.apps/adminer/adminer.x86_64.yml b/compose/.apps/adminer/adminer.x86_64.yml index c4cccccfef..32f8f58efd 100644 --- a/compose/.apps/adminer/adminer.x86_64.yml +++ b/compose/.apps/adminer/adminer.x86_64.yml @@ -1,3 +1,3 @@ services: - adminer: - image: adminer:${ADMINER_TAG} + ${_appname_}: + image: adminer:${${_APPNAME_}_TAG} diff --git a/compose/.apps/adminer/adminer.yml b/compose/.apps/adminer/adminer.yml index aa66b7dfc9..3d2a8a7424 100644 --- a/compose/.apps/adminer/adminer.yml +++ b/compose/.apps/adminer/adminer.yml @@ -1,12 +1,12 @@ services: - adminer: - container_name: ${ADMINER_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - ADMINER_DESIGN=${ADMINER_ENVIRONMENT_DESIGN} - - ADMINER_PLUGINS=${ADMINER_ENVIRONMENT_PLUGINS} + - ADMINER_DESIGN=${${_APPNAME_}_ENVIRONMENT_DESIGN} + - ADMINER_PLUGINS=${${_APPNAME_}_ENVIRONMENT_PLUGINS} - TZ=${TZ} - restart: ${ADMINER_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/adminer:/sessions + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/sessions - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/airdcpp/airdcpp.hostname.yml b/compose/.apps/airdcpp/airdcpp.hostname.yml index 579df19359..4dc53c3782 100644 --- a/compose/.apps/airdcpp/airdcpp.hostname.yml +++ b/compose/.apps/airdcpp/airdcpp.hostname.yml @@ -1,3 +1,3 @@ services: - airdcpp: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/airdcpp/airdcpp.labels.yml b/compose/.apps/airdcpp/airdcpp.labels.yml index 44ccb2b2b8..32e264c96e 100644 --- a/compose/.apps/airdcpp/airdcpp.labels.yml +++ b/compose/.apps/airdcpp/airdcpp.labels.yml @@ -1,16 +1,16 @@ services: - airdcpp: + ${_appname_}: labels: 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" - com.dockstarter.appvars.airdcpp_port_21249: "21249" - com.dockstarter.appvars.airdcpp_port_5600: "5600" - com.dockstarter.appvars.airdcpp_port_5601: "5601" - com.dockstarter.appvars.airdcpp_restart: "unless-stopped" - com.dockstarter.appvars.airdcpp_tag: "latest" - com.dockstarter.appvars.airdcpp_volume_sharedir: "/mnt/airdcpp" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_21248: "21248" + com.dockstarter.appvars.${_appname_}_port_21249: "21249" + com.dockstarter.appvars.${_appname_}_port_5600: "5600" + com.dockstarter.appvars.${_appname_}_port_5601: "5601" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_sharedir: "/mnt/airdcpp" diff --git a/compose/.apps/airdcpp/airdcpp.netmode.yml b/compose/.apps/airdcpp/airdcpp.netmode.yml index 04dfaf1c21..f36884ffb9 100644 --- a/compose/.apps/airdcpp/airdcpp.netmode.yml +++ b/compose/.apps/airdcpp/airdcpp.netmode.yml @@ -1,3 +1,3 @@ services: - airdcpp: - network_mode: ${AIRDCPP_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/airdcpp/airdcpp.ports.yml b/compose/.apps/airdcpp/airdcpp.ports.yml index b9dbc66b66..6df163efde 100644 --- a/compose/.apps/airdcpp/airdcpp.ports.yml +++ b/compose/.apps/airdcpp/airdcpp.ports.yml @@ -1,8 +1,8 @@ services: - airdcpp: + ${_appname_}: ports: - - ${AIRDCPP_PORT_21248}:21248 - - ${AIRDCPP_PORT_21248}:21248/udp - - ${AIRDCPP_PORT_21249}:21249 - - ${AIRDCPP_PORT_5600}:5600 - - ${AIRDCPP_PORT_5601}:5601 + - ${${_APPNAME_}_PORT_21248}:21248 + - ${${_APPNAME_}_PORT_21248}:21248/udp + - ${${_APPNAME_}_PORT_21249}:21249 + - ${${_APPNAME_}_PORT_5600}:5600 + - ${${_APPNAME_}_PORT_5601}:5601 diff --git a/compose/.apps/airdcpp/airdcpp.x86_64.yml b/compose/.apps/airdcpp/airdcpp.x86_64.yml index cbfd4e804e..dd27528e60 100644 --- a/compose/.apps/airdcpp/airdcpp.x86_64.yml +++ b/compose/.apps/airdcpp/airdcpp.x86_64.yml @@ -1,3 +1,3 @@ services: - airdcpp: - image: gangefors/airdcpp-webclient:${AIRDCPP_TAG} + ${_appname_}: + image: gangefors/airdcpp-webclient:${${_APPNAME_}_TAG} diff --git a/compose/.apps/airdcpp/airdcpp.yml b/compose/.apps/airdcpp/airdcpp.yml index 83b5c16537..271ca65830 100644 --- a/compose/.apps/airdcpp/airdcpp.yml +++ b/compose/.apps/airdcpp/airdcpp.yml @@ -1,18 +1,18 @@ services: - airdcpp: - container_name: ${AIRDCPP_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - HTTP_PORT=${AIRDCPP_PORT_5600} - - HTTPS_PORT=${AIRDCPP_PORT_5601} + - HTTP_PORT=${${_APPNAME_}_PORT_5600} + - HTTPS_PORT=${${_APPNAME_}_PORT_5601} - PGID=${PGID} - PUID=${PUID} - - TCP_PORT=${AIRDCPP_PORT_21248} - - TLS_PORT=${AIRDCPP_PORT_21249} + - TCP_PORT=${${_APPNAME_}_PORT_21248} + - TLS_PORT=${${_APPNAME_}_PORT_21249} - TZ=${TZ} - - UDP_PORT=${AIRDCPP_PORT_21248} - restart: ${AIRDCPP_RESTART} + - UDP_PORT=${${_APPNAME_}_PORT_21248} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${AIRDCPP_VOLUME_SHAREDIR}:/Share - - ${DOCKER_VOLUME_CONFIG}/airdcpp:/.airdcpp + - ${${_APPNAME_}_VOLUME_SHAREDIR}:/Share + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/.airdcpp - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/airsonic/airsonic.aarch64.yml b/compose/.apps/airsonic/airsonic.aarch64.yml index 15775c85c2..375a796b32 100644 --- a/compose/.apps/airsonic/airsonic.aarch64.yml +++ b/compose/.apps/airsonic/airsonic.aarch64.yml @@ -1,3 +1,3 @@ services: - airsonic: - image: lscr.io/linuxserver/airsonic:${AIRSONIC_TAG} + ${_appname_}: + image: lscr.io/linuxserver/airsonic:${${_APPNAME_}_TAG} diff --git a/compose/.apps/airsonic/airsonic.hostname.yml b/compose/.apps/airsonic/airsonic.hostname.yml index e9dd4c8557..4dc53c3782 100644 --- a/compose/.apps/airsonic/airsonic.hostname.yml +++ b/compose/.apps/airsonic/airsonic.hostname.yml @@ -1,3 +1,3 @@ services: - airsonic: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/airsonic/airsonic.labels.yml b/compose/.apps/airsonic/airsonic.labels.yml index 7e702756f5..2bdf65933f 100644 --- a/compose/.apps/airsonic/airsonic.labels.yml +++ b/compose/.apps/airsonic/airsonic.labels.yml @@ -1,14 +1,14 @@ services: - airsonic: + ${_appname_}: labels: 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: "" - com.dockstarter.appvars.airsonic_network_mode: "" - com.dockstarter.appvars.airsonic_port_4040: "4040" - com.dockstarter.appvars.airsonic_restart: "unless-stopped" - com.dockstarter.appvars.airsonic_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_context_path: "/airsonic" + com.dockstarter.appvars.${_appname_}_environment_java_opts: "" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_4040: "4040" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/airsonic/airsonic.netmode.yml b/compose/.apps/airsonic/airsonic.netmode.yml index 6a5a5fbfc6..f36884ffb9 100644 --- a/compose/.apps/airsonic/airsonic.netmode.yml +++ b/compose/.apps/airsonic/airsonic.netmode.yml @@ -1,3 +1,3 @@ services: - airsonic: - network_mode: ${AIRSONIC_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/airsonic/airsonic.ports.yml b/compose/.apps/airsonic/airsonic.ports.yml index 8220fd88a0..b4d795b88b 100644 --- a/compose/.apps/airsonic/airsonic.ports.yml +++ b/compose/.apps/airsonic/airsonic.ports.yml @@ -1,4 +1,4 @@ services: - airsonic: + ${_appname_}: ports: - - ${AIRSONIC_PORT_4040}:4040 + - ${${_APPNAME_}_PORT_4040}:4040 diff --git a/compose/.apps/airsonic/airsonic.x86_64.yml b/compose/.apps/airsonic/airsonic.x86_64.yml index 15775c85c2..375a796b32 100644 --- a/compose/.apps/airsonic/airsonic.x86_64.yml +++ b/compose/.apps/airsonic/airsonic.x86_64.yml @@ -1,3 +1,3 @@ services: - airsonic: - image: lscr.io/linuxserver/airsonic:${AIRSONIC_TAG} + ${_appname_}: + image: lscr.io/linuxserver/airsonic:${${_APPNAME_}_TAG} diff --git a/compose/.apps/airsonic/airsonic.yml b/compose/.apps/airsonic/airsonic.yml index d3b306029d..6fb6179c80 100644 --- a/compose/.apps/airsonic/airsonic.yml +++ b/compose/.apps/airsonic/airsonic.yml @@ -1,14 +1,14 @@ services: - airsonic: - container_name: ${AIRSONIC_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - CONTEXT_PATH=${AIRSONIC_ENVIRONMENT_CONTEXT_PATH} - - JAVA_OPTS=${AIRSONIC_ENVIRONMENT_JAVA_OPTS} + - CONTEXT_PATH=${${_APPNAME_}_ENVIRONMENT_CONTEXT_PATH} + - JAVA_OPTS=${${_APPNAME_}_ENVIRONMENT_JAVA_OPTS} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${AIRSONIC_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/airsonic:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/airsonicadvanced/airsonicadvanced.aarch64.yml b/compose/.apps/airsonicadvanced/airsonicadvanced.aarch64.yml index b560959514..ba2566d2f2 100644 --- a/compose/.apps/airsonicadvanced/airsonicadvanced.aarch64.yml +++ b/compose/.apps/airsonicadvanced/airsonicadvanced.aarch64.yml @@ -1,3 +1,3 @@ services: - airsonicadvanced: - image: lscr.io/linuxserver/airsonic-advanced:${AIRSONICADVANCED_TAG} + ${_appname_}: + image: lscr.io/linuxserver/airsonic-advanced:${${_APPNAME_}_TAG} diff --git a/compose/.apps/airsonicadvanced/airsonicadvanced.hostname.yml b/compose/.apps/airsonicadvanced/airsonicadvanced.hostname.yml index 64728f759e..4dc53c3782 100644 --- a/compose/.apps/airsonicadvanced/airsonicadvanced.hostname.yml +++ b/compose/.apps/airsonicadvanced/airsonicadvanced.hostname.yml @@ -1,3 +1,3 @@ services: - airsonicadvanced: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/airsonicadvanced/airsonicadvanced.labels.yml b/compose/.apps/airsonicadvanced/airsonicadvanced.labels.yml index 302362a2d7..53af287b01 100644 --- a/compose/.apps/airsonicadvanced/airsonicadvanced.labels.yml +++ b/compose/.apps/airsonicadvanced/airsonicadvanced.labels.yml @@ -1,14 +1,14 @@ services: - airsonicadvanced: + ${_appname_}: labels: 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: "" - com.dockstarter.appvars.airsonicadvanced_network_mode: "" - com.dockstarter.appvars.airsonicadvanced_port_4040: "4040" - com.dockstarter.appvars.airsonicadvanced_restart: "unless-stopped" - com.dockstarter.appvars.airsonicadvanced_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_context_path: "/airsonic" + com.dockstarter.appvars.${_appname_}_environment_java_opts: "" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_4040: "4040" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/airsonicadvanced/airsonicadvanced.netmode.yml b/compose/.apps/airsonicadvanced/airsonicadvanced.netmode.yml index c5a98e891c..f36884ffb9 100644 --- a/compose/.apps/airsonicadvanced/airsonicadvanced.netmode.yml +++ b/compose/.apps/airsonicadvanced/airsonicadvanced.netmode.yml @@ -1,3 +1,3 @@ services: - airsonicadvanced: - network_mode: ${AIRSONICADVANCED_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/airsonicadvanced/airsonicadvanced.ports.yml b/compose/.apps/airsonicadvanced/airsonicadvanced.ports.yml index bf8eaff3e4..b4d795b88b 100644 --- a/compose/.apps/airsonicadvanced/airsonicadvanced.ports.yml +++ b/compose/.apps/airsonicadvanced/airsonicadvanced.ports.yml @@ -1,4 +1,4 @@ services: - airsonicadvanced: + ${_appname_}: ports: - - ${AIRSONICADVANCED_PORT_4040}:4040 + - ${${_APPNAME_}_PORT_4040}:4040 diff --git a/compose/.apps/airsonicadvanced/airsonicadvanced.x86_64.yml b/compose/.apps/airsonicadvanced/airsonicadvanced.x86_64.yml index b560959514..ba2566d2f2 100644 --- a/compose/.apps/airsonicadvanced/airsonicadvanced.x86_64.yml +++ b/compose/.apps/airsonicadvanced/airsonicadvanced.x86_64.yml @@ -1,3 +1,3 @@ services: - airsonicadvanced: - image: lscr.io/linuxserver/airsonic-advanced:${AIRSONICADVANCED_TAG} + ${_appname_}: + image: lscr.io/linuxserver/airsonic-advanced:${${_APPNAME_}_TAG} diff --git a/compose/.apps/airsonicadvanced/airsonicadvanced.yml b/compose/.apps/airsonicadvanced/airsonicadvanced.yml index 57e4e1788f..6fb6179c80 100644 --- a/compose/.apps/airsonicadvanced/airsonicadvanced.yml +++ b/compose/.apps/airsonicadvanced/airsonicadvanced.yml @@ -1,14 +1,14 @@ services: - airsonicadvanced: - container_name: ${AIRSONICADVANCED_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - CONTEXT_PATH=${AIRSONICADVANCED_ENVIRONMENT_CONTEXT_PATH} - - JAVA_OPTS=${AIRSONICADVANCED_ENVIRONMENT_JAVA_OPTS} + - CONTEXT_PATH=${${_APPNAME_}_ENVIRONMENT_CONTEXT_PATH} + - JAVA_OPTS=${${_APPNAME_}_ENVIRONMENT_JAVA_OPTS} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${AIRSONICADVANCED_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/airsonicadvanced:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/amd/amd.aarch64.yml b/compose/.apps/amd/amd.aarch64.yml index 31e71b9b4a..a01cbfb4df 100644 --- a/compose/.apps/amd/amd.aarch64.yml +++ b/compose/.apps/amd/amd.aarch64.yml @@ -1,3 +1,3 @@ services: - amd: - image: halianelf/amd:${AMD_TAG} + ${_appname_}: + image: halianelf/amd:${${_APPNAME_}_TAG} diff --git a/compose/.apps/amd/amd.hostname.yml b/compose/.apps/amd/amd.hostname.yml index f19bc2410a..4dc53c3782 100644 --- a/compose/.apps/amd/amd.hostname.yml +++ b/compose/.apps/amd/amd.hostname.yml @@ -1,3 +1,3 @@ services: - amd: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/amd/amd.labels.yml b/compose/.apps/amd/amd.labels.yml index eb5ef4b547..b5c23199e0 100644 --- a/compose/.apps/amd/amd.labels.yml +++ b/compose/.apps/amd/amd.labels.yml @@ -1,30 +1,30 @@ services: - amd: + ${_appname_}: labels: 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" - com.dockstarter.appvars.amd_environment_bitrate: "320" - com.dockstarter.appvars.amd_environment_concurrency: "1" - com.dockstarter.appvars.amd_environment_download_mode: "wanted" - com.dockstarter.appvars.amd_environment_downloads: "/storage/downloads" - com.dockstarter.appvars.amd_environment_file_permissions: "666" - com.dockstarter.appvars.amd_environment_folder_permissions: "766" - com.dockstarter.appvars.amd_environment_format: "FLAC" - com.dockstarter.appvars.amd_environment_lidarr_api_key: "" - com.dockstarter.appvars.amd_environment_lidarr_url: "http://lidarr:8686" - com.dockstarter.appvars.amd_environment_list: "both" - com.dockstarter.appvars.amd_environment_match_distance: "10" - com.dockstarter.appvars.amd_environment_mbrainzmirror: "https://musicbrainz.org" - com.dockstarter.appvars.amd_environment_mbratelimit: "1" - com.dockstarter.appvars.amd_environment_replay_again: "true" - com.dockstarter.appvars.amd_environment_required_quality: "false" - com.dockstarter.appvars.amd_environment_script_interval: "1h" - com.dockstarter.appvars.amd_environment_search_type: "both" - com.dockstarter.appvars.amd_network_mode: "" - com.dockstarter.appvars.amd_restart: "unless-stopped" - com.dockstarter.appvars.amd_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_arl_token: "" + com.dockstarter.appvars.${_appname_}_environment_autostart: "true" + com.dockstarter.appvars.${_appname_}_environment_bitrate: "320" + com.dockstarter.appvars.${_appname_}_environment_concurrency: "1" + com.dockstarter.appvars.${_appname_}_environment_download_mode: "wanted" + com.dockstarter.appvars.${_appname_}_environment_downloads: "/storage/downloads" + com.dockstarter.appvars.${_appname_}_environment_file_permissions: "666" + com.dockstarter.appvars.${_appname_}_environment_folder_permissions: "766" + com.dockstarter.appvars.${_appname_}_environment_format: "FLAC" + com.dockstarter.appvars.${_appname_}_environment_lidarr_api_key: "" + com.dockstarter.appvars.${_appname_}_environment_lidarr_url: "http://lidarr:8686" + com.dockstarter.appvars.${_appname_}_environment_list: "both" + com.dockstarter.appvars.${_appname_}_environment_match_distance: "10" + com.dockstarter.appvars.${_appname_}_environment_mbrainzmirror: "https://musicbrainz.org" + com.dockstarter.appvars.${_appname_}_environment_mbratelimit: "1" + com.dockstarter.appvars.${_appname_}_environment_replay_again: "true" + com.dockstarter.appvars.${_appname_}_environment_required_quality: "false" + com.dockstarter.appvars.${_appname_}_environment_script_interval: "1h" + com.dockstarter.appvars.${_appname_}_environment_search_type: "both" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/amd/amd.netmode.yml b/compose/.apps/amd/amd.netmode.yml index 329942650e..f36884ffb9 100644 --- a/compose/.apps/amd/amd.netmode.yml +++ b/compose/.apps/amd/amd.netmode.yml @@ -1,3 +1,3 @@ services: - amd: - network_mode: ${AMD_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/amd/amd.x86_64.yml b/compose/.apps/amd/amd.x86_64.yml index 31e71b9b4a..a01cbfb4df 100644 --- a/compose/.apps/amd/amd.x86_64.yml +++ b/compose/.apps/amd/amd.x86_64.yml @@ -1,3 +1,3 @@ services: - amd: - image: halianelf/amd:${AMD_TAG} + ${_appname_}: + image: halianelf/amd:${${_APPNAME_}_TAG} diff --git a/compose/.apps/amd/amd.yml b/compose/.apps/amd/amd.yml index 0b26efd465..151b07f0a3 100644 --- a/compose/.apps/amd/amd.yml +++ b/compose/.apps/amd/amd.yml @@ -1,31 +1,31 @@ services: - amd: - container_name: ${AMD_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - ARL_TOKEN=${AMD_ENVIRONMENT_ARL_TOKEN} - - AUTOSTART=${AMD_ENVIRONMENT_AUTOSTART} - - BITRATE=${AMD_ENVIRONMENT_BITRATE} - - CONCURRENCY=${AMD_ENVIRONMENT_CONCURRENCY} - - DOWNLOADMODE=${AMD_ENVIRONMENT_DOWNLOAD_MODE} - - DOWNLOADS=${AMD_ENVIRONMENT_DOWNLOADS} - - FILEPERMISSIONS=${AMD_ENVIRONMENT_FILE_PERMISSIONS} - - FOLDERPERMISSIONS=${AMD_ENVIRONMENT_FOLDER_PERMISSIONS} - - FORMAT=${AMD_ENVIRONMENT_FORMAT} - - LIDARRAPIKEY=${AMD_ENVIRONMENT_LIDARR_API_KEY} - - LIDARRURL=${AMD_ENVIRONMENT_LIDARR_URL} - - LIST=${AMD_ENVIRONMENT_LIST} - - MATCHDISTANCE=${AMD_ENVIRONMENT_MATCH_DISTANCE} - - MBRAINZMIRROR=${AMD_ENVIRONMENT_MBRAINZMIRROR} - - MBRATELIMIT=${AMD_ENVIRONMENT_MBRATELIMIT} + - ARL_TOKEN=${${_APPNAME_}_ENVIRONMENT_ARL_TOKEN} + - AUTOSTART=${${_APPNAME_}_ENVIRONMENT_AUTOSTART} + - BITRATE=${${_APPNAME_}_ENVIRONMENT_BITRATE} + - CONCURRENCY=${${_APPNAME_}_ENVIRONMENT_CONCURRENCY} + - DOWNLOADMODE=${${_APPNAME_}_ENVIRONMENT_DOWNLOAD_MODE} + - DOWNLOADS=${${_APPNAME_}_ENVIRONMENT_DOWNLOADS} + - FILEPERMISSIONS=${${_APPNAME_}_ENVIRONMENT_FILE_PERMISSIONS} + - FOLDERPERMISSIONS=${${_APPNAME_}_ENVIRONMENT_FOLDER_PERMISSIONS} + - FORMAT=${${_APPNAME_}_ENVIRONMENT_FORMAT} + - LIDARRAPIKEY=${${_APPNAME_}_ENVIRONMENT_LIDARR_API_KEY} + - LIDARRURL=${${_APPNAME_}_ENVIRONMENT_LIDARR_URL} + - LIST=${${_APPNAME_}_ENVIRONMENT_LIST} + - MATCHDISTANCE=${${_APPNAME_}_ENVIRONMENT_MATCH_DISTANCE} + - MBRAINZMIRROR=${${_APPNAME_}_ENVIRONMENT_MBRAINZMIRROR} + - MBRATELIMIT=${${_APPNAME_}_ENVIRONMENT_MBRATELIMIT} - PGID=${PGID} - PUID=${PUID} - - REPLAYGAIN=${AMD_ENVIRONMENT_REPLAY_AGAIN} - - REQUIREQUALITY=${AMD_ENVIRONMENT_REQUIRED_QUALITY} - - SCRIPTINTERVAL=${AMD_ENVIRONMENT_SCRIPT_INTERVAL} - - SEARCHTYPE=${AMD_ENVIRONMENT_SEARCH_TYPE} + - REPLAYGAIN=${${_APPNAME_}_ENVIRONMENT_REPLAY_AGAIN} + - REQUIREQUALITY=${${_APPNAME_}_ENVIRONMENT_REQUIRED_QUALITY} + - SCRIPTINTERVAL=${${_APPNAME_}_ENVIRONMENT_SCRIPT_INTERVAL} + - SEARCHTYPE=${${_APPNAME_}_ENVIRONMENT_SEARCH_TYPE} - TZ=${TZ} - restart: ${AMD_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/amd:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/apcupsd/apcupsd.hostname.yml b/compose/.apps/apcupsd/apcupsd.hostname.yml index 1b204a9190..4dc53c3782 100644 --- a/compose/.apps/apcupsd/apcupsd.hostname.yml +++ b/compose/.apps/apcupsd/apcupsd.hostname.yml @@ -1,3 +1,3 @@ services: - apcupsd: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/apcupsd/apcupsd.labels.yml b/compose/.apps/apcupsd/apcupsd.labels.yml index 0df6c4d73f..33324076f7 100644 --- a/compose/.apps/apcupsd/apcupsd.labels.yml +++ b/compose/.apps/apcupsd/apcupsd.labels.yml @@ -1,19 +1,19 @@ services: - apcupsd: + ${_appname_}: labels: 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: "" - com.dockstarter.appvars.apcupsd_environment_infuxdb_database: "apcupsd" - com.dockstarter.appvars.apcupsd_environment_infuxdb_host: "influxdb" - com.dockstarter.appvars.apcupsd_environment_infuxdb_password: "" - com.dockstarter.appvars.apcupsd_environment_infuxdb_port: "8086" - com.dockstarter.appvars.apcupsd_environment_infuxdb_user: "" - com.dockstarter.appvars.apcupsd_environment_interval: "10" - com.dockstarter.appvars.apcupsd_network_mode: "" - com.dockstarter.appvars.apcupsd_restart: "unless-stopped" - com.dockstarter.appvars.apcupsd_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_debug: "false" + com.dockstarter.appvars.${_appname_}_environment_host: "" + com.dockstarter.appvars.${_appname_}_environment_infuxdb_database: "apcupsd" + com.dockstarter.appvars.${_appname_}_environment_infuxdb_host: "influxdb" + com.dockstarter.appvars.${_appname_}_environment_infuxdb_password: "" + com.dockstarter.appvars.${_appname_}_environment_infuxdb_port: "8086" + com.dockstarter.appvars.${_appname_}_environment_infuxdb_user: "" + com.dockstarter.appvars.${_appname_}_environment_interval: "10" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/apcupsd/apcupsd.netmode.yml b/compose/.apps/apcupsd/apcupsd.netmode.yml index d3abb1b5d6..f36884ffb9 100644 --- a/compose/.apps/apcupsd/apcupsd.netmode.yml +++ b/compose/.apps/apcupsd/apcupsd.netmode.yml @@ -1,3 +1,3 @@ services: - apcupsd: - network_mode: ${APCUPSD_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/apcupsd/apcupsd.x86_64.yml b/compose/.apps/apcupsd/apcupsd.x86_64.yml index fb53d0d079..717359fe15 100644 --- a/compose/.apps/apcupsd/apcupsd.x86_64.yml +++ b/compose/.apps/apcupsd/apcupsd.x86_64.yml @@ -1,3 +1,3 @@ services: - apcupsd: - image: atribe/apcupsd-influxdb-exporter:${APCUPSD_TAG} + ${_appname_}: + image: atribe/apcupsd-influxdb-exporter:${${_APPNAME_}_TAG} diff --git a/compose/.apps/apcupsd/apcupsd.yml b/compose/.apps/apcupsd/apcupsd.yml index 7935bad825..7ecb16c8eb 100644 --- a/compose/.apps/apcupsd/apcupsd.yml +++ b/compose/.apps/apcupsd/apcupsd.yml @@ -1,20 +1,20 @@ services: - apcupsd: - container_name: ${APCUPSD_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - APCUPSD_HOST=${APCUPSD_ENVIRONMENT_HOST} - - INFLUXDB_HOST=${APCUPSD_ENVIRONMENT_INFLUXDB_HOST} - - INFLUXDB_DATABASE=${APCUPSD_ENVIRONMENT_INFLUXDB_DATABASE} - - INFLUXDB_PASSWORD=${APCUPSD_ENVIRONMENT_INFLUXDB_PASSWORD} - - INFLUXDB_PORT=${APCUPSD_ENVIRONMENT_INFLUXDB_PORT} - - INFLUXDB_USER=${APCUPSD_ENVIRONMENT_INFLUXDB_USER} - - INTERVAL=${APCUPSD_ENVIRONMENT_INTERVAL} + - APCUPSD_HOST=${${_APPNAME_}_ENVIRONMENT_HOST} + - INFLUXDB_HOST=${${_APPNAME_}_ENVIRONMENT_INFLUXDB_HOST} + - INFLUXDB_DATABASE=${${_APPNAME_}_ENVIRONMENT_INFLUXDB_DATABASE} + - INFLUXDB_PASSWORD=${${_APPNAME_}_ENVIRONMENT_INFLUXDB_PASSWORD} + - INFLUXDB_PORT=${${_APPNAME_}_ENVIRONMENT_INFLUXDB_PORT} + - INFLUXDB_USER=${${_APPNAME_}_ENVIRONMENT_INFLUXDB_USER} + - INTERVAL=${${_APPNAME_}_ENVIRONMENT_INTERVAL} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - VERBOSE=${APCUPSD_ENVIRONMENT_DEBUG} - restart: ${APCUPSD_RESTART} + - VERBOSE=${${_APPNAME_}_ENVIRONMENT_DEBUG} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/apcupsd:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/apprise/apprise.aarch64.yml b/compose/.apps/apprise/apprise.aarch64.yml index 11b37d0433..a87ecbd8ca 100644 --- a/compose/.apps/apprise/apprise.aarch64.yml +++ b/compose/.apps/apprise/apprise.aarch64.yml @@ -1,3 +1,3 @@ services: - apprise: - image: lscr.io/linuxserver/apprise-api:${APPRISE_TAG} + ${_appname_}: + image: lscr.io/linuxserver/apprise-api:${${_APPNAME_}_TAG} diff --git a/compose/.apps/apprise/apprise.hostname.yml b/compose/.apps/apprise/apprise.hostname.yml index 20df7d7dd6..4dc53c3782 100644 --- a/compose/.apps/apprise/apprise.hostname.yml +++ b/compose/.apps/apprise/apprise.hostname.yml @@ -1,3 +1,3 @@ services: - apprise: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/apprise/apprise.labels.yml b/compose/.apps/apprise/apprise.labels.yml index 92659cf08e..625017ff9b 100644 --- a/compose/.apps/apprise/apprise.labels.yml +++ b/compose/.apps/apprise/apprise.labels.yml @@ -1,12 +1,12 @@ services: - apprise: + ${_appname_}: labels: 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" - com.dockstarter.appvars.apprise_restart: "unless-stopped" - com.dockstarter.appvars.apprise_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8000: "8000" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/apprise/apprise.netmode.yml b/compose/.apps/apprise/apprise.netmode.yml index 2634dee6eb..f36884ffb9 100644 --- a/compose/.apps/apprise/apprise.netmode.yml +++ b/compose/.apps/apprise/apprise.netmode.yml @@ -1,3 +1,3 @@ services: - apprise: - network_mode: ${APPRISE_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/apprise/apprise.ports.yml b/compose/.apps/apprise/apprise.ports.yml index 4ec7d21e1e..33070f8cee 100644 --- a/compose/.apps/apprise/apprise.ports.yml +++ b/compose/.apps/apprise/apprise.ports.yml @@ -1,4 +1,4 @@ services: - apprise: + ${_appname_}: ports: - - ${APPRISE_PORT_8000}:8000 + - ${${_APPNAME_}_PORT_8000}:8000 diff --git a/compose/.apps/apprise/apprise.x86_64.yml b/compose/.apps/apprise/apprise.x86_64.yml index 11b37d0433..a87ecbd8ca 100644 --- a/compose/.apps/apprise/apprise.x86_64.yml +++ b/compose/.apps/apprise/apprise.x86_64.yml @@ -1,3 +1,3 @@ services: - apprise: - image: lscr.io/linuxserver/apprise-api:${APPRISE_TAG} + ${_appname_}: + image: lscr.io/linuxserver/apprise-api:${${_APPNAME_}_TAG} diff --git a/compose/.apps/apprise/apprise.yml b/compose/.apps/apprise/apprise.yml index cfe29b9ffc..ace6d5d0ab 100644 --- a/compose/.apps/apprise/apprise.yml +++ b/compose/.apps/apprise/apprise.yml @@ -1,12 +1,12 @@ services: - apprise: - container_name: ${APPRISE_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${APPRISE_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/apprise:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/audiobookshelf/audiobookshelf.aarch64.yml b/compose/.apps/audiobookshelf/audiobookshelf.aarch64.yml index e0f3f79f03..97aef06d1b 100644 --- a/compose/.apps/audiobookshelf/audiobookshelf.aarch64.yml +++ b/compose/.apps/audiobookshelf/audiobookshelf.aarch64.yml @@ -1,3 +1,3 @@ services: - audiobookshelf: - image: ghcr.io/advplyr/audiobookshelf:${AUDIOBOOKSHELF_TAG} + ${_appname_}: + image: ghcr.io/advplyr/audiobookshelf:${${_APPNAME_}_TAG} diff --git a/compose/.apps/audiobookshelf/audiobookshelf.hostname.yml b/compose/.apps/audiobookshelf/audiobookshelf.hostname.yml index b6058b8b10..4dc53c3782 100644 --- a/compose/.apps/audiobookshelf/audiobookshelf.hostname.yml +++ b/compose/.apps/audiobookshelf/audiobookshelf.hostname.yml @@ -1,3 +1,3 @@ services: - audiobookshelf: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/audiobookshelf/audiobookshelf.labels.yml b/compose/.apps/audiobookshelf/audiobookshelf.labels.yml index d8f103acbe..eaa0db84e4 100644 --- a/compose/.apps/audiobookshelf/audiobookshelf.labels.yml +++ b/compose/.apps/audiobookshelf/audiobookshelf.labels.yml @@ -1,12 +1,12 @@ services: - audiobookshelf: + ${_appname_}: labels: 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" - com.dockstarter.appvars.audiobookshelf_restart: "unless-stopped" - com.dockstarter.appvars.audiobookshelf_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_80: "13378" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/audiobookshelf/audiobookshelf.netmode.yml b/compose/.apps/audiobookshelf/audiobookshelf.netmode.yml index c2cf95104e..f36884ffb9 100644 --- a/compose/.apps/audiobookshelf/audiobookshelf.netmode.yml +++ b/compose/.apps/audiobookshelf/audiobookshelf.netmode.yml @@ -1,3 +1,3 @@ services: - audiobookshelf: - network_mode: ${AUDIOBOOKSHELF_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/audiobookshelf/audiobookshelf.ports.yml b/compose/.apps/audiobookshelf/audiobookshelf.ports.yml index 8a0e32841c..c37afbebb5 100644 --- a/compose/.apps/audiobookshelf/audiobookshelf.ports.yml +++ b/compose/.apps/audiobookshelf/audiobookshelf.ports.yml @@ -1,4 +1,4 @@ services: - audiobookshelf: + ${_appname_}: ports: - - ${AUDIOBOOKSHELF_PORT_80}:80 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/audiobookshelf/audiobookshelf.x86_64.yml b/compose/.apps/audiobookshelf/audiobookshelf.x86_64.yml index e0f3f79f03..97aef06d1b 100644 --- a/compose/.apps/audiobookshelf/audiobookshelf.x86_64.yml +++ b/compose/.apps/audiobookshelf/audiobookshelf.x86_64.yml @@ -1,3 +1,3 @@ services: - audiobookshelf: - image: ghcr.io/advplyr/audiobookshelf:${AUDIOBOOKSHELF_TAG} + ${_appname_}: + image: ghcr.io/advplyr/audiobookshelf:${${_APPNAME_}_TAG} diff --git a/compose/.apps/audiobookshelf/audiobookshelf.yml b/compose/.apps/audiobookshelf/audiobookshelf.yml index 623c1c782b..d740f24747 100644 --- a/compose/.apps/audiobookshelf/audiobookshelf.yml +++ b/compose/.apps/audiobookshelf/audiobookshelf.yml @@ -1,16 +1,16 @@ services: - audiobookshelf: - container_name: ${AUDIOBOOKSHELF_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - CONFIG_PATH=/config - HOME=/config/.home - LOG_LEVEL=info - METADATA_PATH=/metadata - TZ=${TZ} - restart: ${AUDIOBOOKSHELF_RESTART} + restart: ${${_APPNAME_}_RESTART} user: ${PUID}:${PGID} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/audiobookshelf:/config - - ${DOCKER_VOLUME_CONFIG}/audiobookshelf/.metadata:/metadata + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/.metadata:/metadata - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/autobrr/autobrr.aarch64.yml b/compose/.apps/autobrr/autobrr.aarch64.yml index ff618ef650..8b0d550578 100644 --- a/compose/.apps/autobrr/autobrr.aarch64.yml +++ b/compose/.apps/autobrr/autobrr.aarch64.yml @@ -1,3 +1,3 @@ services: - autobrr: - image: ghcr.io/autobrr/autobrr:${AUTOBRR_TAG} + ${_appname_}: + image: ghcr.io/autobrr/autobrr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/autobrr/autobrr.hostname.yml b/compose/.apps/autobrr/autobrr.hostname.yml index 2cd9adb9c1..4dc53c3782 100644 --- a/compose/.apps/autobrr/autobrr.hostname.yml +++ b/compose/.apps/autobrr/autobrr.hostname.yml @@ -1,3 +1,3 @@ services: - autobrr: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/autobrr/autobrr.labels.yml b/compose/.apps/autobrr/autobrr.labels.yml index c6874808eb..1a126ac862 100644 --- a/compose/.apps/autobrr/autobrr.labels.yml +++ b/compose/.apps/autobrr/autobrr.labels.yml @@ -1,12 +1,12 @@ services: - autobrr: + ${_appname_}: labels: 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" - com.dockstarter.appvars.autobrr_restart: "unless-stopped" - com.dockstarter.appvars.autobrr_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_7474: "7474" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/autobrr/autobrr.netmode.yml b/compose/.apps/autobrr/autobrr.netmode.yml index a95fbedb70..f36884ffb9 100644 --- a/compose/.apps/autobrr/autobrr.netmode.yml +++ b/compose/.apps/autobrr/autobrr.netmode.yml @@ -1,3 +1,3 @@ services: - autobrr: - network_mode: ${AUTOBRR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/autobrr/autobrr.ports.yml b/compose/.apps/autobrr/autobrr.ports.yml index 46ae3657af..32fd3f2364 100644 --- a/compose/.apps/autobrr/autobrr.ports.yml +++ b/compose/.apps/autobrr/autobrr.ports.yml @@ -1,4 +1,4 @@ services: - autobrr: + ${_appname_}: ports: - - ${AUTOBRR_PORT_7474}:7474 + - ${${_APPNAME_}_PORT_7474}:7474 diff --git a/compose/.apps/autobrr/autobrr.x86_64.yml b/compose/.apps/autobrr/autobrr.x86_64.yml index ff618ef650..8b0d550578 100644 --- a/compose/.apps/autobrr/autobrr.x86_64.yml +++ b/compose/.apps/autobrr/autobrr.x86_64.yml @@ -1,3 +1,3 @@ services: - autobrr: - image: ghcr.io/autobrr/autobrr:${AUTOBRR_TAG} + ${_appname_}: + image: ghcr.io/autobrr/autobrr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/autobrr/autobrr.yml b/compose/.apps/autobrr/autobrr.yml index 2e4690b427..aee5c0741b 100644 --- a/compose/.apps/autobrr/autobrr.yml +++ b/compose/.apps/autobrr/autobrr.yml @@ -1,11 +1,11 @@ services: - autobrr: - container_name: ${AUTOBRR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${AUTOBRR_RESTART} + restart: ${${_APPNAME_}_RESTART} user: ${PGID}:${PUID} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/autobrr:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/azuracast/azuracast.aarch64.yml b/compose/.apps/azuracast/azuracast.aarch64.yml index f3777381e9..bc53045d3b 100644 --- a/compose/.apps/azuracast/azuracast.aarch64.yml +++ b/compose/.apps/azuracast/azuracast.aarch64.yml @@ -1,3 +1,3 @@ services: - azuracast: - image: ghcr.io/azuracast/azuracast:${AZURACAST_TAG} + ${_appname_}: + image: ghcr.io/azuracast/azuracast:${${_APPNAME_}_TAG} diff --git a/compose/.apps/azuracast/azuracast.hostname.yml b/compose/.apps/azuracast/azuracast.hostname.yml index e0370b8268..4dc53c3782 100644 --- a/compose/.apps/azuracast/azuracast.hostname.yml +++ b/compose/.apps/azuracast/azuracast.hostname.yml @@ -1,3 +1,3 @@ services: - azuracast: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/azuracast/azuracast.labels.yml b/compose/.apps/azuracast/azuracast.labels.yml index 810e3299b1..c21492e073 100644 --- a/compose/.apps/azuracast/azuracast.labels.yml +++ b/compose/.apps/azuracast/azuracast.labels.yml @@ -1,25 +1,25 @@ services: - azuracast: + ${_appname_}: labels: 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" - com.dockstarter.appvars.azuracast_environment_mysql_database: "azuracast" - com.dockstarter.appvars.azuracast_environment_mysql_host: "localhost" - com.dockstarter.appvars.azuracast_environment_mysql_password: "azur4c457" - com.dockstarter.appvars.azuracast_environment_mysql_port: "3306" - com.dockstarter.appvars.azuracast_environment_mysql_user: "azuracast" - com.dockstarter.appvars.azuracast_environment_redis_db: "1" - com.dockstarter.appvars.azuracast_environment_redis_host: "localhost" - com.dockstarter.appvars.azuracast_environment_redis_port: "6379" - com.dockstarter.appvars.azuracast_environment_station_port_range: "8000-8100" - com.dockstarter.appvars.azuracast_network_mode: "" - com.dockstarter.appvars.azuracast_port_2022: "2022" - com.dockstarter.appvars.azuracast_port_443: "443" - com.dockstarter.appvars.azuracast_port_80: "80" - com.dockstarter.appvars.azuracast_restart: "unless-stopped" - com.dockstarter.appvars.azuracast_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_application_env: "production" + com.dockstarter.appvars.${_appname_}_environment_enable_redis: "true" + com.dockstarter.appvars.${_appname_}_environment_mysql_database: "azuracast" + com.dockstarter.appvars.${_appname_}_environment_mysql_host: "localhost" + com.dockstarter.appvars.${_appname_}_environment_mysql_password: "azur4c457" + com.dockstarter.appvars.${_appname_}_environment_mysql_port: "3306" + com.dockstarter.appvars.${_appname_}_environment_mysql_user: "azuracast" + com.dockstarter.appvars.${_appname_}_environment_redis_db: "1" + com.dockstarter.appvars.${_appname_}_environment_redis_host: "localhost" + com.dockstarter.appvars.${_appname_}_environment_redis_port: "6379" + com.dockstarter.appvars.${_appname_}_environment_station_port_range: "8000-8100" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_2022: "2022" + com.dockstarter.appvars.${_appname_}_port_443: "443" + com.dockstarter.appvars.${_appname_}_port_80: "80" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/azuracast/azuracast.netmode.yml b/compose/.apps/azuracast/azuracast.netmode.yml index dac86eb1ee..f36884ffb9 100644 --- a/compose/.apps/azuracast/azuracast.netmode.yml +++ b/compose/.apps/azuracast/azuracast.netmode.yml @@ -1,3 +1,3 @@ services: - azuracast: - network_mode: ${AZURACAST_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/azuracast/azuracast.ports.yml b/compose/.apps/azuracast/azuracast.ports.yml index 78b91597a0..19ef0643e3 100644 --- a/compose/.apps/azuracast/azuracast.ports.yml +++ b/compose/.apps/azuracast/azuracast.ports.yml @@ -1,7 +1,7 @@ services: - azuracast: + ${_appname_}: ports: - - ${AZURACAST_ENVIRONMENT_STATION_PORT_RANGE}:${AZURACAST_ENVIRONMENT_STATION_PORT_RANGE} - - ${AZURACAST_PORT_2022}:2022 - - ${AZURACAST_PORT_443}:443 - - ${AZURACAST_PORT_80}:80 + - ${${_APPNAME_}_ENVIRONMENT_STATION_PORT_RANGE}:${${_APPNAME_}_ENVIRONMENT_STATION_PORT_RANGE} + - ${${_APPNAME_}_PORT_2022}:2022 + - ${${_APPNAME_}_PORT_443}:443 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/azuracast/azuracast.x86_64.yml b/compose/.apps/azuracast/azuracast.x86_64.yml index f3777381e9..bc53045d3b 100644 --- a/compose/.apps/azuracast/azuracast.x86_64.yml +++ b/compose/.apps/azuracast/azuracast.x86_64.yml @@ -1,3 +1,3 @@ services: - azuracast: - image: ghcr.io/azuracast/azuracast:${AZURACAST_TAG} + ${_appname_}: + image: ghcr.io/azuracast/azuracast:${${_APPNAME_}_TAG} diff --git a/compose/.apps/azuracast/azuracast.yml b/compose/.apps/azuracast/azuracast.yml index 267b93cd41..48e42c9077 100644 --- a/compose/.apps/azuracast/azuracast.yml +++ b/compose/.apps/azuracast/azuracast.yml @@ -1,24 +1,24 @@ services: - azuracast: - container_name: ${AZURACAST_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - - APPLICATION_ENV=${AZURACAST_ENVIRONMENT_APPLICATION_ENV} - - MYSQL_HOST=${AZURACAST_ENVIRONMENT_MYSQL_HOST} - - MYSQL_PORT=${AZURACAST_ENVIRONMENT_MYSQL_PORT} - - MYSQL_USER=${AZURACAST_ENVIRONMENT_MYSQL_USER} - - MYSQL_PASSWORD=${AZURACAST_ENVIRONMENT_MYSQL_PASSWORD} - - MYSQL_DATABASE=${AZURACAST_ENVIRONMENT_MYSQL_DATABASE} - - ENABLE_REDIS=${AZURACAST_ENVIRONMENT_ENABLE_REDIS} - - REDIS_HOST=${AZURACAST_ENVIRONMENT_REDIS_HOST} - - REDIS_PORT=${AZURACAST_ENVIRONMENT_REDIS_PORT} - - REDIS_DB=${AZURACAST_ENVIRONMENT_REDIS_DB} - restart: ${AZURACAST_RESTART} + - APPLICATION_ENV=${${_APPNAME_}_ENVIRONMENT_APPLICATION_ENV} + - MYSQL_HOST=${${_APPNAME_}_ENVIRONMENT_MYSQL_HOST} + - MYSQL_PORT=${${_APPNAME_}_ENVIRONMENT_MYSQL_PORT} + - MYSQL_USER=${${_APPNAME_}_ENVIRONMENT_MYSQL_USER} + - MYSQL_PASSWORD=${${_APPNAME_}_ENVIRONMENT_MYSQL_PASSWORD} + - MYSQL_DATABASE=${${_APPNAME_}_ENVIRONMENT_MYSQL_DATABASE} + - ENABLE_REDIS=${${_APPNAME_}_ENVIRONMENT_ENABLE_REDIS} + - REDIS_HOST=${${_APPNAME_}_ENVIRONMENT_REDIS_HOST} + - REDIS_PORT=${${_APPNAME_}_ENVIRONMENT_REDIS_PORT} + - REDIS_DB=${${_APPNAME_}_ENVIRONMENT_REDIS_DB} + restart: ${${_APPNAME_}_RESTART} volumes: - - ${DOCKER_VOLUME_CONFIG}/shoutcast2/:/var/azuracast/servers/shoutcast2 - - ${DOCKER_VOLUME_CONFIG}/geoip/:/var/azuracast/geoip - - ${DOCKER_VOLUME_CONFIG}/sftpgo/:/var/azuracast/sftpgo/persist + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/shoutcast2/:/var/azuracast/servers/shoutcast2 + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/geoip/:/var/azuracast/geoip + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/sftpgo/:/var/azuracast/sftpgo/persist - ${DOCKER_VOLUME_STORAGE}/uploads/:/var/azuracast/uploads - ${DOCKER_VOLUME_STORAGE}/backups/:/var/azuracast/backups - ${DOCKER_VOLUME_STORAGE}/stations/:/var/azuracast/stations diff --git a/compose/.apps/bazarr/bazarr.aarch64.yml b/compose/.apps/bazarr/bazarr.aarch64.yml index 77f52930b9..142040d529 100644 --- a/compose/.apps/bazarr/bazarr.aarch64.yml +++ b/compose/.apps/bazarr/bazarr.aarch64.yml @@ -1,3 +1,3 @@ services: - bazarr: - image: lscr.io/linuxserver/bazarr:${BAZARR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/bazarr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/bazarr/bazarr.hostname.yml b/compose/.apps/bazarr/bazarr.hostname.yml index d0b679f0f9..4dc53c3782 100644 --- a/compose/.apps/bazarr/bazarr.hostname.yml +++ b/compose/.apps/bazarr/bazarr.hostname.yml @@ -1,3 +1,3 @@ services: - bazarr: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/bazarr/bazarr.labels.yml b/compose/.apps/bazarr/bazarr.labels.yml index 9c7c48aef8..df2c1b3183 100644 --- a/compose/.apps/bazarr/bazarr.labels.yml +++ b/compose/.apps/bazarr/bazarr.labels.yml @@ -1,12 +1,12 @@ services: - bazarr: + ${_appname_}: labels: 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" - com.dockstarter.appvars.bazarr_restart: "unless-stopped" - com.dockstarter.appvars.bazarr_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_6767: "6767" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/bazarr/bazarr.netmode.yml b/compose/.apps/bazarr/bazarr.netmode.yml index 7a647f4731..f36884ffb9 100644 --- a/compose/.apps/bazarr/bazarr.netmode.yml +++ b/compose/.apps/bazarr/bazarr.netmode.yml @@ -1,3 +1,3 @@ services: - bazarr: - network_mode: ${BAZARR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/bazarr/bazarr.ports.yml b/compose/.apps/bazarr/bazarr.ports.yml index a6a50b9715..c0429a08bc 100644 --- a/compose/.apps/bazarr/bazarr.ports.yml +++ b/compose/.apps/bazarr/bazarr.ports.yml @@ -1,4 +1,4 @@ services: - bazarr: + ${_appname_}: ports: - - ${BAZARR_PORT_6767}:6767 + - ${${_APPNAME_}_PORT_6767}:6767 diff --git a/compose/.apps/bazarr/bazarr.x86_64.yml b/compose/.apps/bazarr/bazarr.x86_64.yml index 77f52930b9..142040d529 100644 --- a/compose/.apps/bazarr/bazarr.x86_64.yml +++ b/compose/.apps/bazarr/bazarr.x86_64.yml @@ -1,3 +1,3 @@ services: - bazarr: - image: lscr.io/linuxserver/bazarr:${BAZARR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/bazarr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/bazarr/bazarr.yml b/compose/.apps/bazarr/bazarr.yml index 65d3743f08..ace6d5d0ab 100644 --- a/compose/.apps/bazarr/bazarr.yml +++ b/compose/.apps/bazarr/bazarr.yml @@ -1,12 +1,12 @@ services: - bazarr: - container_name: ${BAZARR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${BAZARR_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/bazarr:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/beets/beets.aarch64.yml b/compose/.apps/beets/beets.aarch64.yml index 4e26d47da6..e08fbda4a0 100644 --- a/compose/.apps/beets/beets.aarch64.yml +++ b/compose/.apps/beets/beets.aarch64.yml @@ -1,3 +1,3 @@ services: - beets: - image: lscr.io/linuxserver/beets:${BEETS_TAG} + ${_appname_}: + image: lscr.io/linuxserver/beets:${${_APPNAME_}_TAG} diff --git a/compose/.apps/beets/beets.hostname.yml b/compose/.apps/beets/beets.hostname.yml index 5b9c9be3c2..4dc53c3782 100644 --- a/compose/.apps/beets/beets.hostname.yml +++ b/compose/.apps/beets/beets.hostname.yml @@ -1,3 +1,3 @@ services: - beets: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/beets/beets.labels.yml b/compose/.apps/beets/beets.labels.yml index 1463c5d42b..2b0df7dcfd 100644 --- a/compose/.apps/beets/beets.labels.yml +++ b/compose/.apps/beets/beets.labels.yml @@ -1,12 +1,12 @@ services: - beets: + ${_appname_}: labels: 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" - com.dockstarter.appvars.beets_restart: "unless-stopped" - com.dockstarter.appvars.beets_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8337: "8337" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/beets/beets.netmode.yml b/compose/.apps/beets/beets.netmode.yml index c4117e568e..f36884ffb9 100644 --- a/compose/.apps/beets/beets.netmode.yml +++ b/compose/.apps/beets/beets.netmode.yml @@ -1,3 +1,3 @@ services: - beets: - network_mode: ${BEETS_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/beets/beets.ports.yml b/compose/.apps/beets/beets.ports.yml index a4277e51dd..353a6f870a 100644 --- a/compose/.apps/beets/beets.ports.yml +++ b/compose/.apps/beets/beets.ports.yml @@ -1,4 +1,4 @@ services: - beets: + ${_appname_}: ports: - - ${BEETS_PORT_8337}:8337 + - ${${_APPNAME_}_PORT_8337}:8337 diff --git a/compose/.apps/beets/beets.x86_64.yml b/compose/.apps/beets/beets.x86_64.yml index 4e26d47da6..e08fbda4a0 100644 --- a/compose/.apps/beets/beets.x86_64.yml +++ b/compose/.apps/beets/beets.x86_64.yml @@ -1,3 +1,3 @@ services: - beets: - image: lscr.io/linuxserver/beets:${BEETS_TAG} + ${_appname_}: + image: lscr.io/linuxserver/beets:${${_APPNAME_}_TAG} diff --git a/compose/.apps/beets/beets.yml b/compose/.apps/beets/beets.yml index 46f27b8e0d..ace6d5d0ab 100644 --- a/compose/.apps/beets/beets.yml +++ b/compose/.apps/beets/beets.yml @@ -1,12 +1,12 @@ services: - beets: - container_name: ${BEETS_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${BEETS_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/beets:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/bitwarden/bitwarden.aarch64.yml b/compose/.apps/bitwarden/bitwarden.aarch64.yml index 560f2ca1a9..a022fba687 100644 --- a/compose/.apps/bitwarden/bitwarden.aarch64.yml +++ b/compose/.apps/bitwarden/bitwarden.aarch64.yml @@ -1,3 +1,3 @@ services: - bitwarden: - image: vaultwarden/server:${BITWARDEN_TAG} + ${_appname_}: + image: vaultwarden/server:${${_APPNAME_}_TAG} diff --git a/compose/.apps/bitwarden/bitwarden.hostname.yml b/compose/.apps/bitwarden/bitwarden.hostname.yml index 9db1f78ff8..4dc53c3782 100644 --- a/compose/.apps/bitwarden/bitwarden.hostname.yml +++ b/compose/.apps/bitwarden/bitwarden.hostname.yml @@ -1,3 +1,3 @@ services: - bitwarden: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/bitwarden/bitwarden.labels.yml b/compose/.apps/bitwarden/bitwarden.labels.yml index bd5ff893d5..6fbcadfc33 100644 --- a/compose/.apps/bitwarden/bitwarden.labels.yml +++ b/compose/.apps/bitwarden/bitwarden.labels.yml @@ -1,23 +1,23 @@ services: - bitwarden: + ${_appname_}: labels: 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" - com.dockstarter.appvars.bitwarden_environment_disable_admin_token: "false" - com.dockstarter.appvars.bitwarden_environment_domain: "" - com.dockstarter.appvars.bitwarden_environment_enable_db_wal: "true" - com.dockstarter.appvars.bitwarden_environment_invitations_allowed: "false" - com.dockstarter.appvars.bitwarden_environment_show_password_hint: "false" - com.dockstarter.appvars.bitwarden_environment_signups_allowed: "false" - com.dockstarter.appvars.bitwarden_environment_signups_verify: "false" - com.dockstarter.appvars.bitwarden_environment_websocket_enable: "true" - com.dockstarter.appvars.bitwarden_network_mode: "" - com.dockstarter.appvars.bitwarden_port_3012: "3012" - com.dockstarter.appvars.bitwarden_port_80: "8013" - com.dockstarter.appvars.bitwarden_restart: "unless-stopped" - com.dockstarter.appvars.bitwarden_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_admin_token: "" + com.dockstarter.appvars.${_appname_}_environment_database_url: "data/db.sqlite3" + com.dockstarter.appvars.${_appname_}_environment_disable_admin_token: "false" + com.dockstarter.appvars.${_appname_}_environment_domain: "" + com.dockstarter.appvars.${_appname_}_environment_enable_db_wal: "true" + com.dockstarter.appvars.${_appname_}_environment_invitations_allowed: "false" + com.dockstarter.appvars.${_appname_}_environment_show_password_hint: "false" + com.dockstarter.appvars.${_appname_}_environment_signups_allowed: "false" + com.dockstarter.appvars.${_appname_}_environment_signups_verify: "false" + com.dockstarter.appvars.${_appname_}_environment_websocket_enable: "true" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_3012: "3012" + com.dockstarter.appvars.${_appname_}_port_80: "8013" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/bitwarden/bitwarden.netmode.yml b/compose/.apps/bitwarden/bitwarden.netmode.yml index 408b83a76f..f36884ffb9 100644 --- a/compose/.apps/bitwarden/bitwarden.netmode.yml +++ b/compose/.apps/bitwarden/bitwarden.netmode.yml @@ -1,3 +1,3 @@ services: - bitwarden: - network_mode: ${BITWARDEN_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/bitwarden/bitwarden.ports.yml b/compose/.apps/bitwarden/bitwarden.ports.yml index 542fe42c5c..d93ed3e63b 100644 --- a/compose/.apps/bitwarden/bitwarden.ports.yml +++ b/compose/.apps/bitwarden/bitwarden.ports.yml @@ -1,5 +1,5 @@ services: - bitwarden: + ${_appname_}: ports: - - ${BITWARDEN_PORT_3012}:3012 - - ${BITWARDEN_PORT_80}:80 + - ${${_APPNAME_}_PORT_3012}:3012 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/bitwarden/bitwarden.x86_64.yml b/compose/.apps/bitwarden/bitwarden.x86_64.yml index 560f2ca1a9..a022fba687 100644 --- a/compose/.apps/bitwarden/bitwarden.x86_64.yml +++ b/compose/.apps/bitwarden/bitwarden.x86_64.yml @@ -1,3 +1,3 @@ services: - bitwarden: - image: vaultwarden/server:${BITWARDEN_TAG} + ${_appname_}: + image: vaultwarden/server:${${_APPNAME_}_TAG} diff --git a/compose/.apps/bitwarden/bitwarden.yml b/compose/.apps/bitwarden/bitwarden.yml index 943a8a1ba0..ff2c02b880 100644 --- a/compose/.apps/bitwarden/bitwarden.yml +++ b/compose/.apps/bitwarden/bitwarden.yml @@ -1,20 +1,20 @@ services: - bitwarden: - container_name: ${BITWARDEN_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - ADMIN_TOKEN=${BITWARDEN_ENVIRONMENT_ADMIN_TOKEN} - - DATABASE_URL=${BITWARDEN_ENVIRONMENT_DATABASE_URL} - - DISABLE_ADMIN_TOKEN=${BITWARDEN_ENVIRONMENT_DISABLE_ADMIN_TOKEN} - - DOMAIN=${BITWARDEN_ENVIRONMENT_DOMAIN} - - ENABLE_DB_WAL=${BITWARDEN_ENVIRONMENT_ENABLE_DB_WAL} - - INVITATIONS_ALLOWED=${BITWARDEN_ENVIRONMENT_INVITATIONS_ALLOWED} - - SHOW_PASSWORD_HINT=${BITWARDEN_ENVIRONMENT_SHOW_PASSWORD_HINT} - - SIGNUPS_ALLOWED=${BITWARDEN_ENVIRONMENT_SIGNUPS_ALLOWED} - - SIGNUPS_VERIFY=${BITWARDEN_ENVIRONMENT_SIGNUPS_VERIFY} + - ADMIN_TOKEN=${${_APPNAME_}_ENVIRONMENT_ADMIN_TOKEN} + - DATABASE_URL=${${_APPNAME_}_ENVIRONMENT_DATABASE_URL} + - DISABLE_ADMIN_TOKEN=${${_APPNAME_}_ENVIRONMENT_DISABLE_ADMIN_TOKEN} + - DOMAIN=${${_APPNAME_}_ENVIRONMENT_DOMAIN} + - ENABLE_DB_WAL=${${_APPNAME_}_ENVIRONMENT_ENABLE_DB_WAL} + - INVITATIONS_ALLOWED=${${_APPNAME_}_ENVIRONMENT_INVITATIONS_ALLOWED} + - SHOW_PASSWORD_HINT=${${_APPNAME_}_ENVIRONMENT_SHOW_PASSWORD_HINT} + - SIGNUPS_ALLOWED=${${_APPNAME_}_ENVIRONMENT_SIGNUPS_ALLOWED} + - SIGNUPS_VERIFY=${${_APPNAME_}_ENVIRONMENT_SIGNUPS_VERIFY} - TZ=${TZ} - - WEBSOCKET_ENABLED=${BITWARDEN_ENVIRONMENT_WEBSOCKET_ENABLE} - restart: ${BITWARDEN_RESTART} + - WEBSOCKET_ENABLED=${${_APPNAME_}_ENVIRONMENT_WEBSOCKET_ENABLE} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/bitwarden:/data + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/booksonic/booksonic.aarch64.yml b/compose/.apps/booksonic/booksonic.aarch64.yml index e9876f833d..ba652604ac 100644 --- a/compose/.apps/booksonic/booksonic.aarch64.yml +++ b/compose/.apps/booksonic/booksonic.aarch64.yml @@ -1,3 +1,3 @@ services: - booksonic: - image: lscr.io/linuxserver/booksonic:${BOOKSONIC_TAG} + ${_appname_}: + image: lscr.io/linuxserver/booksonic:${${_APPNAME_}_TAG} diff --git a/compose/.apps/booksonic/booksonic.hostname.yml b/compose/.apps/booksonic/booksonic.hostname.yml index 8fef5abd47..4dc53c3782 100644 --- a/compose/.apps/booksonic/booksonic.hostname.yml +++ b/compose/.apps/booksonic/booksonic.hostname.yml @@ -1,3 +1,3 @@ services: - booksonic: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/booksonic/booksonic.labels.yml b/compose/.apps/booksonic/booksonic.labels.yml index 9e8449dd2f..c8bf5df0ad 100644 --- a/compose/.apps/booksonic/booksonic.labels.yml +++ b/compose/.apps/booksonic/booksonic.labels.yml @@ -1,13 +1,13 @@ services: - booksonic: + ${_appname_}: labels: 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: "" - com.dockstarter.appvars.booksonic_port_4040: "4040" - com.dockstarter.appvars.booksonic_restart: "unless-stopped" - com.dockstarter.appvars.booksonic_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_context_path: "/booksonic" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_4040: "4040" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/booksonic/booksonic.netmode.yml b/compose/.apps/booksonic/booksonic.netmode.yml index e9fd8e789f..f36884ffb9 100644 --- a/compose/.apps/booksonic/booksonic.netmode.yml +++ b/compose/.apps/booksonic/booksonic.netmode.yml @@ -1,3 +1,3 @@ services: - booksonic: - network_mode: ${BOOKSONIC_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/booksonic/booksonic.ports.yml b/compose/.apps/booksonic/booksonic.ports.yml index a1786a6d3b..b4d795b88b 100644 --- a/compose/.apps/booksonic/booksonic.ports.yml +++ b/compose/.apps/booksonic/booksonic.ports.yml @@ -1,4 +1,4 @@ services: - booksonic: + ${_appname_}: ports: - - ${BOOKSONIC_PORT_4040}:4040 + - ${${_APPNAME_}_PORT_4040}:4040 diff --git a/compose/.apps/booksonic/booksonic.x86_64.yml b/compose/.apps/booksonic/booksonic.x86_64.yml index e9876f833d..ba652604ac 100644 --- a/compose/.apps/booksonic/booksonic.x86_64.yml +++ b/compose/.apps/booksonic/booksonic.x86_64.yml @@ -1,3 +1,3 @@ services: - booksonic: - image: lscr.io/linuxserver/booksonic:${BOOKSONIC_TAG} + ${_appname_}: + image: lscr.io/linuxserver/booksonic:${${_APPNAME_}_TAG} diff --git a/compose/.apps/booksonic/booksonic.yml b/compose/.apps/booksonic/booksonic.yml index 1de5807037..447b2a3d87 100644 --- a/compose/.apps/booksonic/booksonic.yml +++ b/compose/.apps/booksonic/booksonic.yml @@ -1,13 +1,13 @@ services: - booksonic: - container_name: ${BOOKSONIC_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - CONTEXT_PATH=${BOOKSONIC_ENVIRONMENT_CONTEXT_PATH} + - CONTEXT_PATH=${${_APPNAME_}_ENVIRONMENT_CONTEXT_PATH} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${BOOKSONIC_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/booksonic:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/booksonicair/booksonicair.aarch64.yml b/compose/.apps/booksonicair/booksonicair.aarch64.yml index 25447167ca..1ede13d489 100644 --- a/compose/.apps/booksonicair/booksonicair.aarch64.yml +++ b/compose/.apps/booksonicair/booksonicair.aarch64.yml @@ -1,3 +1,3 @@ services: - booksonicair: - image: lscr.io/linuxserver/booksonic-air:${BOOKSONICAIR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/booksonic-air:${${_APPNAME_}_TAG} diff --git a/compose/.apps/booksonicair/booksonicair.hostname.yml b/compose/.apps/booksonicair/booksonicair.hostname.yml index e643d1d430..4dc53c3782 100644 --- a/compose/.apps/booksonicair/booksonicair.hostname.yml +++ b/compose/.apps/booksonicair/booksonicair.hostname.yml @@ -1,3 +1,3 @@ services: - booksonicair: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/booksonicair/booksonicair.labels.yml b/compose/.apps/booksonicair/booksonicair.labels.yml index 54eee5157b..bd0cfdbc51 100644 --- a/compose/.apps/booksonicair/booksonicair.labels.yml +++ b/compose/.apps/booksonicair/booksonicair.labels.yml @@ -1,13 +1,13 @@ services: - booksonicair: + ${_appname_}: labels: 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: "" - com.dockstarter.appvars.booksonicair_port_4040: "4040" - com.dockstarter.appvars.booksonicair_restart: "unless-stopped" - com.dockstarter.appvars.booksonicair_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_context_path: "/booksonicair" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_4040: "4040" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/booksonicair/booksonicair.netmode.yml b/compose/.apps/booksonicair/booksonicair.netmode.yml index e358d2d565..f36884ffb9 100644 --- a/compose/.apps/booksonicair/booksonicair.netmode.yml +++ b/compose/.apps/booksonicair/booksonicair.netmode.yml @@ -1,3 +1,3 @@ services: - booksonicair: - network_mode: ${BOOKSONICAIR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/booksonicair/booksonicair.ports.yml b/compose/.apps/booksonicair/booksonicair.ports.yml index e575972e95..b4d795b88b 100644 --- a/compose/.apps/booksonicair/booksonicair.ports.yml +++ b/compose/.apps/booksonicair/booksonicair.ports.yml @@ -1,4 +1,4 @@ services: - booksonicair: + ${_appname_}: ports: - - ${BOOKSONICAIR_PORT_4040}:4040 + - ${${_APPNAME_}_PORT_4040}:4040 diff --git a/compose/.apps/booksonicair/booksonicair.x86_64.yml b/compose/.apps/booksonicair/booksonicair.x86_64.yml index 25447167ca..1ede13d489 100644 --- a/compose/.apps/booksonicair/booksonicair.x86_64.yml +++ b/compose/.apps/booksonicair/booksonicair.x86_64.yml @@ -1,3 +1,3 @@ services: - booksonicair: - image: lscr.io/linuxserver/booksonic-air:${BOOKSONICAIR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/booksonic-air:${${_APPNAME_}_TAG} diff --git a/compose/.apps/booksonicair/booksonicair.yml b/compose/.apps/booksonicair/booksonicair.yml index 19a970f313..447b2a3d87 100644 --- a/compose/.apps/booksonicair/booksonicair.yml +++ b/compose/.apps/booksonicair/booksonicair.yml @@ -1,13 +1,13 @@ services: - booksonicair: - container_name: ${BOOKSONICAIR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - CONTEXT_PATH=${BOOKSONICAIR_ENVIRONMENT_CONTEXT_PATH} + - CONTEXT_PATH=${${_APPNAME_}_ENVIRONMENT_CONTEXT_PATH} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${BOOKSONICAIR_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/booksonicair:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/bookstack/bookstack.aarch64.yml b/compose/.apps/bookstack/bookstack.aarch64.yml index 433b37ea5d..c4f5810307 100644 --- a/compose/.apps/bookstack/bookstack.aarch64.yml +++ b/compose/.apps/bookstack/bookstack.aarch64.yml @@ -1,3 +1,3 @@ services: - bookstack: - image: lscr.io/linuxserver/bookstack:${BOOKSTACK_TAG} + ${_appname_}: + image: lscr.io/linuxserver/bookstack:${${_APPNAME_}_TAG} diff --git a/compose/.apps/bookstack/bookstack.hostname.yml b/compose/.apps/bookstack/bookstack.hostname.yml index dbbd213ea6..4dc53c3782 100644 --- a/compose/.apps/bookstack/bookstack.hostname.yml +++ b/compose/.apps/bookstack/bookstack.hostname.yml @@ -1,3 +1,3 @@ services: - bookstack: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/bookstack/bookstack.labels.yml b/compose/.apps/bookstack/bookstack.labels.yml index e734179f7d..21e7818e44 100644 --- a/compose/.apps/bookstack/bookstack.labels.yml +++ b/compose/.apps/bookstack/bookstack.labels.yml @@ -1,17 +1,17 @@ services: - bookstack: + ${_appname_}: labels: 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: "" - com.dockstarter.appvars.bookstack_environment_db_host: "" - com.dockstarter.appvars.bookstack_environment_db_pass: "" - com.dockstarter.appvars.bookstack_environment_db_user: "" - com.dockstarter.appvars.bookstack_network_mode: "" - com.dockstarter.appvars.bookstack_port_80: "6875" - com.dockstarter.appvars.bookstack_restart: "unless-stopped" - com.dockstarter.appvars.bookstack_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_app_url: "" + com.dockstarter.appvars.${_appname_}_environment_db_database: "" + com.dockstarter.appvars.${_appname_}_environment_db_host: "" + com.dockstarter.appvars.${_appname_}_environment_db_pass: "" + com.dockstarter.appvars.${_appname_}_environment_db_user: "" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_80: "6875" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/bookstack/bookstack.netmode.yml b/compose/.apps/bookstack/bookstack.netmode.yml index c4fee2a94a..f36884ffb9 100644 --- a/compose/.apps/bookstack/bookstack.netmode.yml +++ b/compose/.apps/bookstack/bookstack.netmode.yml @@ -1,3 +1,3 @@ services: - bookstack: - network_mode: ${BOOKSTACK_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/bookstack/bookstack.ports.yml b/compose/.apps/bookstack/bookstack.ports.yml index 0641658177..c37afbebb5 100644 --- a/compose/.apps/bookstack/bookstack.ports.yml +++ b/compose/.apps/bookstack/bookstack.ports.yml @@ -1,4 +1,4 @@ services: - bookstack: + ${_appname_}: ports: - - ${BOOKSTACK_PORT_80}:80 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/bookstack/bookstack.x86_64.yml b/compose/.apps/bookstack/bookstack.x86_64.yml index 433b37ea5d..c4f5810307 100644 --- a/compose/.apps/bookstack/bookstack.x86_64.yml +++ b/compose/.apps/bookstack/bookstack.x86_64.yml @@ -1,3 +1,3 @@ services: - bookstack: - image: lscr.io/linuxserver/bookstack:${BOOKSTACK_TAG} + ${_appname_}: + image: lscr.io/linuxserver/bookstack:${${_APPNAME_}_TAG} diff --git a/compose/.apps/bookstack/bookstack.yml b/compose/.apps/bookstack/bookstack.yml index e3f563a488..b8add73f8a 100644 --- a/compose/.apps/bookstack/bookstack.yml +++ b/compose/.apps/bookstack/bookstack.yml @@ -1,17 +1,17 @@ services: - bookstack: - container_name: ${BOOKSTACK_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - APP_URL=${BOOKSTACK_ENVIRONMENT_APP_URL} - - DB_DATABASE=${BOOKSTACK_ENVIRONMENT_DB_DATABASE} - - DB_HOST=${BOOKSTACK_ENVIRONMENT_DB_HOST} - - DB_PASS=${BOOKSTACK_ENVIRONMENT_DB_PASS} - - DB_USER=${BOOKSTACK_ENVIRONMENT_DB_USER} + - APP_URL=${${_APPNAME_}_ENVIRONMENT_APP_URL} + - DB_DATABASE=${${_APPNAME_}_ENVIRONMENT_DB_DATABASE} + - DB_HOST=${${_APPNAME_}_ENVIRONMENT_DB_HOST} + - DB_PASS=${${_APPNAME_}_ENVIRONMENT_DB_PASS} + - DB_USER=${${_APPNAME_}_ENVIRONMENT_DB_USER} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${BOOKSTACK_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/bookstack:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/calibre/calibre.aarch64.yml b/compose/.apps/calibre/calibre.aarch64.yml index 536c9f4f0c..8c76a35f11 100644 --- a/compose/.apps/calibre/calibre.aarch64.yml +++ b/compose/.apps/calibre/calibre.aarch64.yml @@ -1,3 +1,3 @@ services: - calibre: - image: lscr.io/linuxserver/calibre:${CALIBRE_TAG} + ${_appname_}: + image: lscr.io/linuxserver/calibre:${${_APPNAME_}_TAG} diff --git a/compose/.apps/calibre/calibre.hostname.yml b/compose/.apps/calibre/calibre.hostname.yml index 503e4e712d..4dc53c3782 100644 --- a/compose/.apps/calibre/calibre.hostname.yml +++ b/compose/.apps/calibre/calibre.hostname.yml @@ -1,3 +1,3 @@ services: - calibre: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/calibre/calibre.labels.yml b/compose/.apps/calibre/calibre.labels.yml index f48c624575..93c8d2739f 100644 --- a/compose/.apps/calibre/calibre.labels.yml +++ b/compose/.apps/calibre/calibre.labels.yml @@ -1,17 +1,17 @@ services: - calibre: + ${_appname_}: labels: 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: "" - com.dockstarter.appvars.calibre_environment_guac_user: "" - com.dockstarter.appvars.calibre_environment_use_dark_palette: "1" - com.dockstarter.appvars.calibre_network_mode: "" - com.dockstarter.appvars.calibre_port_8080: "8080" - com.dockstarter.appvars.calibre_port_8081: "8081" - com.dockstarter.appvars.calibre_restart: "unless-stopped" - com.dockstarter.appvars.calibre_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_cli_args: "" + com.dockstarter.appvars.${_appname_}_environment_guac_pass: "" + com.dockstarter.appvars.${_appname_}_environment_guac_user: "" + com.dockstarter.appvars.${_appname_}_environment_use_dark_palette: "1" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8080: "8080" + com.dockstarter.appvars.${_appname_}_port_8081: "8081" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/calibre/calibre.netmode.yml b/compose/.apps/calibre/calibre.netmode.yml index 0e5420e3d2..f36884ffb9 100644 --- a/compose/.apps/calibre/calibre.netmode.yml +++ b/compose/.apps/calibre/calibre.netmode.yml @@ -1,3 +1,3 @@ services: - calibre: - network_mode: ${CALIBRE_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/calibre/calibre.ports.yml b/compose/.apps/calibre/calibre.ports.yml index 5645d114a9..749d35bc5c 100644 --- a/compose/.apps/calibre/calibre.ports.yml +++ b/compose/.apps/calibre/calibre.ports.yml @@ -1,5 +1,5 @@ services: - calibre: + ${_appname_}: ports: - - ${CALIBRE_PORT_8080}:8080 - - ${CALIBRE_PORT_8081}:8081 + - ${${_APPNAME_}_PORT_8080}:8080 + - ${${_APPNAME_}_PORT_8081}:8081 diff --git a/compose/.apps/calibre/calibre.x86_64.yml b/compose/.apps/calibre/calibre.x86_64.yml index 536c9f4f0c..8c76a35f11 100644 --- a/compose/.apps/calibre/calibre.x86_64.yml +++ b/compose/.apps/calibre/calibre.x86_64.yml @@ -1,3 +1,3 @@ services: - calibre: - image: lscr.io/linuxserver/calibre:${CALIBRE_TAG} + ${_appname_}: + image: lscr.io/linuxserver/calibre:${${_APPNAME_}_TAG} diff --git a/compose/.apps/calibre/calibre.yml b/compose/.apps/calibre/calibre.yml index 2da9fd4189..258aa1c52c 100644 --- a/compose/.apps/calibre/calibre.yml +++ b/compose/.apps/calibre/calibre.yml @@ -1,18 +1,18 @@ services: - calibre: - container_name: ${CALIBRE_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - CALIBRE_USE_DARK_PALETTE=${CALIBRE_ENVIRONMENT_USE_DARK_PALETTE} - - CLI_ARGS=${CALIBRE_ENVIRONMENT_CLI_ARGS} - - GUAC_PASS=${CALIBRE_ENVIRONMENT_GUAC_PASS} - - GUAC_USER=${CALIBRE_ENVIRONMENT_GUAC_USER} + - CALIBRE_USE_DARK_PALETTE=${${_APPNAME_}_ENVIRONMENT_USE_DARK_PALETTE} + - CLI_ARGS=${${_APPNAME_}_ENVIRONMENT_CLI_ARGS} + - GUAC_PASS=${${_APPNAME_}_ENVIRONMENT_GUAC_PASS} + - GUAC_USER=${${_APPNAME_}_ENVIRONMENT_GUAC_USER} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${CALIBRE_RESTART} + restart: ${${_APPNAME_}_RESTART} security_opt: - seccomp:unconfined volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/calibre:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/calibreweb/calibreweb.aarch64.yml b/compose/.apps/calibreweb/calibreweb.aarch64.yml index bbf77ca2f1..43ed5d659c 100644 --- a/compose/.apps/calibreweb/calibreweb.aarch64.yml +++ b/compose/.apps/calibreweb/calibreweb.aarch64.yml @@ -1,3 +1,3 @@ services: - calibreweb: - image: lscr.io/linuxserver/calibre-web:${CALIBREWEB_TAG} + ${_appname_}: + image: lscr.io/linuxserver/calibre-web:${${_APPNAME_}_TAG} diff --git a/compose/.apps/calibreweb/calibreweb.hostname.yml b/compose/.apps/calibreweb/calibreweb.hostname.yml index bfdb20c394..4dc53c3782 100644 --- a/compose/.apps/calibreweb/calibreweb.hostname.yml +++ b/compose/.apps/calibreweb/calibreweb.hostname.yml @@ -1,3 +1,3 @@ services: - calibreweb: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/calibreweb/calibreweb.labels.yml b/compose/.apps/calibreweb/calibreweb.labels.yml index 3e33375043..16ed98cc47 100644 --- a/compose/.apps/calibreweb/calibreweb.labels.yml +++ b/compose/.apps/calibreweb/calibreweb.labels.yml @@ -1,12 +1,12 @@ services: - calibreweb: + ${_appname_}: labels: 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" - com.dockstarter.appvars.calibreweb_restart: "unless-stopped" - com.dockstarter.appvars.calibreweb_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8083: "8083" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/calibreweb/calibreweb.netmode.yml b/compose/.apps/calibreweb/calibreweb.netmode.yml index 1569e9a56b..f36884ffb9 100644 --- a/compose/.apps/calibreweb/calibreweb.netmode.yml +++ b/compose/.apps/calibreweb/calibreweb.netmode.yml @@ -1,3 +1,3 @@ services: - calibreweb: - network_mode: ${CALIBREWEB_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/calibreweb/calibreweb.ports.yml b/compose/.apps/calibreweb/calibreweb.ports.yml index e7c96e04d2..1517ed1028 100644 --- a/compose/.apps/calibreweb/calibreweb.ports.yml +++ b/compose/.apps/calibreweb/calibreweb.ports.yml @@ -1,4 +1,4 @@ services: - calibreweb: + ${_appname_}: ports: - - ${CALIBREWEB_PORT_8083}:8083 + - ${${_APPNAME_}_PORT_8083}:8083 diff --git a/compose/.apps/calibreweb/calibreweb.x86_64.yml b/compose/.apps/calibreweb/calibreweb.x86_64.yml index bbf77ca2f1..43ed5d659c 100644 --- a/compose/.apps/calibreweb/calibreweb.x86_64.yml +++ b/compose/.apps/calibreweb/calibreweb.x86_64.yml @@ -1,3 +1,3 @@ services: - calibreweb: - image: lscr.io/linuxserver/calibre-web:${CALIBREWEB_TAG} + ${_appname_}: + image: lscr.io/linuxserver/calibre-web:${${_APPNAME_}_TAG} diff --git a/compose/.apps/calibreweb/calibreweb.yml b/compose/.apps/calibreweb/calibreweb.yml index 12886d2fd4..ace6d5d0ab 100644 --- a/compose/.apps/calibreweb/calibreweb.yml +++ b/compose/.apps/calibreweb/calibreweb.yml @@ -1,12 +1,12 @@ services: - calibreweb: - container_name: ${CALIBREWEB_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${CALIBREWEB_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/calibreweb:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/cloudcmd/cloudcmd.hostname.yml b/compose/.apps/cloudcmd/cloudcmd.hostname.yml index ef18b68840..4dc53c3782 100644 --- a/compose/.apps/cloudcmd/cloudcmd.hostname.yml +++ b/compose/.apps/cloudcmd/cloudcmd.hostname.yml @@ -1,3 +1,3 @@ services: - cloudcmd: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/cloudcmd/cloudcmd.labels.yml b/compose/.apps/cloudcmd/cloudcmd.labels.yml index 175b485f1d..2032c67acd 100644 --- a/compose/.apps/cloudcmd/cloudcmd.labels.yml +++ b/compose/.apps/cloudcmd/cloudcmd.labels.yml @@ -1,13 +1,13 @@ services: - cloudcmd: + ${_appname_}: labels: 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" - com.dockstarter.appvars.cloudcmd_restart: "unless-stopped" - com.dockstarter.appvars.cloudcmd_tag: "latest" - com.dockstarter.appvars.cloudcmd_volume_fsdir: "/mnt/cloudcmd" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8000: "8000" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_fsdir: "/mnt/cloudcmd" diff --git a/compose/.apps/cloudcmd/cloudcmd.netmode.yml b/compose/.apps/cloudcmd/cloudcmd.netmode.yml index 43a4ddde45..f36884ffb9 100644 --- a/compose/.apps/cloudcmd/cloudcmd.netmode.yml +++ b/compose/.apps/cloudcmd/cloudcmd.netmode.yml @@ -1,3 +1,3 @@ services: - cloudcmd: - network_mode: ${CLOUDCMD_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/cloudcmd/cloudcmd.ports.yml b/compose/.apps/cloudcmd/cloudcmd.ports.yml index 7f08226717..33070f8cee 100644 --- a/compose/.apps/cloudcmd/cloudcmd.ports.yml +++ b/compose/.apps/cloudcmd/cloudcmd.ports.yml @@ -1,4 +1,4 @@ services: - cloudcmd: + ${_appname_}: ports: - - ${CLOUDCMD_PORT_8000}:8000 + - ${${_APPNAME_}_PORT_8000}:8000 diff --git a/compose/.apps/cloudcmd/cloudcmd.x86_64.yml b/compose/.apps/cloudcmd/cloudcmd.x86_64.yml index 904849a313..d6c3bc837e 100644 --- a/compose/.apps/cloudcmd/cloudcmd.x86_64.yml +++ b/compose/.apps/cloudcmd/cloudcmd.x86_64.yml @@ -1,3 +1,3 @@ services: - cloudcmd: - image: coderaiser/cloudcmd:${CLOUDCMD_TAG} + ${_appname_}: + image: coderaiser/cloudcmd:${${_APPNAME_}_TAG} diff --git a/compose/.apps/cloudcmd/cloudcmd.yml b/compose/.apps/cloudcmd/cloudcmd.yml index 78e6061cea..b2ca3f2aa0 100644 --- a/compose/.apps/cloudcmd/cloudcmd.yml +++ b/compose/.apps/cloudcmd/cloudcmd.yml @@ -1,11 +1,11 @@ services: - cloudcmd: - container_name: ${CLOUDCMD_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${CLOUDCMD_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/cloudcmd:/root + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/root - ${DOCKER_VOLUME_STORAGE}:/storage - - ${CLOUDCMD_VOLUME_FSDIR}:/mnt/fs + - ${${_APPNAME_}_VOLUME_FSDIR}:/mnt/fs diff --git a/compose/.apps/cloudflareddns/cloudflareddns.aarch64.yml b/compose/.apps/cloudflareddns/cloudflareddns.aarch64.yml index ecea323cb5..0fcd00b639 100644 --- a/compose/.apps/cloudflareddns/cloudflareddns.aarch64.yml +++ b/compose/.apps/cloudflareddns/cloudflareddns.aarch64.yml @@ -1,3 +1,3 @@ services: - cloudflareddns: - image: ghcr.io/hotio/cloudflareddns:${CLOUDFLAREDDNS_TAG} + ${_appname_}: + image: ghcr.io/hotio/cloudflareddns:${${_APPNAME_}_TAG} diff --git a/compose/.apps/cloudflareddns/cloudflareddns.hostname.yml b/compose/.apps/cloudflareddns/cloudflareddns.hostname.yml index f42a9ba8c6..4dc53c3782 100644 --- a/compose/.apps/cloudflareddns/cloudflareddns.hostname.yml +++ b/compose/.apps/cloudflareddns/cloudflareddns.hostname.yml @@ -1,3 +1,3 @@ services: - cloudflareddns: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/cloudflareddns/cloudflareddns.labels.yml b/compose/.apps/cloudflareddns/cloudflareddns.labels.yml index b3c7e1cf89..2a35605b6a 100644 --- a/compose/.apps/cloudflareddns/cloudflareddns.labels.yml +++ b/compose/.apps/cloudflareddns/cloudflareddns.labels.yml @@ -1,20 +1,20 @@ services: - cloudflareddns: + ${_appname_}: labels: 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: "" - com.dockstarter.appvars.cloudflareddns_environment_args: "" - com.dockstarter.appvars.cloudflareddns_environment_detection_mode: "dig-google.com" - com.dockstarter.appvars.cloudflareddns_environment_hosts: "" - com.dockstarter.appvars.cloudflareddns_environment_interval: "300" - com.dockstarter.appvars.cloudflareddns_environment_log_level: "2" - com.dockstarter.appvars.cloudflareddns_environment_recordtypes: "A" - com.dockstarter.appvars.cloudflareddns_environment_user: "" - com.dockstarter.appvars.cloudflareddns_environment_zones: "" - com.dockstarter.appvars.cloudflareddns_restart: "unless-stopped" - com.dockstarter.appvars.cloudflareddns_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_apikey: "" + com.dockstarter.appvars.${_appname_}_environment_apitoken: "" + com.dockstarter.appvars.${_appname_}_environment_args: "" + com.dockstarter.appvars.${_appname_}_environment_detection_mode: "dig-google.com" + com.dockstarter.appvars.${_appname_}_environment_hosts: "" + com.dockstarter.appvars.${_appname_}_environment_interval: "300" + com.dockstarter.appvars.${_appname_}_environment_log_level: "2" + com.dockstarter.appvars.${_appname_}_environment_recordtypes: "A" + com.dockstarter.appvars.${_appname_}_environment_user: "" + com.dockstarter.appvars.${_appname_}_environment_zones: "" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/cloudflareddns/cloudflareddns.netmode.yml b/compose/.apps/cloudflareddns/cloudflareddns.netmode.yml index 3e4a22973a..f36884ffb9 100644 --- a/compose/.apps/cloudflareddns/cloudflareddns.netmode.yml +++ b/compose/.apps/cloudflareddns/cloudflareddns.netmode.yml @@ -1,3 +1,3 @@ services: - cloudflareddns: - network_mode: ${CLOUDFLAREDDNS_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/cloudflareddns/cloudflareddns.x86_64.yml b/compose/.apps/cloudflareddns/cloudflareddns.x86_64.yml index ecea323cb5..0fcd00b639 100644 --- a/compose/.apps/cloudflareddns/cloudflareddns.x86_64.yml +++ b/compose/.apps/cloudflareddns/cloudflareddns.x86_64.yml @@ -1,3 +1,3 @@ services: - cloudflareddns: - image: ghcr.io/hotio/cloudflareddns:${CLOUDFLAREDDNS_TAG} + ${_appname_}: + image: ghcr.io/hotio/cloudflareddns:${${_APPNAME_}_TAG} diff --git a/compose/.apps/cloudflareddns/cloudflareddns.yml b/compose/.apps/cloudflareddns/cloudflareddns.yml index 1689c86d7a..066231709c 100644 --- a/compose/.apps/cloudflareddns/cloudflareddns.yml +++ b/compose/.apps/cloudflareddns/cloudflareddns.yml @@ -1,22 +1,22 @@ services: - cloudflareddns: - container_name: ${CLOUDFLAREDDNS_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - ARGS=${CLOUDFLAREDDNS_ENVIRONMENT_ARGS} - - CF_APIKEY=${CLOUDFLAREDDNS_ENVIRONMENT_APIKEY} - - CF_APITOKEN=${CLOUDFLAREDDNS_ENVIRONMENT_APITOKEN} - - CF_HOSTS=${CLOUDFLAREDDNS_ENVIRONMENT_HOSTS} - - CF_RECORDTYPES=${CLOUDFLAREDDNS_ENVIRONMENT_RECORDTYPES} - - CF_USER=${CLOUDFLAREDDNS_ENVIRONMENT_USER} - - CF_ZONES=${CLOUDFLAREDDNS_ENVIRONMENT_ZONES} - - DETECTION_MODE=${CLOUDFLAREDDNS_ENVIRONMENT_DETECTION_MODE} - - INTERVAL=${CLOUDFLAREDDNS_ENVIRONMENT_INTERVAL} - - LOG_LEVEL=${CLOUDFLAREDDNS_ENVIRONMENT_LOG_LEVEL} + - ARGS=${${_APPNAME_}_ENVIRONMENT_ARGS} + - CF_APIKEY=${${_APPNAME_}_ENVIRONMENT_APIKEY} + - CF_APITOKEN=${${_APPNAME_}_ENVIRONMENT_APITOKEN} + - CF_HOSTS=${${_APPNAME_}_ENVIRONMENT_HOSTS} + - CF_RECORDTYPES=${${_APPNAME_}_ENVIRONMENT_RECORDTYPES} + - CF_USER=${${_APPNAME_}_ENVIRONMENT_USER} + - CF_ZONES=${${_APPNAME_}_ENVIRONMENT_ZONES} + - DETECTION_MODE=${${_APPNAME_}_ENVIRONMENT_DETECTION_MODE} + - INTERVAL=${${_APPNAME_}_ENVIRONMENT_INTERVAL} + - LOG_LEVEL=${${_APPNAME_}_ENVIRONMENT_LOG_LEVEL} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${CLOUDFLAREDDNS_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/cloudflareddns:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/codeserver/codeserver.aarch64.yml b/compose/.apps/codeserver/codeserver.aarch64.yml index 422b523ea0..0195891ae5 100644 --- a/compose/.apps/codeserver/codeserver.aarch64.yml +++ b/compose/.apps/codeserver/codeserver.aarch64.yml @@ -1,3 +1,3 @@ services: - codeserver: - image: lscr.io/linuxserver/code-server:${CODESERVER_TAG} + ${_appname_}: + image: lscr.io/linuxserver/code-server:${${_APPNAME_}_TAG} diff --git a/compose/.apps/codeserver/codeserver.hostname.yml b/compose/.apps/codeserver/codeserver.hostname.yml index 059cdd55e7..4dc53c3782 100644 --- a/compose/.apps/codeserver/codeserver.hostname.yml +++ b/compose/.apps/codeserver/codeserver.hostname.yml @@ -1,3 +1,3 @@ services: - codeserver: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/codeserver/codeserver.labels.yml b/compose/.apps/codeserver/codeserver.labels.yml index 41bfe8a96f..bd597c4b00 100644 --- a/compose/.apps/codeserver/codeserver.labels.yml +++ b/compose/.apps/codeserver/codeserver.labels.yml @@ -1,14 +1,14 @@ services: - codeserver: + ${_appname_}: labels: 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: "" - com.dockstarter.appvars.codeserver_network_mode: "" - com.dockstarter.appvars.codeserver_port_8443: "8443" - com.dockstarter.appvars.codeserver_restart: "unless-stopped" - com.dockstarter.appvars.codeserver_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_password: "" + com.dockstarter.appvars.${_appname_}_environment_sudo_password: "" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8443: "8443" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/codeserver/codeserver.netmode.yml b/compose/.apps/codeserver/codeserver.netmode.yml index 5b61ff35e0..f36884ffb9 100644 --- a/compose/.apps/codeserver/codeserver.netmode.yml +++ b/compose/.apps/codeserver/codeserver.netmode.yml @@ -1,3 +1,3 @@ services: - codeserver: - network_mode: ${CODESERVER_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/codeserver/codeserver.ports.yml b/compose/.apps/codeserver/codeserver.ports.yml index 2616d91b67..2c5eae0965 100644 --- a/compose/.apps/codeserver/codeserver.ports.yml +++ b/compose/.apps/codeserver/codeserver.ports.yml @@ -1,4 +1,4 @@ services: - codeserver: + ${_appname_}: ports: - - ${CODESERVER_PORT_8443}:8443 + - ${${_APPNAME_}_PORT_8443}:8443 diff --git a/compose/.apps/codeserver/codeserver.x86_64.yml b/compose/.apps/codeserver/codeserver.x86_64.yml index 422b523ea0..0195891ae5 100644 --- a/compose/.apps/codeserver/codeserver.x86_64.yml +++ b/compose/.apps/codeserver/codeserver.x86_64.yml @@ -1,3 +1,3 @@ services: - codeserver: - image: lscr.io/linuxserver/code-server:${CODESERVER_TAG} + ${_appname_}: + image: lscr.io/linuxserver/code-server:${${_APPNAME_}_TAG} diff --git a/compose/.apps/codeserver/codeserver.yml b/compose/.apps/codeserver/codeserver.yml index 8c422792ca..0daec46f1a 100644 --- a/compose/.apps/codeserver/codeserver.yml +++ b/compose/.apps/codeserver/codeserver.yml @@ -1,14 +1,14 @@ services: - codeserver: - container_name: ${CODESERVER_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - PASSWORD=${CODESERVER_ENVIRONMENT_PASSWORD} + - PASSWORD=${${_APPNAME_}_ENVIRONMENT_PASSWORD} - PGID=${PGID} - PUID=${PUID} - - SUDO_PASSWORD=${CODESERVER_ENVIRONMENT_SUDO_PASSWORD} + - SUDO_PASSWORD=${${_APPNAME_}_ENVIRONMENT_SUDO_PASSWORD} - TZ=${TZ} - restart: ${CODESERVER_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/codeserver:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/couchpotato/couchpotato.aarch64.yml b/compose/.apps/couchpotato/couchpotato.aarch64.yml index fdfd3167ac..5fcb384898 100644 --- a/compose/.apps/couchpotato/couchpotato.aarch64.yml +++ b/compose/.apps/couchpotato/couchpotato.aarch64.yml @@ -1,3 +1,3 @@ services: - couchpotato: - image: lscr.io/linuxserver/couchpotato:${COUCHPOTATO_TAG} + ${_appname_}: + image: lscr.io/linuxserver/couchpotato:${${_APPNAME_}_TAG} diff --git a/compose/.apps/couchpotato/couchpotato.hostname.yml b/compose/.apps/couchpotato/couchpotato.hostname.yml index c1f2a27369..4dc53c3782 100644 --- a/compose/.apps/couchpotato/couchpotato.hostname.yml +++ b/compose/.apps/couchpotato/couchpotato.hostname.yml @@ -1,3 +1,3 @@ services: - couchpotato: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/couchpotato/couchpotato.labels.yml b/compose/.apps/couchpotato/couchpotato.labels.yml index 0b9326e9b3..60dc6dd7fd 100644 --- a/compose/.apps/couchpotato/couchpotato.labels.yml +++ b/compose/.apps/couchpotato/couchpotato.labels.yml @@ -1,12 +1,12 @@ services: - couchpotato: + ${_appname_}: labels: 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" - com.dockstarter.appvars.couchpotato_restart: "unless-stopped" - com.dockstarter.appvars.couchpotato_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_5050: "5050" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/couchpotato/couchpotato.netmode.yml b/compose/.apps/couchpotato/couchpotato.netmode.yml index be91126d5c..f36884ffb9 100644 --- a/compose/.apps/couchpotato/couchpotato.netmode.yml +++ b/compose/.apps/couchpotato/couchpotato.netmode.yml @@ -1,3 +1,3 @@ services: - couchpotato: - network_mode: ${COUCHPOTATO_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/couchpotato/couchpotato.ports.yml b/compose/.apps/couchpotato/couchpotato.ports.yml index 9ac50cadf6..f1b78a6ace 100644 --- a/compose/.apps/couchpotato/couchpotato.ports.yml +++ b/compose/.apps/couchpotato/couchpotato.ports.yml @@ -1,4 +1,4 @@ services: - couchpotato: + ${_appname_}: ports: - - ${COUCHPOTATO_PORT_5050}:5050 + - ${${_APPNAME_}_PORT_5050}:5050 diff --git a/compose/.apps/couchpotato/couchpotato.x86_64.yml b/compose/.apps/couchpotato/couchpotato.x86_64.yml index fdfd3167ac..5fcb384898 100644 --- a/compose/.apps/couchpotato/couchpotato.x86_64.yml +++ b/compose/.apps/couchpotato/couchpotato.x86_64.yml @@ -1,3 +1,3 @@ services: - couchpotato: - image: lscr.io/linuxserver/couchpotato:${COUCHPOTATO_TAG} + ${_appname_}: + image: lscr.io/linuxserver/couchpotato:${${_APPNAME_}_TAG} diff --git a/compose/.apps/couchpotato/couchpotato.yml b/compose/.apps/couchpotato/couchpotato.yml index 1dba36e942..ace6d5d0ab 100644 --- a/compose/.apps/couchpotato/couchpotato.yml +++ b/compose/.apps/couchpotato/couchpotato.yml @@ -1,12 +1,12 @@ services: - couchpotato: - container_name: ${COUCHPOTATO_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${COUCHPOTATO_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/couchpotato:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/dasshio/dasshio.aarch64.yml b/compose/.apps/dasshio/dasshio.aarch64.yml index b1c2c28098..83e2cd0300 100644 --- a/compose/.apps/dasshio/dasshio.aarch64.yml +++ b/compose/.apps/dasshio/dasshio.aarch64.yml @@ -1,3 +1,3 @@ services: - dasshio: - image: danimtb/aarch64-dasshio:${DASSHIO_TAG} + ${_appname_}: + image: danimtb/aarch64-dasshio:${${_APPNAME_}_TAG} diff --git a/compose/.apps/dasshio/dasshio.hostname.yml b/compose/.apps/dasshio/dasshio.hostname.yml index bb8551eac7..4dc53c3782 100644 --- a/compose/.apps/dasshio/dasshio.hostname.yml +++ b/compose/.apps/dasshio/dasshio.hostname.yml @@ -1,3 +1,3 @@ services: - dasshio: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/dasshio/dasshio.labels.yml b/compose/.apps/dasshio/dasshio.labels.yml index c15699ba13..857f4b31a0 100644 --- a/compose/.apps/dasshio/dasshio.labels.yml +++ b/compose/.apps/dasshio/dasshio.labels.yml @@ -1,14 +1,14 @@ services: - dasshio: + ${_appname_}: labels: 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: "" - com.dockstarter.appvars.dasshio_network_mode: "" - com.dockstarter.appvars.dasshio_port_6565: "6565" - com.dockstarter.appvars.dasshio_restart: "unless-stopped" - com.dockstarter.appvars.dasshio_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_homeassistant_auth_token: "" + com.dockstarter.appvars.${_appname_}_environment_homeassistant_url: "" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_6565: "6565" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/dasshio/dasshio.netmode.yml b/compose/.apps/dasshio/dasshio.netmode.yml index 8be21a5a8c..f36884ffb9 100644 --- a/compose/.apps/dasshio/dasshio.netmode.yml +++ b/compose/.apps/dasshio/dasshio.netmode.yml @@ -1,3 +1,3 @@ services: - dasshio: - network_mode: ${DASSHIO_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/dasshio/dasshio.ports.yml b/compose/.apps/dasshio/dasshio.ports.yml index ea906b5bd0..ae1c403f15 100644 --- a/compose/.apps/dasshio/dasshio.ports.yml +++ b/compose/.apps/dasshio/dasshio.ports.yml @@ -1,4 +1,4 @@ services: - dasshio: + ${_appname_}: ports: - - ${DASSHIO_PORT_6565}:6565 + - ${${_APPNAME_}_PORT_6565}:6565 diff --git a/compose/.apps/dasshio/dasshio.x86_64.yml b/compose/.apps/dasshio/dasshio.x86_64.yml index 0c9e5300af..08c9dce2a9 100644 --- a/compose/.apps/dasshio/dasshio.x86_64.yml +++ b/compose/.apps/dasshio/dasshio.x86_64.yml @@ -1,3 +1,3 @@ services: - dasshio: - image: danimtb/amd64-dasshio:${DASSHIO_TAG} + ${_appname_}: + image: danimtb/amd64-dasshio:${${_APPNAME_}_TAG} diff --git a/compose/.apps/dasshio/dasshio.yml b/compose/.apps/dasshio/dasshio.yml index f4db355449..3bc5709ca6 100644 --- a/compose/.apps/dasshio/dasshio.yml +++ b/compose/.apps/dasshio/dasshio.yml @@ -1,12 +1,12 @@ services: - dasshio: - container_name: ${DASSHIO_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - HA_BASE_URL=${DASSHIO_ENVIRONMENT_HOMEASSISTANT_URL} - - HASSIO_TOKEN=${DASSHIO_ENVIRONMENT_HOMEASSISTANT_AUTH_TOKEN} + - HA_BASE_URL=${${_APPNAME_}_ENVIRONMENT_HOMEASSISTANT_URL} + - HASSIO_TOKEN=${${_APPNAME_}_ENVIRONMENT_HOMEASSISTANT_AUTH_TOKEN} - TZ=${TZ} - restart: ${DASSHIO_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/dasshio:/data + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/ddclient/ddclient.aarch64.yml b/compose/.apps/ddclient/ddclient.aarch64.yml index 5519c91cb6..a4afafeaa2 100644 --- a/compose/.apps/ddclient/ddclient.aarch64.yml +++ b/compose/.apps/ddclient/ddclient.aarch64.yml @@ -1,3 +1,3 @@ services: - ddclient: - image: lscr.io/linuxserver/ddclient:${DDCLIENT_TAG} + ${_appname_}: + image: lscr.io/linuxserver/ddclient:${${_APPNAME_}_TAG} diff --git a/compose/.apps/ddclient/ddclient.hostname.yml b/compose/.apps/ddclient/ddclient.hostname.yml index 133b274c82..4dc53c3782 100644 --- a/compose/.apps/ddclient/ddclient.hostname.yml +++ b/compose/.apps/ddclient/ddclient.hostname.yml @@ -1,3 +1,3 @@ services: - ddclient: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/ddclient/ddclient.labels.yml b/compose/.apps/ddclient/ddclient.labels.yml index 23842c241c..b224bc5ec9 100644 --- a/compose/.apps/ddclient/ddclient.labels.yml +++ b/compose/.apps/ddclient/ddclient.labels.yml @@ -1,11 +1,11 @@ services: - ddclient: + ${_appname_}: labels: 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" - com.dockstarter.appvars.ddclient_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/ddclient/ddclient.netmode.yml b/compose/.apps/ddclient/ddclient.netmode.yml index 92dd148e4e..f36884ffb9 100644 --- a/compose/.apps/ddclient/ddclient.netmode.yml +++ b/compose/.apps/ddclient/ddclient.netmode.yml @@ -1,3 +1,3 @@ services: - ddclient: - network_mode: ${DDCLIENT_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/ddclient/ddclient.x86_64.yml b/compose/.apps/ddclient/ddclient.x86_64.yml index 5519c91cb6..a4afafeaa2 100644 --- a/compose/.apps/ddclient/ddclient.x86_64.yml +++ b/compose/.apps/ddclient/ddclient.x86_64.yml @@ -1,3 +1,3 @@ services: - ddclient: - image: lscr.io/linuxserver/ddclient:${DDCLIENT_TAG} + ${_appname_}: + image: lscr.io/linuxserver/ddclient:${${_APPNAME_}_TAG} diff --git a/compose/.apps/ddclient/ddclient.yml b/compose/.apps/ddclient/ddclient.yml index b55b9bd718..ace6d5d0ab 100644 --- a/compose/.apps/ddclient/ddclient.yml +++ b/compose/.apps/ddclient/ddclient.yml @@ -1,12 +1,12 @@ services: - ddclient: - container_name: ${DDCLIENT_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${DDCLIENT_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/ddclient:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/deemix/deemix.aarch64.yml b/compose/.apps/deemix/deemix.aarch64.yml index 2c96ff4095..dc66b220c8 100644 --- a/compose/.apps/deemix/deemix.aarch64.yml +++ b/compose/.apps/deemix/deemix.aarch64.yml @@ -1,3 +1,3 @@ services: - deemix: - image: registry.gitlab.com/bockiii/deemix-docker:${DEEMIX_TAG} + ${_appname_}: + image: registry.gitlab.com/bockiii/deemix-docker:${${_APPNAME_}_TAG} diff --git a/compose/.apps/deemix/deemix.hostname.yml b/compose/.apps/deemix/deemix.hostname.yml index 7654d052d0..4dc53c3782 100644 --- a/compose/.apps/deemix/deemix.hostname.yml +++ b/compose/.apps/deemix/deemix.hostname.yml @@ -1,3 +1,3 @@ services: - deemix: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/deemix/deemix.labels.yml b/compose/.apps/deemix/deemix.labels.yml index a23bec2e72..b5689583dd 100644 --- a/compose/.apps/deemix/deemix.labels.yml +++ b/compose/.apps/deemix/deemix.labels.yml @@ -1,12 +1,12 @@ services: - deemix: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Download music from Deezer via Deemix" com.dockstarter.appinfo.nicename: "Deemix" - com.dockstarter.appvars.deemix_container_name: "deemix" - com.dockstarter.appvars.deemix_enabled: "false" - com.dockstarter.appvars.deemix_network_mode: "" - com.dockstarter.appvars.deemix_port_6595: "6595" - com.dockstarter.appvars.deemix_restart: "unless-stopped" - com.dockstarter.appvars.deemix_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_6595: "6595" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/deemix/deemix.netmode.yml b/compose/.apps/deemix/deemix.netmode.yml index 3c2512d729..f36884ffb9 100644 --- a/compose/.apps/deemix/deemix.netmode.yml +++ b/compose/.apps/deemix/deemix.netmode.yml @@ -1,3 +1,3 @@ services: - deemix: - network_mode: ${DEEMIX_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/deemix/deemix.ports.yml b/compose/.apps/deemix/deemix.ports.yml index 79ab182282..6f499a0231 100644 --- a/compose/.apps/deemix/deemix.ports.yml +++ b/compose/.apps/deemix/deemix.ports.yml @@ -1,4 +1,4 @@ services: - deemix: + ${_appname_}: ports: - - ${DEEMIX_PORT_6595}:6595 + - ${${_APPNAME_}_PORT_6595}:6595 diff --git a/compose/.apps/deemix/deemix.x86_64.yml b/compose/.apps/deemix/deemix.x86_64.yml index 2c96ff4095..dc66b220c8 100644 --- a/compose/.apps/deemix/deemix.x86_64.yml +++ b/compose/.apps/deemix/deemix.x86_64.yml @@ -1,3 +1,3 @@ services: - deemix: - image: registry.gitlab.com/bockiii/deemix-docker:${DEEMIX_TAG} + ${_appname_}: + image: registry.gitlab.com/bockiii/deemix-docker:${${_APPNAME_}_TAG} diff --git a/compose/.apps/deemix/deemix.yml b/compose/.apps/deemix/deemix.yml index d164b821cb..ace6d5d0ab 100644 --- a/compose/.apps/deemix/deemix.yml +++ b/compose/.apps/deemix/deemix.yml @@ -1,12 +1,12 @@ services: - deemix: - container_name: ${DEEMIX_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${DEEMIX_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/deemix:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/deluge/deluge.aarch64.yml b/compose/.apps/deluge/deluge.aarch64.yml index 5fdcadbb58..a28ac72ea4 100644 --- a/compose/.apps/deluge/deluge.aarch64.yml +++ b/compose/.apps/deluge/deluge.aarch64.yml @@ -1,3 +1,3 @@ services: - deluge: - image: lscr.io/linuxserver/deluge:${DELUGE_TAG} + ${_appname_}: + image: lscr.io/linuxserver/deluge:${${_APPNAME_}_TAG} diff --git a/compose/.apps/deluge/deluge.hostname.yml b/compose/.apps/deluge/deluge.hostname.yml index 0929f7c189..4dc53c3782 100644 --- a/compose/.apps/deluge/deluge.hostname.yml +++ b/compose/.apps/deluge/deluge.hostname.yml @@ -1,3 +1,3 @@ services: - deluge: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/deluge/deluge.labels.yml b/compose/.apps/deluge/deluge.labels.yml index 65a97105b6..f0ff592e63 100644 --- a/compose/.apps/deluge/deluge.labels.yml +++ b/compose/.apps/deluge/deluge.labels.yml @@ -1,16 +1,16 @@ services: - deluge: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Lightweight, Full-featured BitTorrent client" com.dockstarter.appinfo.nicename: "Deluge" - com.dockstarter.appvars.deluge_container_name: "deluge" - com.dockstarter.appvars.deluge_enabled: "false" - com.dockstarter.appvars.deluge_network_mode: "" - com.dockstarter.appvars.deluge_port_51413: "51413" - com.dockstarter.appvars.deluge_port_58846: "58846" - com.dockstarter.appvars.deluge_port_58946: "58946" - com.dockstarter.appvars.deluge_port_6881: "6881" - com.dockstarter.appvars.deluge_port_8112: "8112" - com.dockstarter.appvars.deluge_restart: "unless-stopped" - com.dockstarter.appvars.deluge_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_51413: "51413" + com.dockstarter.appvars.${_appname_}_port_58846: "58846" + com.dockstarter.appvars.${_appname_}_port_58946: "58946" + com.dockstarter.appvars.${_appname_}_port_6881: "6881" + com.dockstarter.appvars.${_appname_}_port_8112: "8112" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/deluge/deluge.netmode.yml b/compose/.apps/deluge/deluge.netmode.yml index b1183bf73a..f36884ffb9 100644 --- a/compose/.apps/deluge/deluge.netmode.yml +++ b/compose/.apps/deluge/deluge.netmode.yml @@ -1,3 +1,3 @@ services: - deluge: - network_mode: ${DELUGE_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/deluge/deluge.ports.yml b/compose/.apps/deluge/deluge.ports.yml index 71ed93d980..7834b9a2d0 100644 --- a/compose/.apps/deluge/deluge.ports.yml +++ b/compose/.apps/deluge/deluge.ports.yml @@ -1,10 +1,10 @@ services: - deluge: + ${_appname_}: ports: - - ${DELUGE_PORT_51413}:51413 - - ${DELUGE_PORT_51413}:51413/udp - - ${DELUGE_PORT_58846}:58846 - - ${DELUGE_PORT_58946}:58946 - - ${DELUGE_PORT_6881}:6881 - - ${DELUGE_PORT_6881}:6881/udp - - ${DELUGE_PORT_8112}:8112 + - ${${_APPNAME_}_PORT_51413}:51413 + - ${${_APPNAME_}_PORT_51413}:51413/udp + - ${${_APPNAME_}_PORT_58846}:58846 + - ${${_APPNAME_}_PORT_58946}:58946 + - ${${_APPNAME_}_PORT_6881}:6881 + - ${${_APPNAME_}_PORT_6881}:6881/udp + - ${${_APPNAME_}_PORT_8112}:8112 diff --git a/compose/.apps/deluge/deluge.x86_64.yml b/compose/.apps/deluge/deluge.x86_64.yml index 5fdcadbb58..a28ac72ea4 100644 --- a/compose/.apps/deluge/deluge.x86_64.yml +++ b/compose/.apps/deluge/deluge.x86_64.yml @@ -1,3 +1,3 @@ services: - deluge: - image: lscr.io/linuxserver/deluge:${DELUGE_TAG} + ${_appname_}: + image: lscr.io/linuxserver/deluge:${${_APPNAME_}_TAG} diff --git a/compose/.apps/deluge/deluge.yml b/compose/.apps/deluge/deluge.yml index f943e71c18..ace6d5d0ab 100644 --- a/compose/.apps/deluge/deluge.yml +++ b/compose/.apps/deluge/deluge.yml @@ -1,12 +1,12 @@ services: - deluge: - container_name: ${DELUGE_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${DELUGE_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/deluge:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/delugevpn/delugevpn.aarch64.yml b/compose/.apps/delugevpn/delugevpn.aarch64.yml index 5c20a381dc..45b93a94f0 100644 --- a/compose/.apps/delugevpn/delugevpn.aarch64.yml +++ b/compose/.apps/delugevpn/delugevpn.aarch64.yml @@ -1,3 +1,3 @@ services: - delugevpn: - image: ghcr.io/binhex/arch-delugevpn:${DELUGEVPN_TAG} + ${_appname_}: + image: ghcr.io/binhex/arch-delugevpn:${${_APPNAME_}_TAG} diff --git a/compose/.apps/delugevpn/delugevpn.hostname.yml b/compose/.apps/delugevpn/delugevpn.hostname.yml index ced2b7b4ee..4dc53c3782 100644 --- a/compose/.apps/delugevpn/delugevpn.hostname.yml +++ b/compose/.apps/delugevpn/delugevpn.hostname.yml @@ -1,3 +1,3 @@ services: - delugevpn: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/delugevpn/delugevpn.labels.yml b/compose/.apps/delugevpn/delugevpn.labels.yml index 8e42fab1f7..3a292dc661 100644 --- a/compose/.apps/delugevpn/delugevpn.labels.yml +++ b/compose/.apps/delugevpn/delugevpn.labels.yml @@ -1,26 +1,26 @@ services: - delugevpn: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Deluge with PrivoxyVPN" com.dockstarter.appinfo.nicename: "DelugeVPN" - com.dockstarter.appvars.delugevpn_container_name: "delugevpn" - com.dockstarter.appvars.delugevpn_enabled: "false" - com.dockstarter.appvars.delugevpn_environment_enable_privoxy: "no" - com.dockstarter.appvars.delugevpn_environment_lan_network: "192.168.x.x/24" - com.dockstarter.appvars.delugevpn_environment_name_servers: "1.1.1.1,8.8.8.8" - com.dockstarter.appvars.delugevpn_environment_vpn_client: "openvpn" - com.dockstarter.appvars.delugevpn_environment_vpn_enable: "no" - com.dockstarter.appvars.delugevpn_environment_vpn_input_ports: "" - com.dockstarter.appvars.delugevpn_environment_vpn_options: "" - com.dockstarter.appvars.delugevpn_environment_vpn_output_ports: "" - com.dockstarter.appvars.delugevpn_environment_vpn_pass: "your-vpn-pass" - com.dockstarter.appvars.delugevpn_environment_vpn_prov: "custom" - com.dockstarter.appvars.delugevpn_environment_vpn_user: "your-vpn-user" - com.dockstarter.appvars.delugevpn_network_mode: "" - com.dockstarter.appvars.delugevpn_port_58846: "58846" - com.dockstarter.appvars.delugevpn_port_58946: "58946" - com.dockstarter.appvars.delugevpn_port_8112: "8112" - com.dockstarter.appvars.delugevpn_port_8118: "8118" - com.dockstarter.appvars.delugevpn_restart: "unless-stopped" - com.dockstarter.appvars.delugevpn_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_enable_privoxy: "no" + com.dockstarter.appvars.${_appname_}_environment_lan_network: "192.168.x.x/24" + com.dockstarter.appvars.${_appname_}_environment_name_servers: "1.1.1.1,8.8.8.8" + com.dockstarter.appvars.${_appname_}_environment_vpn_client: "openvpn" + com.dockstarter.appvars.${_appname_}_environment_vpn_enable: "no" + com.dockstarter.appvars.${_appname_}_environment_vpn_input_ports: "" + com.dockstarter.appvars.${_appname_}_environment_vpn_options: "" + com.dockstarter.appvars.${_appname_}_environment_vpn_output_ports: "" + com.dockstarter.appvars.${_appname_}_environment_vpn_pass: "your-vpn-pass" + com.dockstarter.appvars.${_appname_}_environment_vpn_prov: "custom" + com.dockstarter.appvars.${_appname_}_environment_vpn_user: "your-vpn-user" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_58846: "58846" + com.dockstarter.appvars.${_appname_}_port_58946: "58946" + com.dockstarter.appvars.${_appname_}_port_8112: "8112" + com.dockstarter.appvars.${_appname_}_port_8118: "8118" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/delugevpn/delugevpn.netmode.yml b/compose/.apps/delugevpn/delugevpn.netmode.yml index 2e0eccfa9b..f36884ffb9 100644 --- a/compose/.apps/delugevpn/delugevpn.netmode.yml +++ b/compose/.apps/delugevpn/delugevpn.netmode.yml @@ -1,3 +1,3 @@ services: - delugevpn: - network_mode: ${DELUGEVPN_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/delugevpn/delugevpn.ports.yml b/compose/.apps/delugevpn/delugevpn.ports.yml index a9c99e3214..e81d6e259b 100644 --- a/compose/.apps/delugevpn/delugevpn.ports.yml +++ b/compose/.apps/delugevpn/delugevpn.ports.yml @@ -1,8 +1,8 @@ services: - delugevpn: + ${_appname_}: ports: - - ${DELUGEVPN_PORT_58846}:58846 - - ${DELUGEVPN_PORT_58946}:58946 - - ${DELUGEVPN_PORT_6881}:6881 - - ${DELUGEVPN_PORT_8112}:8112 - - ${DELUGEVPN_PORT_8118}:8118 + - ${${_APPNAME_}_PORT_58846}:58846 + - ${${_APPNAME_}_PORT_58946}:58946 + - ${${_APPNAME_}_PORT_6881}:6881 + - ${${_APPNAME_}_PORT_8112}:8112 + - ${${_APPNAME_}_PORT_8118}:8118 diff --git a/compose/.apps/delugevpn/delugevpn.x86_64.yml b/compose/.apps/delugevpn/delugevpn.x86_64.yml index 5c20a381dc..45b93a94f0 100644 --- a/compose/.apps/delugevpn/delugevpn.x86_64.yml +++ b/compose/.apps/delugevpn/delugevpn.x86_64.yml @@ -1,3 +1,3 @@ services: - delugevpn: - image: ghcr.io/binhex/arch-delugevpn:${DELUGEVPN_TAG} + ${_appname_}: + image: ghcr.io/binhex/arch-delugevpn:${${_APPNAME_}_TAG} diff --git a/compose/.apps/delugevpn/delugevpn.yml b/compose/.apps/delugevpn/delugevpn.yml index 6f6eceb00a..7cc77e89ea 100644 --- a/compose/.apps/delugevpn/delugevpn.yml +++ b/compose/.apps/delugevpn/delugevpn.yml @@ -1,29 +1,29 @@ services: - delugevpn: + ${_appname_}: cap_add: - NET_ADMIN - SYS_MODULE - container_name: ${DELUGEVPN_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - ENABLE_PRIVOXY=${DELUGEVPN_ENVIRONMENT_ENABLE_PRIVOXY} - - LAN_NETWORK=${DELUGEVPN_ENVIRONMENT_LAN_NETWORK} - - NAME_SERVERS=${DELUGEVPN_ENVIRONMENT_NAME_SERVERS} + - ENABLE_PRIVOXY=${${_APPNAME_}_ENVIRONMENT_ENABLE_PRIVOXY} + - LAN_NETWORK=${${_APPNAME_}_ENVIRONMENT_LAN_NETWORK} + - NAME_SERVERS=${${_APPNAME_}_ENVIRONMENT_NAME_SERVERS} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - VPN_CLIENT=${DELUGEVPN_ENVIRONMENT_VPN_CLIENT} - - VPN_ENABLED=${DELUGEVPN_ENVIRONMENT_VPN_ENABLE} - - VPN_INPUT_PORTS=${DELUGEVPN_ENVIRONMENT_VPN_INPUT_PORTS} - - VPN_OPTIONS=${DELUGEVPN_ENVIRONMENT_VPN_OPTIONS} - - VPN_OUTPUT_PORTS=${DELUGEVPN_ENVIRONMENT_VPN_OUTPUT_PORTS} - - VPN_PASS=${DELUGEVPN_ENVIRONMENT_VPN_PASS} - - VPN_PROV=${DELUGEVPN_ENVIRONMENT_VPN_PROV} - - VPN_USER=${DELUGEVPN_ENVIRONMENT_VPN_USER} + - VPN_CLIENT=${${_APPNAME_}_ENVIRONMENT_VPN_CLIENT} + - VPN_ENABLED=${${_APPNAME_}_ENVIRONMENT_VPN_ENABLE} + - VPN_INPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_VPN_INPUT_PORTS} + - VPN_OPTIONS=${${_APPNAME_}_ENVIRONMENT_VPN_OPTIONS} + - VPN_OUTPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_VPN_OUTPUT_PORTS} + - VPN_PASS=${${_APPNAME_}_ENVIRONMENT_VPN_PASS} + - VPN_PROV=${${_APPNAME_}_ENVIRONMENT_VPN_PROV} + - VPN_USER=${${_APPNAME_}_ENVIRONMENT_VPN_USER} privileged: true - restart: ${DELUGEVPN_RESTART} + restart: ${${_APPNAME_}_RESTART} sysctls: - net.ipv4.conf.all.src_valid_mark=1 volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/delugevpn:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/doplarr/doplarr.aarch64.yml b/compose/.apps/doplarr/doplarr.aarch64.yml index c9d3e5295d..8921ae982c 100644 --- a/compose/.apps/doplarr/doplarr.aarch64.yml +++ b/compose/.apps/doplarr/doplarr.aarch64.yml @@ -1,3 +1,3 @@ services: - doplarr: - image: lscr.io/linuxserver/doplarr:${DOPLARR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/doplarr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/doplarr/doplarr.hostname.yml b/compose/.apps/doplarr/doplarr.hostname.yml index c3ca571d81..4dc53c3782 100644 --- a/compose/.apps/doplarr/doplarr.hostname.yml +++ b/compose/.apps/doplarr/doplarr.hostname.yml @@ -1,3 +1,3 @@ services: - doplarr: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/doplarr/doplarr.labels.yml b/compose/.apps/doplarr/doplarr.labels.yml index 74f10303d4..1f2fbf739b 100644 --- a/compose/.apps/doplarr/doplarr.labels.yml +++ b/compose/.apps/doplarr/doplarr.labels.yml @@ -1,29 +1,29 @@ services: - doplarr: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "An *arr request bot for Discord" com.dockstarter.appinfo.nicename: "Doplarr" - com.dockstarter.appvars.doplarr_container_name: "doplarr" - com.dockstarter.appvars.doplarr_enabled: "false" - com.dockstarter.appvars.doplarr_environment_discord__max_results: "25" - com.dockstarter.appvars.doplarr_environment_discord__requested_msg_style: ":plain" - com.dockstarter.appvars.doplarr_environment_discord__token: "" - com.dockstarter.appvars.doplarr_environment_java_opts: "" - com.dockstarter.appvars.doplarr_environment_log_level: ":info" - com.dockstarter.appvars.doplarr_environment_overseerr__api: "" - com.dockstarter.appvars.doplarr_environment_overseerr__default_id: "" - com.dockstarter.appvars.doplarr_environment_overseerr__url: "http://overseerr:5055" - com.dockstarter.appvars.doplarr_environment_partial_seasons: "true" - com.dockstarter.appvars.doplarr_environment_radarr__api: "" - com.dockstarter.appvars.doplarr_environment_radarr__quality_profile: "" - com.dockstarter.appvars.doplarr_environment_radarr__rootfolder: "" - com.dockstarter.appvars.doplarr_environment_radarr__url: "http://radarr:7878" - com.dockstarter.appvars.doplarr_environment_sonarr__api: "" - com.dockstarter.appvars.doplarr_environment_sonarr__language_profile: "" - com.dockstarter.appvars.doplarr_environment_sonarr__quality_profile: "" - com.dockstarter.appvars.doplarr_environment_sonarr__rootfolder: "" - com.dockstarter.appvars.doplarr_environment_sonarr__url: "http://sonarr:8989" - com.dockstarter.appvars.doplarr_network_mode: "" - com.dockstarter.appvars.doplarr_restart: "unless-stopped" - com.dockstarter.appvars.doplarr_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_discord__max_results: "25" + com.dockstarter.appvars.${_appname_}_environment_discord__requested_msg_style: ":plain" + com.dockstarter.appvars.${_appname_}_environment_discord__token: "" + com.dockstarter.appvars.${_appname_}_environment_java_opts: "" + com.dockstarter.appvars.${_appname_}_environment_log_level: ":info" + com.dockstarter.appvars.${_appname_}_environment_overseerr__api: "" + com.dockstarter.appvars.${_appname_}_environment_overseerr__default_id: "" + com.dockstarter.appvars.${_appname_}_environment_overseerr__url: "http://overseerr:5055" + com.dockstarter.appvars.${_appname_}_environment_partial_seasons: "true" + com.dockstarter.appvars.${_appname_}_environment_radarr__api: "" + com.dockstarter.appvars.${_appname_}_environment_radarr__quality_profile: "" + com.dockstarter.appvars.${_appname_}_environment_radarr__rootfolder: "" + com.dockstarter.appvars.${_appname_}_environment_radarr__url: "http://radarr:7878" + com.dockstarter.appvars.${_appname_}_environment_sonarr__api: "" + com.dockstarter.appvars.${_appname_}_environment_sonarr__language_profile: "" + com.dockstarter.appvars.${_appname_}_environment_sonarr__quality_profile: "" + com.dockstarter.appvars.${_appname_}_environment_sonarr__rootfolder: "" + com.dockstarter.appvars.${_appname_}_environment_sonarr__url: "http://sonarr:8989" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/doplarr/doplarr.netmode.yml b/compose/.apps/doplarr/doplarr.netmode.yml index 282338c360..f36884ffb9 100644 --- a/compose/.apps/doplarr/doplarr.netmode.yml +++ b/compose/.apps/doplarr/doplarr.netmode.yml @@ -1,3 +1,3 @@ services: - doplarr: - network_mode: ${DOPLARR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/doplarr/doplarr.x86_64.yml b/compose/.apps/doplarr/doplarr.x86_64.yml index c9d3e5295d..8921ae982c 100644 --- a/compose/.apps/doplarr/doplarr.x86_64.yml +++ b/compose/.apps/doplarr/doplarr.x86_64.yml @@ -1,3 +1,3 @@ services: - doplarr: - image: lscr.io/linuxserver/doplarr:${DOPLARR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/doplarr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/doplarr/doplarr.yml b/compose/.apps/doplarr/doplarr.yml index f00959f33e..62f62e1883 100644 --- a/compose/.apps/doplarr/doplarr.yml +++ b/compose/.apps/doplarr/doplarr.yml @@ -1,30 +1,30 @@ services: - doplarr: - container_name: ${DOPLARR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - DISCORD__MAX_RESULTS=${DOPLARR_ENVIRONMENT_DISCORD__MAX_RESULTS} - - DISCORD__REQUESTED_MSG_STYLE=${DOPLARR_ENVIRONMENT_DISCORD__REQUESTED_MSG_STYLE} - - DISCORD__TOKEN=${DOPLARR_ENVIRONMENT_DISCORD__TOKEN} - - JAVA_OPTS=${DOPLARR_ENVIRONMENT_JAVA_OPTS} - - LOG_LEVEL=${DOPLARR_ENVIRONMENT_LOG_LEVEL} - - OVERSEERR__API=${DOPLARR_ENVIRONMENT_OVERSEERR__API} - - OVERSEERR__DEFAULT_ID=${DOPLARR_ENVIRONMENT_OVERSEERR__DEFAULT_ID} - - OVERSEERR__URL=${DOPLARR_ENVIRONMENT_OVERSEERR__URL} - - PARTIAL_SEASONS=${DOPLARR_ENVIRONMENT_PARTIAL_SEASONS} + - DISCORD__MAX_RESULTS=${${_APPNAME_}_ENVIRONMENT_DISCORD__MAX_RESULTS} + - DISCORD__REQUESTED_MSG_STYLE=${${_APPNAME_}_ENVIRONMENT_DISCORD__REQUESTED_MSG_STYLE} + - DISCORD__TOKEN=${${_APPNAME_}_ENVIRONMENT_DISCORD__TOKEN} + - JAVA_OPTS=${${_APPNAME_}_ENVIRONMENT_JAVA_OPTS} + - LOG_LEVEL=${${_APPNAME_}_ENVIRONMENT_LOG_LEVEL} + - OVERSEERR__API=${${_APPNAME_}_ENVIRONMENT_OVERSEERR__API} + - OVERSEERR__DEFAULT_ID=${${_APPNAME_}_ENVIRONMENT_OVERSEERR__DEFAULT_ID} + - OVERSEERR__URL=${${_APPNAME_}_ENVIRONMENT_OVERSEERR__URL} + - PARTIAL_SEASONS=${${_APPNAME_}_ENVIRONMENT_PARTIAL_SEASONS} - PGID=${PGID} - PUID=${PUID} - - RADARR__API=${DOPLARR_ENVIRONMENT_RADARR__API} - - RADARR__QUALITY_PROFILE=${DOPLARR_ENVIRONMENT_RADARR__QUALITY_PROFILE} - - RADARR__ROOTFOLDER=${DOPLARR_ENVIRONMENT_RADARR__ROOTFOLDER} - - RADARR__URL=${DOPLARR_ENVIRONMENT_RADARR__URL} - - SONARR__API=${DOPLARR_ENVIRONMENT_SONARR__API} - - SONARR__LANGUAGE_PROFILE=${DOPLARR_ENVIRONMENT_SONARR__LANGUAGE_PROFILE} - - SONARR__QUALITY_PROFILE=${DOPLARR_ENVIRONMENT_SONARR__QUALITY_PROFILE} - - SONARR__ROOTFOLDER=${DOPLARR_ENVIRONMENT_SONARR__ROOTFOLDER} - - SONARR__URL=${DOPLARR_ENVIRONMENT_SONARR__URL} + - RADARR__API=${${_APPNAME_}_ENVIRONMENT_RADARR__API} + - RADARR__QUALITY_PROFILE=${${_APPNAME_}_ENVIRONMENT_RADARR__QUALITY_PROFILE} + - RADARR__ROOTFOLDER=${${_APPNAME_}_ENVIRONMENT_RADARR__ROOTFOLDER} + - RADARR__URL=${${_APPNAME_}_ENVIRONMENT_RADARR__URL} + - SONARR__API=${${_APPNAME_}_ENVIRONMENT_SONARR__API} + - SONARR__LANGUAGE_PROFILE=${${_APPNAME_}_ENVIRONMENT_SONARR__LANGUAGE_PROFILE} + - SONARR__QUALITY_PROFILE=${${_APPNAME_}_ENVIRONMENT_SONARR__QUALITY_PROFILE} + - SONARR__ROOTFOLDER=${${_APPNAME_}_ENVIRONMENT_SONARR__ROOTFOLDER} + - SONARR__URL=${${_APPNAME_}_ENVIRONMENT_SONARR__URL} - TZ=${TZ} - restart: ${DOPLARR_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/doplarr:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/dozzle/dozzle.aarch64.yml b/compose/.apps/dozzle/dozzle.aarch64.yml index 84a051d3bf..feed1eced3 100644 --- a/compose/.apps/dozzle/dozzle.aarch64.yml +++ b/compose/.apps/dozzle/dozzle.aarch64.yml @@ -1,3 +1,3 @@ services: - dozzle: - image: amir20/dozzle:${DOZZLE_TAG} + ${_appname_}: + image: amir20/dozzle:${${_APPNAME_}_TAG} diff --git a/compose/.apps/dozzle/dozzle.hostname.yml b/compose/.apps/dozzle/dozzle.hostname.yml index a0942487dd..4dc53c3782 100644 --- a/compose/.apps/dozzle/dozzle.hostname.yml +++ b/compose/.apps/dozzle/dozzle.hostname.yml @@ -1,3 +1,3 @@ services: - dozzle: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/dozzle/dozzle.labels.yml b/compose/.apps/dozzle/dozzle.labels.yml index 0145f7fc5b..a2f57fb6d7 100644 --- a/compose/.apps/dozzle/dozzle.labels.yml +++ b/compose/.apps/dozzle/dozzle.labels.yml @@ -1,17 +1,17 @@ services: - dozzle: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Dozzle is a simple, lightweight application that provides you with a web based interface to monitor your Docker container logs live." com.dockstarter.appinfo.nicename: "Dozzle" - com.dockstarter.appvars.dozzle_container_name: "dozzle" - com.dockstarter.appvars.dozzle_enabled: "false" - com.dockstarter.appvars.dozzle_environment_base: "/" - com.dockstarter.appvars.dozzle_environment_filter: "" - com.dockstarter.appvars.dozzle_environment_level: "info" - com.dockstarter.appvars.dozzle_environment_tailsize: "300" - com.dockstarter.appvars.dozzle_network_mode: "" - com.dockstarter.appvars.dozzle_port_8080: "8080" - com.dockstarter.appvars.dozzle_restart: "unless-stopped" - com.dockstarter.appvars.dozzle_tag: "latest" - com.dockstarter.appvars.dozzle_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_base: "/" + com.dockstarter.appvars.${_appname_}_environment_filter: "" + com.dockstarter.appvars.${_appname_}_environment_level: "info" + com.dockstarter.appvars.${_appname_}_environment_tailsize: "300" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8080: "8080" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/dozzle/dozzle.netmode.yml b/compose/.apps/dozzle/dozzle.netmode.yml index 037991175f..f36884ffb9 100644 --- a/compose/.apps/dozzle/dozzle.netmode.yml +++ b/compose/.apps/dozzle/dozzle.netmode.yml @@ -1,3 +1,3 @@ services: - dozzle: - network_mode: ${DOZZLE_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/dozzle/dozzle.ports.yml b/compose/.apps/dozzle/dozzle.ports.yml index 4c820c5cb9..7d1c7e4455 100644 --- a/compose/.apps/dozzle/dozzle.ports.yml +++ b/compose/.apps/dozzle/dozzle.ports.yml @@ -1,4 +1,4 @@ services: - dozzle: + ${_appname_}: ports: - - ${DOZZLE_PORT_8080}:8080 + - ${${_APPNAME_}_PORT_8080}:8080 diff --git a/compose/.apps/dozzle/dozzle.x86_64.yml b/compose/.apps/dozzle/dozzle.x86_64.yml index 84a051d3bf..feed1eced3 100644 --- a/compose/.apps/dozzle/dozzle.x86_64.yml +++ b/compose/.apps/dozzle/dozzle.x86_64.yml @@ -1,3 +1,3 @@ services: - dozzle: - image: amir20/dozzle:${DOZZLE_TAG} + ${_appname_}: + image: amir20/dozzle:${${_APPNAME_}_TAG} diff --git a/compose/.apps/dozzle/dozzle.yml b/compose/.apps/dozzle/dozzle.yml index 5da05d86db..5e34262c78 100644 --- a/compose/.apps/dozzle/dozzle.yml +++ b/compose/.apps/dozzle/dozzle.yml @@ -1,16 +1,16 @@ services: - dozzle: - container_name: ${DOZZLE_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - DOZZLE_BASE=${DOZZLE_ENVIRONMENT_BASE} - - DOZZLE_FILTER=${DOZZLE_ENVIRONMENT_FILTER} - - DOZZLE_LEVEL=${DOZZLE_ENVIRONMENT_LEVEL} - - DOZZLE_TAILSIZE=${DOZZLE_ENVIRONMENT_TAILSIZE} + - DOZZLE_BASE=${${_APPNAME_}_ENVIRONMENT_BASE} + - DOZZLE_FILTER=${${_APPNAME_}_ENVIRONMENT_FILTER} + - DOZZLE_LEVEL=${${_APPNAME_}_ENVIRONMENT_LEVEL} + - DOZZLE_TAILSIZE=${${_APPNAME_}_ENVIRONMENT_TAILSIZE} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${DOZZLE_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage - - ${DOZZLE_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock + - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock diff --git a/compose/.apps/duckdns/duckdns.aarch64.yml b/compose/.apps/duckdns/duckdns.aarch64.yml index 0480aa3e8f..72852b6cdc 100644 --- a/compose/.apps/duckdns/duckdns.aarch64.yml +++ b/compose/.apps/duckdns/duckdns.aarch64.yml @@ -1,3 +1,3 @@ services: - duckdns: - image: lscr.io/linuxserver/duckdns:${DUCKDNS_TAG} + ${_appname_}: + image: lscr.io/linuxserver/duckdns:${${_APPNAME_}_TAG} diff --git a/compose/.apps/duckdns/duckdns.hostname.yml b/compose/.apps/duckdns/duckdns.hostname.yml index 394f00cd95..4dc53c3782 100644 --- a/compose/.apps/duckdns/duckdns.hostname.yml +++ b/compose/.apps/duckdns/duckdns.hostname.yml @@ -1,3 +1,3 @@ services: - duckdns: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/duckdns/duckdns.labels.yml b/compose/.apps/duckdns/duckdns.labels.yml index 20b0fad08b..b6ed1c845e 100644 --- a/compose/.apps/duckdns/duckdns.labels.yml +++ b/compose/.apps/duckdns/duckdns.labels.yml @@ -1,14 +1,14 @@ services: - duckdns: + ${_appname_}: labels: 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: "DuckDNS" - com.dockstarter.appvars.duckdns_container_name: "duckdns" - com.dockstarter.appvars.duckdns_enabled: "false" - com.dockstarter.appvars.duckdns_environment_log_file: "true" - com.dockstarter.appvars.duckdns_environment_subdomains: "" - com.dockstarter.appvars.duckdns_environment_token: "" - com.dockstarter.appvars.duckdns_network_mode: "" - com.dockstarter.appvars.duckdns_restart: "unless-stopped" - com.dockstarter.appvars.duckdns_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_log_file: "true" + com.dockstarter.appvars.${_appname_}_environment_subdomains: "" + com.dockstarter.appvars.${_appname_}_environment_token: "" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/duckdns/duckdns.netmode.yml b/compose/.apps/duckdns/duckdns.netmode.yml index 1f2b8dac1f..f36884ffb9 100644 --- a/compose/.apps/duckdns/duckdns.netmode.yml +++ b/compose/.apps/duckdns/duckdns.netmode.yml @@ -1,3 +1,3 @@ services: - duckdns: - network_mode: ${DUCKDNS_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/duckdns/duckdns.x86_64.yml b/compose/.apps/duckdns/duckdns.x86_64.yml index 0480aa3e8f..72852b6cdc 100644 --- a/compose/.apps/duckdns/duckdns.x86_64.yml +++ b/compose/.apps/duckdns/duckdns.x86_64.yml @@ -1,3 +1,3 @@ services: - duckdns: - image: lscr.io/linuxserver/duckdns:${DUCKDNS_TAG} + ${_appname_}: + image: lscr.io/linuxserver/duckdns:${${_APPNAME_}_TAG} diff --git a/compose/.apps/duckdns/duckdns.yml b/compose/.apps/duckdns/duckdns.yml index 4e4e2e10a4..124f3d432b 100644 --- a/compose/.apps/duckdns/duckdns.yml +++ b/compose/.apps/duckdns/duckdns.yml @@ -1,15 +1,15 @@ services: - duckdns: - container_name: ${DUCKDNS_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - LOG_FILE=${DUCKDNS_ENVIRONMENT_LOG_FILE} - - SUBDOMAINS=${DUCKDNS_ENVIRONMENT_SUBDOMAINS} - - TOKEN=${DUCKDNS_ENVIRONMENT_TOKEN} + - LOG_FILE=${${_APPNAME_}_ENVIRONMENT_LOG_FILE} + - SUBDOMAINS=${${_APPNAME_}_ENVIRONMENT_SUBDOMAINS} + - TOKEN=${${_APPNAME_}_ENVIRONMENT_TOKEN} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${DUCKDNS_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/duckdns:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/duplicacy/duplicacy.aarch64.yml b/compose/.apps/duplicacy/duplicacy.aarch64.yml index d235dca9a6..d85a613242 100644 --- a/compose/.apps/duplicacy/duplicacy.aarch64.yml +++ b/compose/.apps/duplicacy/duplicacy.aarch64.yml @@ -1,3 +1,3 @@ services: - duplicacy: - image: ghcr.io/hotio/duplicacy:${DUPLICACY_TAG} + ${_appname_}: + image: ghcr.io/hotio/duplicacy:${${_APPNAME_}_TAG} diff --git a/compose/.apps/duplicacy/duplicacy.hostname.yml b/compose/.apps/duplicacy/duplicacy.hostname.yml index 0dec0395de..4dc53c3782 100644 --- a/compose/.apps/duplicacy/duplicacy.hostname.yml +++ b/compose/.apps/duplicacy/duplicacy.hostname.yml @@ -1,3 +1,3 @@ services: - duplicacy: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/duplicacy/duplicacy.labels.yml b/compose/.apps/duplicacy/duplicacy.labels.yml index 60b5299d7d..dcb9ac0f78 100644 --- a/compose/.apps/duplicacy/duplicacy.labels.yml +++ b/compose/.apps/duplicacy/duplicacy.labels.yml @@ -1,15 +1,15 @@ services: - duplicacy: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Duplicacy is built on top of a new idea called Lock-Free Deduplication" com.dockstarter.appinfo.nicename: "Duplicacy" - com.dockstarter.appvars.duplicacy_container_name: "duplicacy" - com.dockstarter.appvars.duplicacy_enabled: "false" - com.dockstarter.appvars.duplicacy_network_mode: "" - com.dockstarter.appvars.duplicacy_port_3875: "3875" - com.dockstarter.appvars.duplicacy_restart: "unless-stopped" - com.dockstarter.appvars.duplicacy_tag: "latest" - com.dockstarter.appvars.duplicacy_volume_appdata_dir: "~/.config/appdata" - com.dockstarter.appvars.duplicacy_volume_backup_dir: "~/backup" - com.dockstarter.appvars.duplicacy_volume_docker_dir: "~/.docker/" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_3875: "3875" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_appdata_dir: "~/.config/appdata" + com.dockstarter.appvars.${_appname_}_volume_backup_dir: "~/backup" + com.dockstarter.appvars.${_appname_}_volume_docker_dir: "~/.docker/" diff --git a/compose/.apps/duplicacy/duplicacy.netmode.yml b/compose/.apps/duplicacy/duplicacy.netmode.yml index 49f8ee8c7a..f36884ffb9 100644 --- a/compose/.apps/duplicacy/duplicacy.netmode.yml +++ b/compose/.apps/duplicacy/duplicacy.netmode.yml @@ -1,3 +1,3 @@ services: - duplicacy: - network_mode: ${DUPLICACY_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/duplicacy/duplicacy.ports.yml b/compose/.apps/duplicacy/duplicacy.ports.yml index 57724e46d9..1e8f88728f 100644 --- a/compose/.apps/duplicacy/duplicacy.ports.yml +++ b/compose/.apps/duplicacy/duplicacy.ports.yml @@ -1,4 +1,4 @@ services: - duplicacy: + ${_appname_}: ports: - - ${DUPLICACY_PORT_3875}:3875 + - ${${_APPNAME_}_PORT_3875}:3875 diff --git a/compose/.apps/duplicacy/duplicacy.x86_64.yml b/compose/.apps/duplicacy/duplicacy.x86_64.yml index d235dca9a6..d85a613242 100644 --- a/compose/.apps/duplicacy/duplicacy.x86_64.yml +++ b/compose/.apps/duplicacy/duplicacy.x86_64.yml @@ -1,3 +1,3 @@ services: - duplicacy: - image: ghcr.io/hotio/duplicacy:${DUPLICACY_TAG} + ${_appname_}: + image: ghcr.io/hotio/duplicacy:${${_APPNAME_}_TAG} diff --git a/compose/.apps/duplicacy/duplicacy.yml b/compose/.apps/duplicacy/duplicacy.yml index 79d9631d29..0f2d2dc76d 100644 --- a/compose/.apps/duplicacy/duplicacy.yml +++ b/compose/.apps/duplicacy/duplicacy.yml @@ -1,17 +1,17 @@ services: - duplicacy: - container_name: ${DUPLICACY_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${DUPLICACY_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/duplicacy/cache:/cache - - ${DOCKER_VOLUME_CONFIG}/duplicacy/config:/config - - ${DOCKER_VOLUME_CONFIG}/duplicacy/logs:/logs + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/cache:/cache + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/config:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/logs:/logs - ${DOCKER_VOLUME_STORAGE}:/storage - - ${DUPLICACY_VOLUME_APPDATA_DIR}:/backuproot/appdata:ro - - ${DUPLICACY_VOLUME_BACKUP_DIR}:/backup - - ${DUPLICACY_VOLUME_DOCKER_DIR}:/backuproot/docker:ro + - ${${_APPNAME_}_VOLUME_APPDATA_DIR}:/backuproot/appdata:ro + - ${${_APPNAME_}_VOLUME_BACKUP_DIR}:/backup + - ${${_APPNAME_}_VOLUME_DOCKER_DIR}:/backuproot/docker:ro diff --git a/compose/.apps/duplicati/duplicati.aarch64.yml b/compose/.apps/duplicati/duplicati.aarch64.yml index 0ce2e8b786..ae73b2cfd4 100644 --- a/compose/.apps/duplicati/duplicati.aarch64.yml +++ b/compose/.apps/duplicati/duplicati.aarch64.yml @@ -1,3 +1,3 @@ services: - duplicati: - image: lscr.io/linuxserver/duplicati:${DUPLICATI_TAG} + ${_appname_}: + image: lscr.io/linuxserver/duplicati:${${_APPNAME_}_TAG} diff --git a/compose/.apps/duplicati/duplicati.hostname.yml b/compose/.apps/duplicati/duplicati.hostname.yml index 3302ab3d49..4dc53c3782 100644 --- a/compose/.apps/duplicati/duplicati.hostname.yml +++ b/compose/.apps/duplicati/duplicati.hostname.yml @@ -1,3 +1,3 @@ services: - duplicati: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/duplicati/duplicati.labels.yml b/compose/.apps/duplicati/duplicati.labels.yml index 450777a905..e03f321788 100644 --- a/compose/.apps/duplicati/duplicati.labels.yml +++ b/compose/.apps/duplicati/duplicati.labels.yml @@ -1,14 +1,14 @@ services: - duplicati: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Backup software to store backups online with strong encryption" com.dockstarter.appinfo.nicename: "Duplicati" - com.dockstarter.appvars.duplicati_container_name: "duplicati" - com.dockstarter.appvars.duplicati_enabled: "false" - com.dockstarter.appvars.duplicati_network_mode: "" - com.dockstarter.appvars.duplicati_port_8200: "8200" - com.dockstarter.appvars.duplicati_restart: "unless-stopped" - com.dockstarter.appvars.duplicati_tag: "latest" - com.dockstarter.appvars.duplicati_volume_backupsdir: "~/.config/appdata/backups" - com.dockstarter.appvars.duplicati_volume_sourcedir: "~/.config/appdata" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8200: "8200" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_backupsdir: "~/.config/appdata/backups" + com.dockstarter.appvars.${_appname_}_volume_sourcedir: "~/.config/appdata" diff --git a/compose/.apps/duplicati/duplicati.netmode.yml b/compose/.apps/duplicati/duplicati.netmode.yml index 8fc44c7452..f36884ffb9 100644 --- a/compose/.apps/duplicati/duplicati.netmode.yml +++ b/compose/.apps/duplicati/duplicati.netmode.yml @@ -1,3 +1,3 @@ services: - duplicati: - network_mode: ${DUPLICATI_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/duplicati/duplicati.ports.yml b/compose/.apps/duplicati/duplicati.ports.yml index f092eab8c3..fa94b0a867 100644 --- a/compose/.apps/duplicati/duplicati.ports.yml +++ b/compose/.apps/duplicati/duplicati.ports.yml @@ -1,4 +1,4 @@ services: - duplicati: + ${_appname_}: ports: - - ${DUPLICATI_PORT_8200}:8200 + - ${${_APPNAME_}_PORT_8200}:8200 diff --git a/compose/.apps/duplicati/duplicati.x86_64.yml b/compose/.apps/duplicati/duplicati.x86_64.yml index 0ce2e8b786..ae73b2cfd4 100644 --- a/compose/.apps/duplicati/duplicati.x86_64.yml +++ b/compose/.apps/duplicati/duplicati.x86_64.yml @@ -1,3 +1,3 @@ services: - duplicati: - image: lscr.io/linuxserver/duplicati:${DUPLICATI_TAG} + ${_appname_}: + image: lscr.io/linuxserver/duplicati:${${_APPNAME_}_TAG} diff --git a/compose/.apps/duplicati/duplicati.yml b/compose/.apps/duplicati/duplicati.yml index 21d7e30fe3..3559cad3b4 100644 --- a/compose/.apps/duplicati/duplicati.yml +++ b/compose/.apps/duplicati/duplicati.yml @@ -1,14 +1,14 @@ services: - duplicati: - container_name: ${DUPLICATI_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${DUPLICATI_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/duplicati:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${DUPLICATI_VOLUME_BACKUPSDIR}:/backups - - ${DUPLICATI_VOLUME_SOURCEDIR}:/source + - ${${_APPNAME_}_VOLUME_BACKUPSDIR}:/backups + - ${${_APPNAME_}_VOLUME_SOURCEDIR}:/source diff --git a/compose/.apps/emby/emby.aarch64.yml b/compose/.apps/emby/emby.aarch64.yml index a8b386345e..90124c8525 100644 --- a/compose/.apps/emby/emby.aarch64.yml +++ b/compose/.apps/emby/emby.aarch64.yml @@ -1,3 +1,3 @@ services: - emby: - image: lscr.io/linuxserver/emby:${EMBY_TAG} + ${_appname_}: + image: lscr.io/linuxserver/emby:${${_APPNAME_}_TAG} diff --git a/compose/.apps/emby/emby.hostname.yml b/compose/.apps/emby/emby.hostname.yml index f4ceb286a4..4dc53c3782 100644 --- a/compose/.apps/emby/emby.hostname.yml +++ b/compose/.apps/emby/emby.hostname.yml @@ -1,3 +1,3 @@ services: - emby: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/emby/emby.labels.yml b/compose/.apps/emby/emby.labels.yml index f8b327d838..cebc67d83d 100644 --- a/compose/.apps/emby/emby.labels.yml +++ b/compose/.apps/emby/emby.labels.yml @@ -1,14 +1,14 @@ services: - emby: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Organize, play, and stream audio and video" com.dockstarter.appinfo.nicename: "Emby" - com.dockstarter.appvars.emby_container_name: "emby" - com.dockstarter.appvars.emby_enabled: "false" - com.dockstarter.appvars.emby_network_mode: "" - com.dockstarter.appvars.emby_port_8096: "8096" - com.dockstarter.appvars.emby_port_8920: "8920" - com.dockstarter.appvars.emby_restart: "unless-stopped" - com.dockstarter.appvars.emby_tag: "latest" - com.dockstarter.appvars.emby_volume_transcodedir: "/tmp/emby_transcode" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8096: "8096" + com.dockstarter.appvars.${_appname_}_port_8920: "8920" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_transcodedir: "/tmp/emby_transcode" diff --git a/compose/.apps/emby/emby.netmode.yml b/compose/.apps/emby/emby.netmode.yml index fc8e9e6cd7..f36884ffb9 100644 --- a/compose/.apps/emby/emby.netmode.yml +++ b/compose/.apps/emby/emby.netmode.yml @@ -1,3 +1,3 @@ services: - emby: - network_mode: ${EMBY_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/emby/emby.ports.yml b/compose/.apps/emby/emby.ports.yml index b1b3c02ff6..aa8fa4bb5b 100644 --- a/compose/.apps/emby/emby.ports.yml +++ b/compose/.apps/emby/emby.ports.yml @@ -1,5 +1,5 @@ services: - emby: + ${_appname_}: ports: - - ${EMBY_PORT_8096}:8096 - - ${EMBY_PORT_8920}:8920 + - ${${_APPNAME_}_PORT_8096}:8096 + - ${${_APPNAME_}_PORT_8920}:8920 diff --git a/compose/.apps/emby/emby.x86_64.yml b/compose/.apps/emby/emby.x86_64.yml index a8b386345e..90124c8525 100644 --- a/compose/.apps/emby/emby.x86_64.yml +++ b/compose/.apps/emby/emby.x86_64.yml @@ -1,3 +1,3 @@ services: - emby: - image: lscr.io/linuxserver/emby:${EMBY_TAG} + ${_appname_}: + image: lscr.io/linuxserver/emby:${${_APPNAME_}_TAG} diff --git a/compose/.apps/emby/emby.yml b/compose/.apps/emby/emby.yml index 0bd16021e9..18af6350da 100644 --- a/compose/.apps/emby/emby.yml +++ b/compose/.apps/emby/emby.yml @@ -1,13 +1,13 @@ services: - emby: - container_name: ${EMBY_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${EMBY_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/emby:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${EMBY_VOLUME_TRANSCODEDIR}:/transcode + - ${${_APPNAME_}_VOLUME_TRANSCODEDIR}:/transcode diff --git a/compose/.apps/fail2ban/fail2ban.aarch64.yml b/compose/.apps/fail2ban/fail2ban.aarch64.yml index 99e92a281a..7a0295a8d3 100644 --- a/compose/.apps/fail2ban/fail2ban.aarch64.yml +++ b/compose/.apps/fail2ban/fail2ban.aarch64.yml @@ -1,3 +1,3 @@ services: fail2ban: - image: lscr.io/linuxserver/fail2ban:${FAIL2BAN_TAG} + image: lscr.io/linuxserver/fail2ban:${${_APPNAME_}_TAG} diff --git a/compose/.apps/fail2ban/fail2ban.labels.yml b/compose/.apps/fail2ban/fail2ban.labels.yml index cd4e2f75e5..d7655be144 100644 --- a/compose/.apps/fail2ban/fail2ban.labels.yml +++ b/compose/.apps/fail2ban/fail2ban.labels.yml @@ -4,8 +4,8 @@ services: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Daemon to ban hosts that cause multiple authentication errors" com.dockstarter.appinfo.nicename: "Fail2ban" - com.dockstarter.appvars.fail2ban_container_name: "fail2ban" - com.dockstarter.appvars.fail2ban_enabled: "false" - com.dockstarter.appvars.fail2ban_network_mode: "host" - com.dockstarter.appvars.fail2ban_restart: "unless-stopped" - com.dockstarter.appvars.fail2ban_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "host" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/fail2ban/fail2ban.netmode.yml b/compose/.apps/fail2ban/fail2ban.netmode.yml index b478908cec..d5349c9b34 100644 --- a/compose/.apps/fail2ban/fail2ban.netmode.yml +++ b/compose/.apps/fail2ban/fail2ban.netmode.yml @@ -1,3 +1,3 @@ services: fail2ban: - network_mode: ${FAIL2BAN_NETWORK_MODE} + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/fail2ban/fail2ban.x86_64.yml b/compose/.apps/fail2ban/fail2ban.x86_64.yml index 99e92a281a..7a0295a8d3 100644 --- a/compose/.apps/fail2ban/fail2ban.x86_64.yml +++ b/compose/.apps/fail2ban/fail2ban.x86_64.yml @@ -1,3 +1,3 @@ services: fail2ban: - image: lscr.io/linuxserver/fail2ban:${FAIL2BAN_TAG} + image: lscr.io/linuxserver/fail2ban:${${_APPNAME_}_TAG} diff --git a/compose/.apps/fail2ban/fail2ban.yml b/compose/.apps/fail2ban/fail2ban.yml index e1c44a8738..903068925b 100644 --- a/compose/.apps/fail2ban/fail2ban.yml +++ b/compose/.apps/fail2ban/fail2ban.yml @@ -3,14 +3,14 @@ services: cap_add: - NET_ADMIN - NET_RAW - container_name: ${FAIL2BAN_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${FAIL2BAN_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - /var/log:/var/log:ro - - ${DOCKER_VOLUME_CONFIG}/fail2ban:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/filebot/filebot.hostname.yml b/compose/.apps/filebot/filebot.hostname.yml index 138d850426..4dc53c3782 100644 --- a/compose/.apps/filebot/filebot.hostname.yml +++ b/compose/.apps/filebot/filebot.hostname.yml @@ -1,3 +1,3 @@ services: - filebot: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/filebot/filebot.labels.yml b/compose/.apps/filebot/filebot.labels.yml index 1fa7ba0672..7c55616a67 100644 --- a/compose/.apps/filebot/filebot.labels.yml +++ b/compose/.apps/filebot/filebot.labels.yml @@ -1,14 +1,14 @@ services: - filebot: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Tool for organizing your media" com.dockstarter.appinfo.nicename: "FileBot" - com.dockstarter.appvars.filebot_container_name: "filebot" - com.dockstarter.appvars.filebot_enabled: "false" - com.dockstarter.appvars.filebot_network_mode: "" - com.dockstarter.appvars.filebot_port_5800: "5800" - com.dockstarter.appvars.filebot_restart: "unless-stopped" - com.dockstarter.appvars.filebot_tag: "latest" - com.dockstarter.appvars.filebot_volume_outputdir: "/mnt/filebot/output" - com.dockstarter.appvars.filebot_volume_watchdir: "/mnt/filebot/watch" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_5800: "5800" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_outputdir: "/mnt/filebot/output" + com.dockstarter.appvars.${_appname_}_volume_watchdir: "/mnt/filebot/watch" diff --git a/compose/.apps/filebot/filebot.netmode.yml b/compose/.apps/filebot/filebot.netmode.yml index df3fe1dbe7..f36884ffb9 100644 --- a/compose/.apps/filebot/filebot.netmode.yml +++ b/compose/.apps/filebot/filebot.netmode.yml @@ -1,3 +1,3 @@ services: - filebot: - network_mode: ${FILEBOT_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/filebot/filebot.ports.yml b/compose/.apps/filebot/filebot.ports.yml index 0808d967e6..e628931935 100644 --- a/compose/.apps/filebot/filebot.ports.yml +++ b/compose/.apps/filebot/filebot.ports.yml @@ -1,4 +1,4 @@ services: - filebot: + ${_appname_}: ports: - - ${FILEBOT_PORT_5800}:5800 + - ${${_APPNAME_}_PORT_5800}:5800 diff --git a/compose/.apps/filebot/filebot.x86_64.yml b/compose/.apps/filebot/filebot.x86_64.yml index 90856dd537..e62eb208a2 100644 --- a/compose/.apps/filebot/filebot.x86_64.yml +++ b/compose/.apps/filebot/filebot.x86_64.yml @@ -1,3 +1,3 @@ services: - filebot: - image: jlesage/filebot:${FILEBOT_TAG} + ${_appname_}: + image: jlesage/filebot:${${_APPNAME_}_TAG} diff --git a/compose/.apps/filebot/filebot.yml b/compose/.apps/filebot/filebot.yml index 0799ca9a57..3a600e2d5e 100644 --- a/compose/.apps/filebot/filebot.yml +++ b/compose/.apps/filebot/filebot.yml @@ -1,14 +1,14 @@ services: - filebot: - container_name: ${FILEBOT_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - GROUP_ID=${PGID} - TZ=${TZ} - USER_ID=${PUID} - restart: ${FILEBOT_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/filebot:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${FILEBOT_VOLUME_OUTPUTDIR}:/output - - ${FILEBOT_VOLUME_WATCHDIR}:/watch + - ${${_APPNAME_}_VOLUME_OUTPUTDIR}:/output + - ${${_APPNAME_}_VOLUME_WATCHDIR}:/watch diff --git a/compose/.apps/filebrowser/filebrowser.aarch64.yml b/compose/.apps/filebrowser/filebrowser.aarch64.yml index a8d5e7a502..ae51546af4 100644 --- a/compose/.apps/filebrowser/filebrowser.aarch64.yml +++ b/compose/.apps/filebrowser/filebrowser.aarch64.yml @@ -1,3 +1,3 @@ services: - filebrowser: - image: filebrowser/filebrowser:${FILEBROWSER_TAG} + ${_appname_}: + image: filebrowser/filebrowser:${${_APPNAME_}_TAG} diff --git a/compose/.apps/filebrowser/filebrowser.hostname.yml b/compose/.apps/filebrowser/filebrowser.hostname.yml index f2dd82dc92..4dc53c3782 100644 --- a/compose/.apps/filebrowser/filebrowser.hostname.yml +++ b/compose/.apps/filebrowser/filebrowser.hostname.yml @@ -1,3 +1,3 @@ services: - filebrowser: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/filebrowser/filebrowser.labels.yml b/compose/.apps/filebrowser/filebrowser.labels.yml index 7d84120c47..d7c283a5cc 100644 --- a/compose/.apps/filebrowser/filebrowser.labels.yml +++ b/compose/.apps/filebrowser/filebrowser.labels.yml @@ -1,16 +1,16 @@ services: - filebrowser: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Filebrowser provides a file managing interface within a specified directory" com.dockstarter.appinfo.nicename: "Filebrowser" - com.dockstarter.appvars.filebrowser_container_name: "filebrowser" - com.dockstarter.appvars.filebrowser_enabled: "false" - com.dockstarter.appvars.filebrowser_environment_baseurl: "" - com.dockstarter.appvars.filebrowser_environment_database: "/config/database.db" - com.dockstarter.appvars.filebrowser_environment_log: "/config/filebrowser.log" - com.dockstarter.appvars.filebrowser_network_mode: "" - com.dockstarter.appvars.filebrowser_port_80: "8080" - com.dockstarter.appvars.filebrowser_restart: "unless-stopped" - com.dockstarter.appvars.filebrowser_tag: "latest" - com.dockstarter.appvars.filebrowser_volume_share_dir: "~/.config/appdata/filebrowser/share" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_baseurl: "" + com.dockstarter.appvars.${_appname_}_environment_database: "/config/database.db" + com.dockstarter.appvars.${_appname_}_environment_log: "/config/filebrowser.log" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_80: "8080" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_share_dir: "~/.config/appdata/filebrowser/share" diff --git a/compose/.apps/filebrowser/filebrowser.netmode.yml b/compose/.apps/filebrowser/filebrowser.netmode.yml index e5786e23b0..f36884ffb9 100644 --- a/compose/.apps/filebrowser/filebrowser.netmode.yml +++ b/compose/.apps/filebrowser/filebrowser.netmode.yml @@ -1,3 +1,3 @@ services: - filebrowser: - network_mode: ${FILEBROWSER_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/filebrowser/filebrowser.ports.yml b/compose/.apps/filebrowser/filebrowser.ports.yml index 3ba5b68670..c37afbebb5 100644 --- a/compose/.apps/filebrowser/filebrowser.ports.yml +++ b/compose/.apps/filebrowser/filebrowser.ports.yml @@ -1,4 +1,4 @@ services: - filebrowser: + ${_appname_}: ports: - - ${FILEBROWSER_PORT_80}:80 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/filebrowser/filebrowser.x86_64.yml b/compose/.apps/filebrowser/filebrowser.x86_64.yml index a8d5e7a502..ae51546af4 100644 --- a/compose/.apps/filebrowser/filebrowser.x86_64.yml +++ b/compose/.apps/filebrowser/filebrowser.x86_64.yml @@ -1,3 +1,3 @@ services: - filebrowser: - image: filebrowser/filebrowser:${FILEBROWSER_TAG} + ${_appname_}: + image: filebrowser/filebrowser:${${_APPNAME_}_TAG} diff --git a/compose/.apps/filebrowser/filebrowser.yml b/compose/.apps/filebrowser/filebrowser.yml index 51fb4961c7..d35ad17905 100644 --- a/compose/.apps/filebrowser/filebrowser.yml +++ b/compose/.apps/filebrowser/filebrowser.yml @@ -1,19 +1,19 @@ services: - filebrowser: - container_name: ${FILEBROWSER_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - FB_BASEURL=${FILEBROWSER_ENVIRONMENT_BASEURL} - - FB_DATABASE=${FILEBROWSER_ENVIRONMENT_DATABASE} - - FB_LOG=${FILEBROWSER_ENVIRONMENT_LOG} + - FB_BASEURL=${${_APPNAME_}_ENVIRONMENT_BASEURL} + - FB_DATABASE=${${_APPNAME_}_ENVIRONMENT_DATABASE} + - FB_LOG=${${_APPNAME_}_ENVIRONMENT_LOG} - TZ=${TZ} healthcheck: test: - CMD-SHELL - - curl -fs http://localhost:${FILEBROWSER_PORT_80}/health || exit 1 - restart: ${FILEBROWSER_RESTART} + - curl -fs http://localhost:${${_APPNAME_}_PORT_80}/health || exit 1 + restart: ${${_APPNAME_}_RESTART} user: ${PUID}:${PGID} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/filebrowser:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${FILEBROWSER_VOLUME_SHARE_DIR}:/srv + - ${${_APPNAME_}_VOLUME_SHARE_DIR}:/srv diff --git a/compose/.apps/fireflyiii/fireflyiii.aarch64.yml b/compose/.apps/fireflyiii/fireflyiii.aarch64.yml index d450ec6894..1cd393bdb5 100644 --- a/compose/.apps/fireflyiii/fireflyiii.aarch64.yml +++ b/compose/.apps/fireflyiii/fireflyiii.aarch64.yml @@ -1,3 +1,3 @@ services: - fireflyiii: - image: fireflyiii/core:${FIREFLYIII_TAG} + ${_appname_}: + image: fireflyiii/core:${${_APPNAME_}_TAG} diff --git a/compose/.apps/fireflyiii/fireflyiii.hostname.yml b/compose/.apps/fireflyiii/fireflyiii.hostname.yml index feb5ce30bd..4dc53c3782 100644 --- a/compose/.apps/fireflyiii/fireflyiii.hostname.yml +++ b/compose/.apps/fireflyiii/fireflyiii.hostname.yml @@ -1,3 +1,3 @@ services: - fireflyiii: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/fireflyiii/fireflyiii.labels.yml b/compose/.apps/fireflyiii/fireflyiii.labels.yml index 0e66a19a60..f57c2e7886 100644 --- a/compose/.apps/fireflyiii/fireflyiii.labels.yml +++ b/compose/.apps/fireflyiii/fireflyiii.labels.yml @@ -1,20 +1,20 @@ services: - fireflyiii: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A personal finance manager" com.dockstarter.appinfo.nicename: "FireflyIII" - com.dockstarter.appvars.fireflyiii_container_name: "fireflyiii" - com.dockstarter.appvars.fireflyiii_enabled: "false" - com.dockstarter.appvars.fireflyiii_environment_app_key: "SomeRandomStringOf32CharsExactly" - com.dockstarter.appvars.fireflyiii_environment_db_connection: "mysql" - com.dockstarter.appvars.fireflyiii_environment_db_database: "fireflyiii_db" - com.dockstarter.appvars.fireflyiii_environment_db_host: "mariadb" - com.dockstarter.appvars.fireflyiii_environment_db_password: "fireflyiii_password" - com.dockstarter.appvars.fireflyiii_environment_db_port: "3306" - com.dockstarter.appvars.fireflyiii_environment_db_username: "fireflyiii_user" - com.dockstarter.appvars.fireflyiii_environment_trusted_proxies: "**" - com.dockstarter.appvars.fireflyiii_network_mode: "" - com.dockstarter.appvars.fireflyiii_port_8080: "8080" - com.dockstarter.appvars.fireflyiii_restart: "unless-stopped" - com.dockstarter.appvars.fireflyiii_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_app_key: "SomeRandomStringOf32CharsExactly" + com.dockstarter.appvars.${_appname_}_environment_db_connection: "mysql" + com.dockstarter.appvars.${_appname_}_environment_db_database: "fireflyiii_db" + com.dockstarter.appvars.${_appname_}_environment_db_host: "mariadb" + com.dockstarter.appvars.${_appname_}_environment_db_password: "fireflyiii_password" + com.dockstarter.appvars.${_appname_}_environment_db_port: "3306" + com.dockstarter.appvars.${_appname_}_environment_db_username: "fireflyiii_user" + com.dockstarter.appvars.${_appname_}_environment_trusted_proxies: "**" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8080: "8080" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/fireflyiii/fireflyiii.netmode.yml b/compose/.apps/fireflyiii/fireflyiii.netmode.yml index f58041aeda..f36884ffb9 100644 --- a/compose/.apps/fireflyiii/fireflyiii.netmode.yml +++ b/compose/.apps/fireflyiii/fireflyiii.netmode.yml @@ -1,3 +1,3 @@ services: - fireflyiii: - network_mode: ${FIREFLYIII_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/fireflyiii/fireflyiii.ports.yml b/compose/.apps/fireflyiii/fireflyiii.ports.yml index 9032a78056..7d1c7e4455 100644 --- a/compose/.apps/fireflyiii/fireflyiii.ports.yml +++ b/compose/.apps/fireflyiii/fireflyiii.ports.yml @@ -1,4 +1,4 @@ services: - fireflyiii: + ${_appname_}: ports: - - ${FIREFLYIII_PORT_8080}:8080 + - ${${_APPNAME_}_PORT_8080}:8080 diff --git a/compose/.apps/fireflyiii/fireflyiii.x86_64.yml b/compose/.apps/fireflyiii/fireflyiii.x86_64.yml index d450ec6894..1cd393bdb5 100644 --- a/compose/.apps/fireflyiii/fireflyiii.x86_64.yml +++ b/compose/.apps/fireflyiii/fireflyiii.x86_64.yml @@ -1,3 +1,3 @@ services: - fireflyiii: - image: fireflyiii/core:${FIREFLYIII_TAG} + ${_appname_}: + image: fireflyiii/core:${${_APPNAME_}_TAG} diff --git a/compose/.apps/fireflyiii/fireflyiii.yml b/compose/.apps/fireflyiii/fireflyiii.yml index e95528e589..6128b6714c 100644 --- a/compose/.apps/fireflyiii/fireflyiii.yml +++ b/compose/.apps/fireflyiii/fireflyiii.yml @@ -1,19 +1,19 @@ services: - fireflyiii: - container_name: ${FIREFLYIII_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - APP_KEY=${FIREFLYIII_ENVIRONMENT_APP_KEY} - - DB_CONNECTION=${FIREFLYIII_ENVIRONMENT_DB_CONNECTION} - - DB_DATABASE=${FIREFLYIII_ENVIRONMENT_DB_DATABASE} - - DB_HOST=${FIREFLYIII_ENVIRONMENT_DB_HOST} - - DB_PASSWORD=${FIREFLYIII_ENVIRONMENT_DB_PASSWORD} - - DB_PORT=${FIREFLYIII_ENVIRONMENT_DB_PORT} - - DB_USERNAME=${FIREFLYIII_ENVIRONMENT_DB_USERNAME} - - TRUSTED_PROXIES=${FIREFLYIII_ENVIRONMENT_TRUSTED_PROXIES} + - APP_KEY=${${_APPNAME_}_ENVIRONMENT_APP_KEY} + - DB_CONNECTION=${${_APPNAME_}_ENVIRONMENT_DB_CONNECTION} + - DB_DATABASE=${${_APPNAME_}_ENVIRONMENT_DB_DATABASE} + - DB_HOST=${${_APPNAME_}_ENVIRONMENT_DB_HOST} + - DB_PASSWORD=${${_APPNAME_}_ENVIRONMENT_DB_PASSWORD} + - DB_PORT=${${_APPNAME_}_ENVIRONMENT_DB_PORT} + - DB_USERNAME=${${_APPNAME_}_ENVIRONMENT_DB_USERNAME} + - TRUSTED_PROXIES=${${_APPNAME_}_ENVIRONMENT_TRUSTED_PROXIES} - TZ=${TZ} - restart: ${FIREFLYIII_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/fireflyiii/export:/var/www/html/storage/export - - ${DOCKER_VOLUME_CONFIG}/fireflyiii/upload:/var/www/html/storage/upload + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/export:/var/www/html/storage/export + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/upload:/var/www/html/storage/upload - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/flame/flame.aarch64.yml b/compose/.apps/flame/flame.aarch64.yml index 43d351e58e..a420f155c0 100644 --- a/compose/.apps/flame/flame.aarch64.yml +++ b/compose/.apps/flame/flame.aarch64.yml @@ -1,3 +1,3 @@ services: - flame: - image: pawelmalak/flame:${FLAME_TAG} + ${_appname_}: + image: pawelmalak/flame:${${_APPNAME_}_TAG} diff --git a/compose/.apps/flame/flame.hostname.yml b/compose/.apps/flame/flame.hostname.yml index 42ae353a4b..4dc53c3782 100644 --- a/compose/.apps/flame/flame.hostname.yml +++ b/compose/.apps/flame/flame.hostname.yml @@ -1,3 +1,3 @@ services: - flame: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/flame/flame.labels.yml b/compose/.apps/flame/flame.labels.yml index 8aa3a1c992..49ce1a0e36 100644 --- a/compose/.apps/flame/flame.labels.yml +++ b/compose/.apps/flame/flame.labels.yml @@ -1,14 +1,14 @@ services: - flame: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A self-hosted startpage for your server. Easily manage your apps and bookmarks with built-in editors." com.dockstarter.appinfo.nicename: "Flame" - com.dockstarter.appvars.flame_container_name: "flame" - com.dockstarter.appvars.flame_enabled: "false" - com.dockstarter.appvars.flame_environment_password: "" - com.dockstarter.appvars.flame_network_mode: "" - com.dockstarter.appvars.flame_port_5005: "5005" - com.dockstarter.appvars.flame_restart: "unless-stopped" - com.dockstarter.appvars.flame_tag: "multiarch" - com.dockstarter.appvars.flame_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_password: "" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_5005: "5005" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "multiarch" + com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/flame/flame.netmode.yml b/compose/.apps/flame/flame.netmode.yml index e3f31e9d2b..f36884ffb9 100644 --- a/compose/.apps/flame/flame.netmode.yml +++ b/compose/.apps/flame/flame.netmode.yml @@ -1,3 +1,3 @@ services: - flame: - network_mode: ${FLAME_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/flame/flame.ports.yml b/compose/.apps/flame/flame.ports.yml index daf213034b..93d781b848 100644 --- a/compose/.apps/flame/flame.ports.yml +++ b/compose/.apps/flame/flame.ports.yml @@ -1,4 +1,4 @@ services: - flame: + ${_appname_}: ports: - - ${FLAME_PORT_5005}:5005 + - ${${_APPNAME_}_PORT_5005}:5005 diff --git a/compose/.apps/flame/flame.x86_64.yml b/compose/.apps/flame/flame.x86_64.yml index 43d351e58e..a420f155c0 100644 --- a/compose/.apps/flame/flame.x86_64.yml +++ b/compose/.apps/flame/flame.x86_64.yml @@ -1,3 +1,3 @@ services: - flame: - image: pawelmalak/flame:${FLAME_TAG} + ${_appname_}: + image: pawelmalak/flame:${${_APPNAME_}_TAG} diff --git a/compose/.apps/flame/flame.yml b/compose/.apps/flame/flame.yml index 12b6da949f..3b040be1ba 100644 --- a/compose/.apps/flame/flame.yml +++ b/compose/.apps/flame/flame.yml @@ -1,10 +1,10 @@ services: - flame: - container_name: ${FLAME_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - PASSWORD=${FLAME_ENVIRONMENT_PASSWORD} - restart: ${FLAME_RESTART} + - PASSWORD=${${_APPNAME_}_ENVIRONMENT_PASSWORD} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage - - ${FLAME_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock + - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock diff --git a/compose/.apps/flaresolverr/flaresolverr.aarch64.yml b/compose/.apps/flaresolverr/flaresolverr.aarch64.yml index 0f8e7f3873..07549367bc 100644 --- a/compose/.apps/flaresolverr/flaresolverr.aarch64.yml +++ b/compose/.apps/flaresolverr/flaresolverr.aarch64.yml @@ -1,3 +1,3 @@ services: - flaresolverr: - image: ghcr.io/flaresolverr/flaresolverr:${FLARESOLVERR_TAG} + ${_appname_}: + image: ghcr.io/flaresolverr/flaresolverr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/flaresolverr/flaresolverr.hostname.yml b/compose/.apps/flaresolverr/flaresolverr.hostname.yml index 8005a71e45..4dc53c3782 100644 --- a/compose/.apps/flaresolverr/flaresolverr.hostname.yml +++ b/compose/.apps/flaresolverr/flaresolverr.hostname.yml @@ -1,3 +1,3 @@ services: - flaresolverr: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/flaresolverr/flaresolverr.labels.yml b/compose/.apps/flaresolverr/flaresolverr.labels.yml index 21044a12ce..535ee8f4f6 100644 --- a/compose/.apps/flaresolverr/flaresolverr.labels.yml +++ b/compose/.apps/flaresolverr/flaresolverr.labels.yml @@ -1,15 +1,15 @@ services: - flaresolverr: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "FlareSolverr is a proxy server to bypass Cloudflare protection" com.dockstarter.appinfo.nicename: "Flaresolverr" - com.dockstarter.appvars.flaresolverr_container_name: "flaresolverr" - com.dockstarter.appvars.flaresolverr_enabled: "false" - com.dockstarter.appvars.flaresolverr_environment_captcha_solver: "none" - com.dockstarter.appvars.flaresolverr_environment_log_html: "false" - com.dockstarter.appvars.flaresolverr_environment_log_level: "info" - com.dockstarter.appvars.flaresolverr_network_mode: "" - com.dockstarter.appvars.flaresolverr_port_8191: "8191" - com.dockstarter.appvars.flaresolverr_restart: "unless-stopped" - com.dockstarter.appvars.flaresolverr_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_captcha_solver: "none" + com.dockstarter.appvars.${_appname_}_environment_log_html: "false" + com.dockstarter.appvars.${_appname_}_environment_log_level: "info" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8191: "8191" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/flaresolverr/flaresolverr.netmode.yml b/compose/.apps/flaresolverr/flaresolverr.netmode.yml index 35ac5cf3f6..f36884ffb9 100644 --- a/compose/.apps/flaresolverr/flaresolverr.netmode.yml +++ b/compose/.apps/flaresolverr/flaresolverr.netmode.yml @@ -1,3 +1,3 @@ services: - flaresolverr: - network_mode: ${FLARESOLVERR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/flaresolverr/flaresolverr.ports.yml b/compose/.apps/flaresolverr/flaresolverr.ports.yml index d620783707..51f6a84e4b 100644 --- a/compose/.apps/flaresolverr/flaresolverr.ports.yml +++ b/compose/.apps/flaresolverr/flaresolverr.ports.yml @@ -1,4 +1,4 @@ services: - flaresolverr: + ${_appname_}: ports: - - ${FLARESOLVERR_PORT_8191}:${FLARESOLVERR_PORT_8191} + - ${${_APPNAME_}_PORT_8191}:${${_APPNAME_}_PORT_8191} diff --git a/compose/.apps/flaresolverr/flaresolverr.x86_64.yml b/compose/.apps/flaresolverr/flaresolverr.x86_64.yml index 0f8e7f3873..07549367bc 100644 --- a/compose/.apps/flaresolverr/flaresolverr.x86_64.yml +++ b/compose/.apps/flaresolverr/flaresolverr.x86_64.yml @@ -1,3 +1,3 @@ services: - flaresolverr: - image: ghcr.io/flaresolverr/flaresolverr:${FLARESOLVERR_TAG} + ${_appname_}: + image: ghcr.io/flaresolverr/flaresolverr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/flaresolverr/flaresolverr.yml b/compose/.apps/flaresolverr/flaresolverr.yml index f0b6af72c7..4b9ee456db 100644 --- a/compose/.apps/flaresolverr/flaresolverr.yml +++ b/compose/.apps/flaresolverr/flaresolverr.yml @@ -1,13 +1,13 @@ services: - flaresolverr: - container_name: ${FLARESOLVERR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - CAPTCHA_SOLVER=${FLARESOLVERR_ENVIRONMENT_CAPTCHA_SOLVER} - - LOG_HTML=${FLARESOLVERR_ENVIRONMENT_LOG_HTML} - - LOG_LEVEL=${FLARESOLVERR_ENVIRONMENT_LOG_LEVEL} - - PORT=${FLARESOLVERR_PORT_8191} + - CAPTCHA_SOLVER=${${_APPNAME_}_ENVIRONMENT_CAPTCHA_SOLVER} + - LOG_HTML=${${_APPNAME_}_ENVIRONMENT_LOG_HTML} + - LOG_LEVEL=${${_APPNAME_}_ENVIRONMENT_LOG_LEVEL} + - PORT=${${_APPNAME_}_PORT_8191} - TZ=${TZ} - restart: ${FLARESOLVERR_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/freshrss/freshrss.aarch64.yml b/compose/.apps/freshrss/freshrss.aarch64.yml index d59dfa0bd4..1f981fe564 100644 --- a/compose/.apps/freshrss/freshrss.aarch64.yml +++ b/compose/.apps/freshrss/freshrss.aarch64.yml @@ -1,3 +1,3 @@ services: - freshrss: - image: lscr.io/linuxserver/freshrss:${FRESHRSS_TAG} + ${_appname_}: + image: lscr.io/linuxserver/freshrss:${${_APPNAME_}_TAG} diff --git a/compose/.apps/freshrss/freshrss.hostname.yml b/compose/.apps/freshrss/freshrss.hostname.yml index 4da701aad0..4dc53c3782 100644 --- a/compose/.apps/freshrss/freshrss.hostname.yml +++ b/compose/.apps/freshrss/freshrss.hostname.yml @@ -1,3 +1,3 @@ services: - freshrss: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/freshrss/freshrss.labels.yml b/compose/.apps/freshrss/freshrss.labels.yml index f04c193a68..354ca53916 100644 --- a/compose/.apps/freshrss/freshrss.labels.yml +++ b/compose/.apps/freshrss/freshrss.labels.yml @@ -1,12 +1,12 @@ services: - freshrss: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Free, self-hostable aggregator for rss feeds" com.dockstarter.appinfo.nicename: "FreshRSS" - com.dockstarter.appvars.freshrss_container_name: "freshrss" - com.dockstarter.appvars.freshrss_enabled: "false" - com.dockstarter.appvars.freshrss_network_mode: "" - com.dockstarter.appvars.freshrss_port_80: "8012" - com.dockstarter.appvars.freshrss_restart: "unless-stopped" - com.dockstarter.appvars.freshrss_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_80: "8012" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/freshrss/freshrss.netmode.yml b/compose/.apps/freshrss/freshrss.netmode.yml index 8c13813dc5..f36884ffb9 100644 --- a/compose/.apps/freshrss/freshrss.netmode.yml +++ b/compose/.apps/freshrss/freshrss.netmode.yml @@ -1,3 +1,3 @@ services: - freshrss: - network_mode: ${FRESHRSS_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/freshrss/freshrss.ports.yml b/compose/.apps/freshrss/freshrss.ports.yml index 8505a5de29..c37afbebb5 100644 --- a/compose/.apps/freshrss/freshrss.ports.yml +++ b/compose/.apps/freshrss/freshrss.ports.yml @@ -1,4 +1,4 @@ services: - freshrss: + ${_appname_}: ports: - - ${FRESHRSS_PORT_80}:80 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/freshrss/freshrss.x86_64.yml b/compose/.apps/freshrss/freshrss.x86_64.yml index d59dfa0bd4..1f981fe564 100644 --- a/compose/.apps/freshrss/freshrss.x86_64.yml +++ b/compose/.apps/freshrss/freshrss.x86_64.yml @@ -1,3 +1,3 @@ services: - freshrss: - image: lscr.io/linuxserver/freshrss:${FRESHRSS_TAG} + ${_appname_}: + image: lscr.io/linuxserver/freshrss:${${_APPNAME_}_TAG} diff --git a/compose/.apps/freshrss/freshrss.yml b/compose/.apps/freshrss/freshrss.yml index 20db9c3709..ace6d5d0ab 100644 --- a/compose/.apps/freshrss/freshrss.yml +++ b/compose/.apps/freshrss/freshrss.yml @@ -1,12 +1,12 @@ services: - freshrss: - container_name: ${FRESHRSS_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${FRESHRSS_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/freshrss:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/gitea/gitea.hostname.yml b/compose/.apps/gitea/gitea.hostname.yml index e737898a33..4dc53c3782 100644 --- a/compose/.apps/gitea/gitea.hostname.yml +++ b/compose/.apps/gitea/gitea.hostname.yml @@ -1,3 +1,3 @@ services: - gitea: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/gitea/gitea.labels.yml b/compose/.apps/gitea/gitea.labels.yml index f3cbe55487..184851ce75 100644 --- a/compose/.apps/gitea/gitea.labels.yml +++ b/compose/.apps/gitea/gitea.labels.yml @@ -1,12 +1,12 @@ services: - gitea: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A painless self-hosted Git service" com.dockstarter.appinfo.nicename: "Gitea" - com.dockstarter.appvars.gitea_container_name: "gitea" - com.dockstarter.appvars.gitea_enabled: "false" - com.dockstarter.appvars.gitea_network_mode: "" - com.dockstarter.appvars.gitea_port_3000: "3000" - com.dockstarter.appvars.gitea_restart: "unless-stopped" - com.dockstarter.appvars.gitea_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_3000: "3000" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/gitea/gitea.netmode.yml b/compose/.apps/gitea/gitea.netmode.yml index 3f0de1631d..f36884ffb9 100644 --- a/compose/.apps/gitea/gitea.netmode.yml +++ b/compose/.apps/gitea/gitea.netmode.yml @@ -1,3 +1,3 @@ services: - gitea: - network_mode: ${GITEA_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/gitea/gitea.ports.yml b/compose/.apps/gitea/gitea.ports.yml index 0f0555c975..40e1a7dee8 100644 --- a/compose/.apps/gitea/gitea.ports.yml +++ b/compose/.apps/gitea/gitea.ports.yml @@ -1,4 +1,4 @@ services: - gitea: + ${_appname_}: ports: - - ${GITEA_PORT_3000}:3000 + - ${${_APPNAME_}_PORT_3000}:3000 diff --git a/compose/.apps/gitea/gitea.x86_64.yml b/compose/.apps/gitea/gitea.x86_64.yml index 55aa278e3f..b3826d4f5c 100644 --- a/compose/.apps/gitea/gitea.x86_64.yml +++ b/compose/.apps/gitea/gitea.x86_64.yml @@ -1,3 +1,3 @@ services: - gitea: - image: gitea/gitea:${GITEA_TAG} + ${_appname_}: + image: gitea/gitea:${${_APPNAME_}_TAG} diff --git a/compose/.apps/gitea/gitea.yml b/compose/.apps/gitea/gitea.yml index 5e4e89f117..fc7027294b 100644 --- a/compose/.apps/gitea/gitea.yml +++ b/compose/.apps/gitea/gitea.yml @@ -1,13 +1,13 @@ services: - gitea: - container_name: ${GITEA_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - USER_UID=${PUID} - USER_GID=${PGID} - TZ=${TZ} - restart: ${GITEA_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro - - ${DOCKER_VOLUME_CONFIG}/gitea:/data + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/glances/glances.hostname.yml b/compose/.apps/glances/glances.hostname.yml index 02dfafc149..4dc53c3782 100644 --- a/compose/.apps/glances/glances.hostname.yml +++ b/compose/.apps/glances/glances.hostname.yml @@ -1,3 +1,3 @@ services: - glances: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/glances/glances.labels.yml b/compose/.apps/glances/glances.labels.yml index 0e71cdd9af..21f0e44b60 100644 --- a/compose/.apps/glances/glances.labels.yml +++ b/compose/.apps/glances/glances.labels.yml @@ -1,15 +1,15 @@ services: - glances: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Cross-platform system monitoring tool" com.dockstarter.appinfo.nicename: "Glances" - com.dockstarter.appvars.glances_container_name: "glances" - com.dockstarter.appvars.glances_enabled: "false" - com.dockstarter.appvars.glances_environment_opt: "-w" - com.dockstarter.appvars.glances_network_mode: "" - com.dockstarter.appvars.glances_port_61208: "61208" - com.dockstarter.appvars.glances_port_61209: "61209" - com.dockstarter.appvars.glances_restart: "unless-stopped" - com.dockstarter.appvars.glances_tag: "latest" - com.dockstarter.appvars.glances_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_opt: "-w" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_61208: "61208" + com.dockstarter.appvars.${_appname_}_port_61209: "61209" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/glances/glances.netmode.yml b/compose/.apps/glances/glances.netmode.yml index 61f4992a78..f36884ffb9 100644 --- a/compose/.apps/glances/glances.netmode.yml +++ b/compose/.apps/glances/glances.netmode.yml @@ -1,3 +1,3 @@ services: - glances: - network_mode: ${GLANCES_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/glances/glances.ports.yml b/compose/.apps/glances/glances.ports.yml index 3d794cb90c..33638dea19 100644 --- a/compose/.apps/glances/glances.ports.yml +++ b/compose/.apps/glances/glances.ports.yml @@ -1,5 +1,5 @@ services: - glances: + ${_appname_}: ports: - - ${GLANCES_PORT_61208}:61208 - - ${GLANCES_PORT_61209}:61209 + - ${${_APPNAME_}_PORT_61208}:61208 + - ${${_APPNAME_}_PORT_61209}:61209 diff --git a/compose/.apps/glances/glances.x86_64.yml b/compose/.apps/glances/glances.x86_64.yml index 92869ba167..249170c72c 100644 --- a/compose/.apps/glances/glances.x86_64.yml +++ b/compose/.apps/glances/glances.x86_64.yml @@ -1,3 +1,3 @@ services: - glances: - image: nicolargo/glances:${GLANCES_TAG} + ${_appname_}: + image: nicolargo/glances:${${_APPNAME_}_TAG} diff --git a/compose/.apps/glances/glances.yml b/compose/.apps/glances/glances.yml index c33393b3c5..2ac86f88a0 100644 --- a/compose/.apps/glances/glances.yml +++ b/compose/.apps/glances/glances.yml @@ -1,13 +1,13 @@ services: - glances: - container_name: ${GLANCES_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - GLANCES_OPT=${GLANCES_ENVIRONMENT_OPT} + - GLANCES_OPT=${${_APPNAME_}_ENVIRONMENT_OPT} - TZ=${TZ} pid: host - restart: ${GLANCES_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/glances:/glances/conf + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/glances/conf - ${DOCKER_VOLUME_STORAGE}:/storage - - ${GLANCES_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock:ro + - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock:ro diff --git a/compose/.apps/gluetun/gluetun.aarch64.yml b/compose/.apps/gluetun/gluetun.aarch64.yml index 4f7b26465c..4e2f9331e1 100644 --- a/compose/.apps/gluetun/gluetun.aarch64.yml +++ b/compose/.apps/gluetun/gluetun.aarch64.yml @@ -1,3 +1,3 @@ services: - gluetun: - image: ghcr.io/qdm12/gluetun:${GLUETUN_TAG} + ${_appname_}: + image: ghcr.io/qdm12/gluetun:${${_APPNAME_}_TAG} diff --git a/compose/.apps/gluetun/gluetun.hostname.yml b/compose/.apps/gluetun/gluetun.hostname.yml index 7e643dd0e7..4dc53c3782 100644 --- a/compose/.apps/gluetun/gluetun.hostname.yml +++ b/compose/.apps/gluetun/gluetun.hostname.yml @@ -1,3 +1,3 @@ services: - gluetun: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/gluetun/gluetun.labels.yml b/compose/.apps/gluetun/gluetun.labels.yml index 7f105d2332..112c84143e 100644 --- a/compose/.apps/gluetun/gluetun.labels.yml +++ b/compose/.apps/gluetun/gluetun.labels.yml @@ -1,62 +1,62 @@ services: - gluetun: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "VPN client in a thin Docker container for multiple VPN providers." com.dockstarter.appinfo.nicename: "Gluetun" - com.dockstarter.appvars.gluetun_container_name: "gluetun" - com.dockstarter.appvars.gluetun_enabled: "false" - com.dockstarter.appvars.gluetun_environment_firewall_debug: "off" - com.dockstarter.appvars.gluetun_environment_firewall_input_ports: "" - com.dockstarter.appvars.gluetun_environment_firewall_outbound_subnets: "" - com.dockstarter.appvars.gluetun_environment_firewall_vpn_input_ports: "" - com.dockstarter.appvars.gluetun_environment_free_only: "" - com.dockstarter.appvars.gluetun_environment_http_control_server_log: "on" - com.dockstarter.appvars.gluetun_environment_httpproxy: "off" - com.dockstarter.appvars.gluetun_environment_httpproxy_log: "off" - com.dockstarter.appvars.gluetun_environment_httpproxy_password: "" - com.dockstarter.appvars.gluetun_environment_httpproxy_stealth: "off" - com.dockstarter.appvars.gluetun_environment_httpproxy_user: "" - com.dockstarter.appvars.gluetun_environment_isp: "" - com.dockstarter.appvars.gluetun_environment_openvpn_custom_config: "/gluetun/custom.conf" - com.dockstarter.appvars.gluetun_environment_openvpn_password: "" - com.dockstarter.appvars.gluetun_environment_openvpn_user: "" - com.dockstarter.appvars.gluetun_environment_owned_only: "no" - com.dockstarter.appvars.gluetun_environment_premium_only: "no" - com.dockstarter.appvars.gluetun_environment_private_internet_access_openvpn_encryption_preset: "strong" - com.dockstarter.appvars.gluetun_environment_publicip_file: "/tmp/gluetun/ip" - com.dockstarter.appvars.gluetun_environment_publicip_period: "12h" - com.dockstarter.appvars.gluetun_environment_server_cities: "" - com.dockstarter.appvars.gluetun_environment_server_countries: "" - com.dockstarter.appvars.gluetun_environment_server_hostnames: "" - com.dockstarter.appvars.gluetun_environment_server_names: "" - com.dockstarter.appvars.gluetun_environment_server_regions: "" - com.dockstarter.appvars.gluetun_environment_shadowsocks: "off" - com.dockstarter.appvars.gluetun_environment_shadowsocks_cipher: "chacha20-ietf-poly1305" - com.dockstarter.appvars.gluetun_environment_shadowsocks_log: "off" - com.dockstarter.appvars.gluetun_environment_shadowsocks_password: "" - com.dockstarter.appvars.gluetun_environment_updater_min_ratio: "0.8" - com.dockstarter.appvars.gluetun_environment_updater_period: "" - com.dockstarter.appvars.gluetun_environment_updater_vpn_service_providers: "" - com.dockstarter.appvars.gluetun_environment_version_information: "on" - com.dockstarter.appvars.gluetun_environment_vpn_endpoint_ip: "" - com.dockstarter.appvars.gluetun_environment_vpn_endpoint_port: "" - com.dockstarter.appvars.gluetun_environment_vpn_interface: "tun0" - com.dockstarter.appvars.gluetun_environment_vpn_port_forwarding: "off" - com.dockstarter.appvars.gluetun_environment_vpn_port_forwarding_provider: "" - com.dockstarter.appvars.gluetun_environment_vpn_port_forwarding_status_file: "/tmp/gluetun/forwarded_port" - com.dockstarter.appvars.gluetun_environment_vpn_service_provider: "private internet access" - com.dockstarter.appvars.gluetun_environment_vpn_type: "openvpn" - com.dockstarter.appvars.gluetun_environment_wireguard_addresses: "" - com.dockstarter.appvars.gluetun_environment_wireguard_allowed_ips: "0.0.0.0/0,::/0" - com.dockstarter.appvars.gluetun_environment_wireguard_implementation: "auto" - com.dockstarter.appvars.gluetun_environment_wireguard_mtu: "1400" - com.dockstarter.appvars.gluetun_environment_wireguard_preshared_key: "" - com.dockstarter.appvars.gluetun_environment_wireguard_private_key: "" - com.dockstarter.appvars.gluetun_environment_wireguard_public_key: "" - com.dockstarter.appvars.gluetun_network_mode: "" - com.dockstarter.appvars.gluetun_port_8000: "8000" - com.dockstarter.appvars.gluetun_port_8388: "8388" - com.dockstarter.appvars.gluetun_port_8888: "8888" - com.dockstarter.appvars.gluetun_restart: "unless-stopped" - com.dockstarter.appvars.gluetun_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_firewall_debug: "off" + com.dockstarter.appvars.${_appname_}_environment_firewall_input_ports: "" + com.dockstarter.appvars.${_appname_}_environment_firewall_outbound_subnets: "" + com.dockstarter.appvars.${_appname_}_environment_firewall_vpn_input_ports: "" + com.dockstarter.appvars.${_appname_}_environment_free_only: "" + com.dockstarter.appvars.${_appname_}_environment_http_control_server_log: "on" + com.dockstarter.appvars.${_appname_}_environment_httpproxy: "off" + com.dockstarter.appvars.${_appname_}_environment_httpproxy_log: "off" + com.dockstarter.appvars.${_appname_}_environment_httpproxy_password: "" + com.dockstarter.appvars.${_appname_}_environment_httpproxy_stealth: "off" + com.dockstarter.appvars.${_appname_}_environment_httpproxy_user: "" + com.dockstarter.appvars.${_appname_}_environment_isp: "" + com.dockstarter.appvars.${_appname_}_environment_openvpn_custom_config: "/gluetun/custom.conf" + com.dockstarter.appvars.${_appname_}_environment_openvpn_password: "" + com.dockstarter.appvars.${_appname_}_environment_openvpn_user: "" + com.dockstarter.appvars.${_appname_}_environment_owned_only: "no" + com.dockstarter.appvars.${_appname_}_environment_premium_only: "no" + com.dockstarter.appvars.${_appname_}_environment_private_internet_access_openvpn_encryption_preset: "strong" + com.dockstarter.appvars.${_appname_}_environment_publicip_file: "/tmp/gluetun/ip" + com.dockstarter.appvars.${_appname_}_environment_publicip_period: "12h" + com.dockstarter.appvars.${_appname_}_environment_server_cities: "" + com.dockstarter.appvars.${_appname_}_environment_server_countries: "" + com.dockstarter.appvars.${_appname_}_environment_server_hostnames: "" + com.dockstarter.appvars.${_appname_}_environment_server_names: "" + com.dockstarter.appvars.${_appname_}_environment_server_regions: "" + com.dockstarter.appvars.${_appname_}_environment_shadowsocks: "off" + com.dockstarter.appvars.${_appname_}_environment_shadowsocks_cipher: "chacha20-ietf-poly1305" + com.dockstarter.appvars.${_appname_}_environment_shadowsocks_log: "off" + com.dockstarter.appvars.${_appname_}_environment_shadowsocks_password: "" + com.dockstarter.appvars.${_appname_}_environment_updater_min_ratio: "0.8" + com.dockstarter.appvars.${_appname_}_environment_updater_period: "" + com.dockstarter.appvars.${_appname_}_environment_updater_vpn_service_providers: "" + com.dockstarter.appvars.${_appname_}_environment_version_information: "on" + com.dockstarter.appvars.${_appname_}_environment_vpn_endpoint_ip: "" + com.dockstarter.appvars.${_appname_}_environment_vpn_endpoint_port: "" + com.dockstarter.appvars.${_appname_}_environment_vpn_interface: "tun0" + com.dockstarter.appvars.${_appname_}_environment_vpn_port_forwarding: "off" + com.dockstarter.appvars.${_appname_}_environment_vpn_port_forwarding_provider: "" + com.dockstarter.appvars.${_appname_}_environment_vpn_port_forwarding_status_file: "/tmp/gluetun/forwarded_port" + com.dockstarter.appvars.${_appname_}_environment_vpn_service_provider: "private internet access" + com.dockstarter.appvars.${_appname_}_environment_vpn_type: "openvpn" + com.dockstarter.appvars.${_appname_}_environment_wireguard_addresses: "" + com.dockstarter.appvars.${_appname_}_environment_wireguard_allowed_ips: "0.0.0.0/0,::/0" + com.dockstarter.appvars.${_appname_}_environment_wireguard_implementation: "auto" + com.dockstarter.appvars.${_appname_}_environment_wireguard_mtu: "1400" + com.dockstarter.appvars.${_appname_}_environment_wireguard_preshared_key: "" + com.dockstarter.appvars.${_appname_}_environment_wireguard_private_key: "" + com.dockstarter.appvars.${_appname_}_environment_wireguard_public_key: "" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8000: "8000" + com.dockstarter.appvars.${_appname_}_port_8388: "8388" + com.dockstarter.appvars.${_appname_}_port_8888: "8888" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/gluetun/gluetun.netmode.yml b/compose/.apps/gluetun/gluetun.netmode.yml index 05039341e3..f36884ffb9 100644 --- a/compose/.apps/gluetun/gluetun.netmode.yml +++ b/compose/.apps/gluetun/gluetun.netmode.yml @@ -1,3 +1,3 @@ services: - gluetun: - network_mode: ${GLUETUN_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/gluetun/gluetun.ports.yml b/compose/.apps/gluetun/gluetun.ports.yml index 492b681f8c..3fa66e0b28 100644 --- a/compose/.apps/gluetun/gluetun.ports.yml +++ b/compose/.apps/gluetun/gluetun.ports.yml @@ -1,7 +1,7 @@ services: - gluetun: + ${_appname_}: ports: - - ${GLUETUN_PORT_8000}:8000 - - ${GLUETUN_PORT_8388}:8388 - - ${GLUETUN_PORT_8388}:8388/udp - - ${GLUETUN_PORT_8888}:8888 + - ${${_APPNAME_}_PORT_8000}:8000 + - ${${_APPNAME_}_PORT_8388}:8388 + - ${${_APPNAME_}_PORT_8388}:8388/udp + - ${${_APPNAME_}_PORT_8888}:8888 diff --git a/compose/.apps/gluetun/gluetun.x86_64.yml b/compose/.apps/gluetun/gluetun.x86_64.yml index 4f7b26465c..4e2f9331e1 100644 --- a/compose/.apps/gluetun/gluetun.x86_64.yml +++ b/compose/.apps/gluetun/gluetun.x86_64.yml @@ -1,3 +1,3 @@ services: - gluetun: - image: ghcr.io/qdm12/gluetun:${GLUETUN_TAG} + ${_appname_}: + image: ghcr.io/qdm12/gluetun:${${_APPNAME_}_TAG} diff --git a/compose/.apps/gluetun/gluetun.yml b/compose/.apps/gluetun/gluetun.yml index d5b4d8ba58..38e2b4b25c 100644 --- a/compose/.apps/gluetun/gluetun.yml +++ b/compose/.apps/gluetun/gluetun.yml @@ -1,61 +1,61 @@ services: - gluetun: + ${_appname_}: cap_add: - NET_ADMIN - container_name: ${GLUETUN_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} devices: - /dev/net/tun environment: - - FIREWALL_DEBUG=${GLUETUN_ENVIRONMENT_FIREWALL_DEBUG} - - FIREWALL_INPUT_PORTS=${GLUETUN_ENVIRONMENT_FIREWALL_INPUT_PORTS} - - FIREWALL_OUTBOUND_SUBNETS=${GLUETUN_ENVIRONMENT_FIREWALL_OUTBOUND_SUBNETS} - - FIREWALL_VPN_INPUT_PORTS=${GLUETUN_ENVIRONMENT_FIREWALL_VPN_INPUT_PORTS} - - FREE_ONLY=${GLUETUN_ENVIRONMENT_FREE_ONLY} - - HTTPPROXY=${GLUETUN_ENVIRONMENT_HTTPPROXY} - - HTTPPROXY_LOG=${GLUETUN_ENVIRONMENT_HTTPPROXY_LOG} - - HTTPPROXY_PASSWORD=${GLUETUN_ENVIRONMENT_HTTPPROXY_PASSWORD} - - HTTPPROXY_STEALTH=${GLUETUN_ENVIRONMENT_HTTPPROXY_STEALTH} - - HTTPPROXY_USER=${GLUETUN_ENVIRONMENT_HTTPPROXY_USER} - - HTTP_CONTROL_SERVER_LOG=${GLUETUN_ENVIRONMENT_HTTP_CONTROL_SERVER_LOG} - - ISP=${GLUETUN_ENVIRONMENT_ISP} - - OPENVPN_CUSTOM_CONFIG=${GLUETUN_ENVIRONMENT_OPENVPN_CUSTOM_CONFIG} - - OPENVPN_PASSWORD=${GLUETUN_ENVIRONMENT_OPENVPN_PASSWORD} - - OPENVPN_USER=${GLUETUN_ENVIRONMENT_OPENVPN_USER} - - OWNED_ONLY=${GLUETUN_ENVIRONMENT_OWNED_ONLY} - - PREMIUM_ONLY=${GLUETUN_ENVIRONMENT_PREMIUM_ONLY} - - PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET=${GLUETUN_ENVIRONMENT_PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET} - - PUBLICIP_FILE=${GLUETUN_ENVIRONMENT_PUBLICIP_FILE} - - PUBLICIP_PERIOD=${GLUETUN_ENVIRONMENT_PUBLICIP_PERIOD} - - SERVER_CITIES=${GLUETUN_ENVIRONMENT_SERVER_CITIES} - - SERVER_COUNTRIES=${GLUETUN_ENVIRONMENT_SERVER_COUNTRIES} - - SERVER_HOSTNAMES=${GLUETUN_ENVIRONMENT_SERVER_HOSTNAMES} - - SERVER_NAMES=${GLUETUN_ENVIRONMENT_SERVER_NAMES} - - SERVER_REGIONS=${GLUETUN_ENVIRONMENT_SERVER_REGIONS} - - SHADOWSOCKS=${GLUETUN_ENVIRONMENT_SHADOWSOCKS} - - SHADOWSOCKS_CIPHER=${GLUETUN_ENVIRONMENT_SHADOWSOCKS_CIPHER} - - SHADOWSOCKS_LOG=${GLUETUN_ENVIRONMENT_SHADOWSOCKS_LOG} - - SHADOWSOCKS_PASSWORD=${GLUETUN_ENVIRONMENT_SHADOWSOCKS_PASSWORD} + - FIREWALL_DEBUG=${${_APPNAME_}_ENVIRONMENT_FIREWALL_DEBUG} + - FIREWALL_INPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_FIREWALL_INPUT_PORTS} + - FIREWALL_OUTBOUND_SUBNETS=${${_APPNAME_}_ENVIRONMENT_FIREWALL_OUTBOUND_SUBNETS} + - FIREWALL_VPN_INPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_FIREWALL_VPN_INPUT_PORTS} + - FREE_ONLY=${${_APPNAME_}_ENVIRONMENT_FREE_ONLY} + - HTTPPROXY=${${_APPNAME_}_ENVIRONMENT_HTTPPROXY} + - HTTPPROXY_LOG=${${_APPNAME_}_ENVIRONMENT_HTTPPROXY_LOG} + - HTTPPROXY_PASSWORD=${${_APPNAME_}_ENVIRONMENT_HTTPPROXY_PASSWORD} + - HTTPPROXY_STEALTH=${${_APPNAME_}_ENVIRONMENT_HTTPPROXY_STEALTH} + - HTTPPROXY_USER=${${_APPNAME_}_ENVIRONMENT_HTTPPROXY_USER} + - HTTP_CONTROL_SERVER_LOG=${${_APPNAME_}_ENVIRONMENT_HTTP_CONTROL_SERVER_LOG} + - ISP=${${_APPNAME_}_ENVIRONMENT_ISP} + - OPENVPN_CUSTOM_CONFIG=${${_APPNAME_}_ENVIRONMENT_OPENVPN_CUSTOM_CONFIG} + - OPENVPN_PASSWORD=${${_APPNAME_}_ENVIRONMENT_OPENVPN_PASSWORD} + - OPENVPN_USER=${${_APPNAME_}_ENVIRONMENT_OPENVPN_USER} + - OWNED_ONLY=${${_APPNAME_}_ENVIRONMENT_OWNED_ONLY} + - PREMIUM_ONLY=${${_APPNAME_}_ENVIRONMENT_PREMIUM_ONLY} + - PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET=${${_APPNAME_}_ENVIRONMENT_PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET} + - PUBLICIP_FILE=${${_APPNAME_}_ENVIRONMENT_PUBLICIP_FILE} + - PUBLICIP_PERIOD=${${_APPNAME_}_ENVIRONMENT_PUBLICIP_PERIOD} + - SERVER_CITIES=${${_APPNAME_}_ENVIRONMENT_SERVER_CITIES} + - SERVER_COUNTRIES=${${_APPNAME_}_ENVIRONMENT_SERVER_COUNTRIES} + - SERVER_HOSTNAMES=${${_APPNAME_}_ENVIRONMENT_SERVER_HOSTNAMES} + - SERVER_NAMES=${${_APPNAME_}_ENVIRONMENT_SERVER_NAMES} + - SERVER_REGIONS=${${_APPNAME_}_ENVIRONMENT_SERVER_REGIONS} + - SHADOWSOCKS=${${_APPNAME_}_ENVIRONMENT_SHADOWSOCKS} + - SHADOWSOCKS_CIPHER=${${_APPNAME_}_ENVIRONMENT_SHADOWSOCKS_CIPHER} + - SHADOWSOCKS_LOG=${${_APPNAME_}_ENVIRONMENT_SHADOWSOCKS_LOG} + - SHADOWSOCKS_PASSWORD=${${_APPNAME_}_ENVIRONMENT_SHADOWSOCKS_PASSWORD} - TZ=${TZ} - - UPDATER_MIN_RATIO=${GLUETUN_ENVIRONMENT_UPDATER_MIN_RATIO} - - UPDATER_PERIOD=${GLUETUN_ENVIRONMENT_UPDATER_PERIOD} - - UPDATER_VPN_SERVICE_PROVIDERS=${GLUETUN_ENVIRONMENT_UPDATER_VPN_SERVICE_PROVIDERS} - - VERSION_INFORMATION=${GLUETUN_ENVIRONMENT_VERSION_INFORMATION} - - VPN_ENDPOINT_IP=${GLUETUN_ENVIRONMENT_VPN_ENDPOINT_IP} - - VPN_ENDPOINT_PORT=${GLUETUN_ENVIRONMENT_VPN_ENDPOINT_PORT} - - VPN_INTERFACE=${GLUETUN_ENVIRONMENT_VPN_INTERFACE} - - VPN_PORT_FORWARDING=${GLUETUN_ENVIRONMENT_VPN_PORT_FORWARDING} - - VPN_PORT_FORWARDING_STATUS_FILE=${GLUETUN_ENVIRONMENT_VPN_PORT_FORWARDING_STATUS_FILE} - - VPN_SERVICE_PROVIDER=${GLUETUN_ENVIRONMENT_VPN_SERVICE_PROVIDER} - - VPN_TYPE=${GLUETUN_ENVIRONMENT_VPN_TYPE} - - WIREGUARD_ADDRESSES=${GLUETUN_ENVIRONMENT_WIREGUARD_ADDRESSES} - - WIREGUARD_ALLOWED_IPS=${GLUETUN_ENVIRONMENT_WIREGUARD_ALLOWED_IPS} - - WIREGUARD_IMPLEMENTATION=${GLUETUN_ENVIRONMENT_WIREGUARD_IMPLEMENTATION} - - WIREGUARD_MTU=${GLUETUN_ENVIRONMENT_WIREGUARD_MTU} - - WIREGUARD_PRESHARED_KEY=${GLUETUN_ENVIRONMENT_WIREGUARD_PRESHARED_KEY} - - WIREGUARD_PRIVATE_KEY=${GLUETUN_ENVIRONMENT_WIREGUARD_PRIVATE_KEY} - - WIREGUARD_PUBLIC_KEY=${GLUETUN_ENVIRONMENT_WIREGUARD_PUBLIC_KEY} - restart: ${GLUETUN_RESTART} + - UPDATER_MIN_RATIO=${${_APPNAME_}_ENVIRONMENT_UPDATER_MIN_RATIO} + - UPDATER_PERIOD=${${_APPNAME_}_ENVIRONMENT_UPDATER_PERIOD} + - UPDATER_VPN_SERVICE_PROVIDERS=${${_APPNAME_}_ENVIRONMENT_UPDATER_VPN_SERVICE_PROVIDERS} + - VERSION_INFORMATION=${${_APPNAME_}_ENVIRONMENT_VERSION_INFORMATION} + - VPN_ENDPOINT_IP=${${_APPNAME_}_ENVIRONMENT_VPN_ENDPOINT_IP} + - VPN_ENDPOINT_PORT=${${_APPNAME_}_ENVIRONMENT_VPN_ENDPOINT_PORT} + - VPN_INTERFACE=${${_APPNAME_}_ENVIRONMENT_VPN_INTERFACE} + - VPN_PORT_FORWARDING=${${_APPNAME_}_ENVIRONMENT_VPN_PORT_FORWARDING} + - VPN_PORT_FORWARDING_STATUS_FILE=${${_APPNAME_}_ENVIRONMENT_VPN_PORT_FORWARDING_STATUS_FILE} + - VPN_SERVICE_PROVIDER=${${_APPNAME_}_ENVIRONMENT_VPN_SERVICE_PROVIDER} + - VPN_TYPE=${${_APPNAME_}_ENVIRONMENT_VPN_TYPE} + - WIREGUARD_ADDRESSES=${${_APPNAME_}_ENVIRONMENT_WIREGUARD_ADDRESSES} + - WIREGUARD_ALLOWED_IPS=${${_APPNAME_}_ENVIRONMENT_WIREGUARD_ALLOWED_IPS} + - WIREGUARD_IMPLEMENTATION=${${_APPNAME_}_ENVIRONMENT_WIREGUARD_IMPLEMENTATION} + - WIREGUARD_MTU=${${_APPNAME_}_ENVIRONMENT_WIREGUARD_MTU} + - WIREGUARD_PRESHARED_KEY=${${_APPNAME_}_ENVIRONMENT_WIREGUARD_PRESHARED_KEY} + - WIREGUARD_PRIVATE_KEY=${${_APPNAME_}_ENVIRONMENT_WIREGUARD_PRIVATE_KEY} + - WIREGUARD_PUBLIC_KEY=${${_APPNAME_}_ENVIRONMENT_WIREGUARD_PUBLIC_KEY} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/gluetun:/gluetun + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/gluetun - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/goaccess/goaccess.hostname.yml b/compose/.apps/goaccess/goaccess.hostname.yml index 7d1655f991..4dc53c3782 100644 --- a/compose/.apps/goaccess/goaccess.hostname.yml +++ b/compose/.apps/goaccess/goaccess.hostname.yml @@ -1,3 +1,3 @@ services: - goaccess: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/goaccess/goaccess.labels.yml b/compose/.apps/goaccess/goaccess.labels.yml index 498d0588e6..e7dd41631b 100644 --- a/compose/.apps/goaccess/goaccess.labels.yml +++ b/compose/.apps/goaccess/goaccess.labels.yml @@ -1,13 +1,13 @@ services: - goaccess: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Real-time web log analyzer" com.dockstarter.appinfo.nicename: "GoAccess" - com.dockstarter.appvars.goaccess_container_name: "goaccess" - com.dockstarter.appvars.goaccess_enabled: "false" - com.dockstarter.appvars.goaccess_network_mode: "" - com.dockstarter.appvars.goaccess_port_7889: "7889" - com.dockstarter.appvars.goaccess_restart: "unless-stopped" - com.dockstarter.appvars.goaccess_tag: "latest" - com.dockstarter.appvars.goaccess_volume_logsdir: "~/.config/appdata/swag/log/nginx" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_7889: "7889" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_logsdir: "~/.config/appdata/swag/log/nginx" diff --git a/compose/.apps/goaccess/goaccess.netmode.yml b/compose/.apps/goaccess/goaccess.netmode.yml index 0c5eae0a8a..f36884ffb9 100644 --- a/compose/.apps/goaccess/goaccess.netmode.yml +++ b/compose/.apps/goaccess/goaccess.netmode.yml @@ -1,3 +1,3 @@ services: - goaccess: - network_mode: ${GOACCESS_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/goaccess/goaccess.ports.yml b/compose/.apps/goaccess/goaccess.ports.yml index 04b12a907e..7ee8f42a20 100644 --- a/compose/.apps/goaccess/goaccess.ports.yml +++ b/compose/.apps/goaccess/goaccess.ports.yml @@ -1,4 +1,4 @@ services: - goaccess: + ${_appname_}: ports: - - ${GOACCESS_PORT_7889}:7889 + - ${${_APPNAME_}_PORT_7889}:7889 diff --git a/compose/.apps/goaccess/goaccess.x86_64.yml b/compose/.apps/goaccess/goaccess.x86_64.yml index bfe7c0d76b..539a867e40 100644 --- a/compose/.apps/goaccess/goaccess.x86_64.yml +++ b/compose/.apps/goaccess/goaccess.x86_64.yml @@ -1,3 +1,3 @@ services: - goaccess: - image: gregyankovoy/goaccess:${GOACCESS_TAG} + ${_appname_}: + image: gregyankovoy/goaccess:${${_APPNAME_}_TAG} diff --git a/compose/.apps/goaccess/goaccess.yml b/compose/.apps/goaccess/goaccess.yml index 2b2fbd419e..4519e40524 100644 --- a/compose/.apps/goaccess/goaccess.yml +++ b/compose/.apps/goaccess/goaccess.yml @@ -1,15 +1,15 @@ services: - goaccess: - container_name: ${GOACCESS_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${GOACCESS_RESTART} + restart: ${${_APPNAME_}_RESTART} security_opt: - apparmor:unconfined volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/goaccess:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${GOACCESS_VOLUME_LOGSDIR}:/opt/log:ro + - ${${_APPNAME_}_VOLUME_LOGSDIR}:/opt/log:ro diff --git a/compose/.apps/grafana/grafana.aarch64.yml b/compose/.apps/grafana/grafana.aarch64.yml index 9693fc9dc0..0afbfbd517 100644 --- a/compose/.apps/grafana/grafana.aarch64.yml +++ b/compose/.apps/grafana/grafana.aarch64.yml @@ -1,3 +1,3 @@ services: - grafana: - image: grafana/grafana:${GRAFANA_TAG} + ${_appname_}: + image: grafana/grafana:${${_APPNAME_}_TAG} diff --git a/compose/.apps/grafana/grafana.hostname.yml b/compose/.apps/grafana/grafana.hostname.yml index 592e633542..4dc53c3782 100644 --- a/compose/.apps/grafana/grafana.hostname.yml +++ b/compose/.apps/grafana/grafana.hostname.yml @@ -1,3 +1,3 @@ services: - grafana: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/grafana/grafana.labels.yml b/compose/.apps/grafana/grafana.labels.yml index e68c1dfcd7..773e184f93 100644 --- a/compose/.apps/grafana/grafana.labels.yml +++ b/compose/.apps/grafana/grafana.labels.yml @@ -1,13 +1,13 @@ services: - grafana: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Metrics dashboard and graph editor" com.dockstarter.appinfo.nicename: "Grafana" - com.dockstarter.appvars.grafana_container_name: "grafana" - com.dockstarter.appvars.grafana_enabled: "false" - com.dockstarter.appvars.grafana_environment_gf_install_plugins: "grafana-piechart-panel,grafana-worldmap-panel" - com.dockstarter.appvars.grafana_network_mode: "" - com.dockstarter.appvars.grafana_port_3000: "3000" - com.dockstarter.appvars.grafana_restart: "unless-stopped" - com.dockstarter.appvars.grafana_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_gf_install_plugins: "grafana-piechart-panel,grafana-worldmap-panel" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_3000: "3000" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/grafana/grafana.netmode.yml b/compose/.apps/grafana/grafana.netmode.yml index f8e5216fd7..f36884ffb9 100644 --- a/compose/.apps/grafana/grafana.netmode.yml +++ b/compose/.apps/grafana/grafana.netmode.yml @@ -1,3 +1,3 @@ services: - grafana: - network_mode: ${GRAFANA_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/grafana/grafana.ports.yml b/compose/.apps/grafana/grafana.ports.yml index 9456b44449..40e1a7dee8 100644 --- a/compose/.apps/grafana/grafana.ports.yml +++ b/compose/.apps/grafana/grafana.ports.yml @@ -1,4 +1,4 @@ services: - grafana: + ${_appname_}: ports: - - ${GRAFANA_PORT_3000}:3000 + - ${${_APPNAME_}_PORT_3000}:3000 diff --git a/compose/.apps/grafana/grafana.x86_64.yml b/compose/.apps/grafana/grafana.x86_64.yml index 9693fc9dc0..0afbfbd517 100644 --- a/compose/.apps/grafana/grafana.x86_64.yml +++ b/compose/.apps/grafana/grafana.x86_64.yml @@ -1,3 +1,3 @@ services: - grafana: - image: grafana/grafana:${GRAFANA_TAG} + ${_appname_}: + image: grafana/grafana:${${_APPNAME_}_TAG} diff --git a/compose/.apps/grafana/grafana.yml b/compose/.apps/grafana/grafana.yml index 3c8392e516..70cf4802cd 100644 --- a/compose/.apps/grafana/grafana.yml +++ b/compose/.apps/grafana/grafana.yml @@ -1,12 +1,12 @@ services: - grafana: - container_name: ${GRAFANA_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - GF_INSTALL_PLUGINS=${GRAFANA_ENVIRONMENT_GF_INSTALL_PLUGINS} + - GF_INSTALL_PLUGINS=${${_APPNAME_}_ENVIRONMENT_GF_INSTALL_PLUGINS} - TZ=${TZ} - restart: ${GRAFANA_RESTART} + restart: ${${_APPNAME_}_RESTART} user: ${PUID}:${PGID} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/grafana:/var/lib/grafana + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/var/lib/grafana - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/grocy/grocy.aarch64.yml b/compose/.apps/grocy/grocy.aarch64.yml index 6105d9fbff..7ac948a58b 100644 --- a/compose/.apps/grocy/grocy.aarch64.yml +++ b/compose/.apps/grocy/grocy.aarch64.yml @@ -1,3 +1,3 @@ services: - grocy: - image: lscr.io/linuxserver/grocy:${GROCY_TAG} + ${_appname_}: + image: lscr.io/linuxserver/grocy:${${_APPNAME_}_TAG} diff --git a/compose/.apps/grocy/grocy.hostname.yml b/compose/.apps/grocy/grocy.hostname.yml index b9be59ca45..4dc53c3782 100644 --- a/compose/.apps/grocy/grocy.hostname.yml +++ b/compose/.apps/grocy/grocy.hostname.yml @@ -1,3 +1,3 @@ services: - grocy: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/grocy/grocy.labels.yml b/compose/.apps/grocy/grocy.labels.yml index c8e2fb9933..066e95abf7 100644 --- a/compose/.apps/grocy/grocy.labels.yml +++ b/compose/.apps/grocy/grocy.labels.yml @@ -1,12 +1,12 @@ services: - grocy: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Groceries & household management" com.dockstarter.appinfo.nicename: "grocy" - com.dockstarter.appvars.grocy_container_name: "grocy" - com.dockstarter.appvars.grocy_enabled: "false" - com.dockstarter.appvars.grocy_network_mode: "" - com.dockstarter.appvars.grocy_port_80: "8001" - com.dockstarter.appvars.grocy_restart: "unless-stopped" - com.dockstarter.appvars.grocy_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_80: "8001" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/grocy/grocy.netmode.yml b/compose/.apps/grocy/grocy.netmode.yml index b2c02d1062..f36884ffb9 100644 --- a/compose/.apps/grocy/grocy.netmode.yml +++ b/compose/.apps/grocy/grocy.netmode.yml @@ -1,3 +1,3 @@ services: - grocy: - network_mode: ${GROCY_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/grocy/grocy.ports.yml b/compose/.apps/grocy/grocy.ports.yml index af5904882b..c37afbebb5 100644 --- a/compose/.apps/grocy/grocy.ports.yml +++ b/compose/.apps/grocy/grocy.ports.yml @@ -1,4 +1,4 @@ services: - grocy: + ${_appname_}: ports: - - ${GROCY_PORT_80}:80 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/grocy/grocy.x86_64.yml b/compose/.apps/grocy/grocy.x86_64.yml index 6105d9fbff..7ac948a58b 100644 --- a/compose/.apps/grocy/grocy.x86_64.yml +++ b/compose/.apps/grocy/grocy.x86_64.yml @@ -1,3 +1,3 @@ services: - grocy: - image: lscr.io/linuxserver/grocy:${GROCY_TAG} + ${_appname_}: + image: lscr.io/linuxserver/grocy:${${_APPNAME_}_TAG} diff --git a/compose/.apps/grocy/grocy.yml b/compose/.apps/grocy/grocy.yml index eb5b9cabf6..ace6d5d0ab 100644 --- a/compose/.apps/grocy/grocy.yml +++ b/compose/.apps/grocy/grocy.yml @@ -1,12 +1,12 @@ services: - grocy: - container_name: ${GROCY_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${GROCY_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/grocy:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/guacamole/guacamole.aarch64.yml b/compose/.apps/guacamole/guacamole.aarch64.yml index 02a148288b..dea4fa209a 100644 --- a/compose/.apps/guacamole/guacamole.aarch64.yml +++ b/compose/.apps/guacamole/guacamole.aarch64.yml @@ -1,3 +1,3 @@ services: - guacamole: - image: flcontainers/guacamole:${GUACAMOLE_TAG} + ${_appname_}: + image: flcontainers/guacamole:${${_APPNAME_}_TAG} diff --git a/compose/.apps/guacamole/guacamole.hostname.yml b/compose/.apps/guacamole/guacamole.hostname.yml index 4b1fa7e408..4dc53c3782 100644 --- a/compose/.apps/guacamole/guacamole.hostname.yml +++ b/compose/.apps/guacamole/guacamole.hostname.yml @@ -1,3 +1,3 @@ services: - guacamole: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/guacamole/guacamole.labels.yml b/compose/.apps/guacamole/guacamole.labels.yml index cfffa50ea3..f16f56b7e9 100644 --- a/compose/.apps/guacamole/guacamole.labels.yml +++ b/compose/.apps/guacamole/guacamole.labels.yml @@ -1,13 +1,13 @@ services: - guacamole: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Web application to remote desktop" com.dockstarter.appinfo.nicename: "Guacamole" - com.dockstarter.appvars.guacamole_container_name: "guacamole" - com.dockstarter.appvars.guacamole_enabled: "false" - com.dockstarter.appvars.guacamole_environment_extensions: "" - com.dockstarter.appvars.guacamole_network_mode: "" - com.dockstarter.appvars.guacamole_port_8080: "8080" - com.dockstarter.appvars.guacamole_restart: "unless-stopped" - com.dockstarter.appvars.guacamole_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_extensions: "" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8080: "8080" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/guacamole/guacamole.netmode.yml b/compose/.apps/guacamole/guacamole.netmode.yml index a7283b923b..f36884ffb9 100644 --- a/compose/.apps/guacamole/guacamole.netmode.yml +++ b/compose/.apps/guacamole/guacamole.netmode.yml @@ -1,3 +1,3 @@ services: - guacamole: - network_mode: ${GUACAMOLE_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/guacamole/guacamole.ports.yml b/compose/.apps/guacamole/guacamole.ports.yml index eb86aff61a..7d1c7e4455 100644 --- a/compose/.apps/guacamole/guacamole.ports.yml +++ b/compose/.apps/guacamole/guacamole.ports.yml @@ -1,4 +1,4 @@ services: - guacamole: + ${_appname_}: ports: - - ${GUACAMOLE_PORT_8080}:8080 + - ${${_APPNAME_}_PORT_8080}:8080 diff --git a/compose/.apps/guacamole/guacamole.x86_64.yml b/compose/.apps/guacamole/guacamole.x86_64.yml index 02a148288b..dea4fa209a 100644 --- a/compose/.apps/guacamole/guacamole.x86_64.yml +++ b/compose/.apps/guacamole/guacamole.x86_64.yml @@ -1,3 +1,3 @@ services: - guacamole: - image: flcontainers/guacamole:${GUACAMOLE_TAG} + ${_appname_}: + image: flcontainers/guacamole:${${_APPNAME_}_TAG} diff --git a/compose/.apps/guacamole/guacamole.yml b/compose/.apps/guacamole/guacamole.yml index cf04fa3b30..ef34360ec0 100644 --- a/compose/.apps/guacamole/guacamole.yml +++ b/compose/.apps/guacamole/guacamole.yml @@ -1,11 +1,11 @@ services: - guacamole: - container_name: ${GUACAMOLE_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - EXTENSIONS=${GUACAMOLE_ENVIRONMENT_EXTENSIONS} + - EXTENSIONS=${${_APPNAME_}_ENVIRONMENT_EXTENSIONS} - TZ=${TZ} - restart: ${GUACAMOLE_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/guacamole:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/h5ai/h5ai.labels.yml b/compose/.apps/h5ai/h5ai.labels.yml index f3183c9684..5e0309cf02 100644 --- a/compose/.apps/h5ai/h5ai.labels.yml +++ b/compose/.apps/h5ai/h5ai.labels.yml @@ -4,10 +4,10 @@ services: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Modern file indexer" com.dockstarter.appinfo.nicename: "h5ai" - com.dockstarter.appvars.h5ai_container_name: "h5ai" - com.dockstarter.appvars.h5ai_enabled: "false" - com.dockstarter.appvars.h5ai_network_mode: "" - com.dockstarter.appvars.h5ai_port_8080: "8080" - com.dockstarter.appvars.h5ai_restart: "unless-stopped" - com.dockstarter.appvars.h5ai_tag: "latest" - com.dockstarter.appvars.h5ai_volume_indexdir: "/mnt/h5ai" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8080: "8080" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_indexdir: "/mnt/h5ai" diff --git a/compose/.apps/h5ai/h5ai.netmode.yml b/compose/.apps/h5ai/h5ai.netmode.yml index 3eaaf4d561..4ecd36ec9b 100644 --- a/compose/.apps/h5ai/h5ai.netmode.yml +++ b/compose/.apps/h5ai/h5ai.netmode.yml @@ -1,3 +1,3 @@ services: h5ai: - network_mode: ${H5AI_NETWORK_MODE} + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/h5ai/h5ai.ports.yml b/compose/.apps/h5ai/h5ai.ports.yml index e0b4840448..5cd97d16f1 100644 --- a/compose/.apps/h5ai/h5ai.ports.yml +++ b/compose/.apps/h5ai/h5ai.ports.yml @@ -1,4 +1,4 @@ services: h5ai: ports: - - ${H5AI_PORT_8080}:8080 + - ${${_APPNAME_}_PORT_8080}:8080 diff --git a/compose/.apps/h5ai/h5ai.x86_64.yml b/compose/.apps/h5ai/h5ai.x86_64.yml index 82d7e5fcbc..5c713928cd 100644 --- a/compose/.apps/h5ai/h5ai.x86_64.yml +++ b/compose/.apps/h5ai/h5ai.x86_64.yml @@ -1,3 +1,3 @@ services: h5ai: - image: bixidock/h5ai:${H5AI_TAG} + image: bixidock/h5ai:${${_APPNAME_}_TAG} diff --git a/compose/.apps/h5ai/h5ai.yml b/compose/.apps/h5ai/h5ai.yml index 2d1a8db671..33214d8c5d 100644 --- a/compose/.apps/h5ai/h5ai.yml +++ b/compose/.apps/h5ai/h5ai.yml @@ -1,10 +1,10 @@ services: h5ai: - container_name: ${H5AI_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${H5AI_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage - - ${H5AI_VOLUME_INDEXDIR}:/var/www + - ${${_APPNAME_}_VOLUME_INDEXDIR}:/var/www diff --git a/compose/.apps/handbrake/handbrake.hostname.yml b/compose/.apps/handbrake/handbrake.hostname.yml index 5c30a0a40b..4dc53c3782 100644 --- a/compose/.apps/handbrake/handbrake.hostname.yml +++ b/compose/.apps/handbrake/handbrake.hostname.yml @@ -1,3 +1,3 @@ services: - handbrake: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/handbrake/handbrake.labels.yml b/compose/.apps/handbrake/handbrake.labels.yml index 3587c59775..66b1902a6c 100644 --- a/compose/.apps/handbrake/handbrake.labels.yml +++ b/compose/.apps/handbrake/handbrake.labels.yml @@ -1,14 +1,14 @@ services: - handbrake: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Tool for converting video" com.dockstarter.appinfo.nicename: "HandBrake" - com.dockstarter.appvars.handbrake_container_name: "handbrake" - com.dockstarter.appvars.handbrake_enabled: "false" - com.dockstarter.appvars.handbrake_network_mode: "" - com.dockstarter.appvars.handbrake_port_5800: "5800" - com.dockstarter.appvars.handbrake_restart: "unless-stopped" - com.dockstarter.appvars.handbrake_tag: "latest" - com.dockstarter.appvars.handbrake_volume_outputdir: "/mnt/handbrake/output" - com.dockstarter.appvars.handbrake_volume_watchdir: "/mnt/handbrake/watch" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_5800: "5800" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_outputdir: "/mnt/handbrake/output" + com.dockstarter.appvars.${_appname_}_volume_watchdir: "/mnt/handbrake/watch" diff --git a/compose/.apps/handbrake/handbrake.netmode.yml b/compose/.apps/handbrake/handbrake.netmode.yml index 3913d255ab..f36884ffb9 100644 --- a/compose/.apps/handbrake/handbrake.netmode.yml +++ b/compose/.apps/handbrake/handbrake.netmode.yml @@ -1,3 +1,3 @@ services: - handbrake: - network_mode: ${HANDBRAKE_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/handbrake/handbrake.ports.yml b/compose/.apps/handbrake/handbrake.ports.yml index 0cd995b487..e628931935 100644 --- a/compose/.apps/handbrake/handbrake.ports.yml +++ b/compose/.apps/handbrake/handbrake.ports.yml @@ -1,4 +1,4 @@ services: - handbrake: + ${_appname_}: ports: - - ${HANDBRAKE_PORT_5800}:5800 + - ${${_APPNAME_}_PORT_5800}:5800 diff --git a/compose/.apps/handbrake/handbrake.x86_64.yml b/compose/.apps/handbrake/handbrake.x86_64.yml index 48633d914c..b2c5727935 100644 --- a/compose/.apps/handbrake/handbrake.x86_64.yml +++ b/compose/.apps/handbrake/handbrake.x86_64.yml @@ -1,3 +1,3 @@ services: - handbrake: - image: jlesage/handbrake:${HANDBRAKE_TAG} + ${_appname_}: + image: jlesage/handbrake:${${_APPNAME_}_TAG} diff --git a/compose/.apps/handbrake/handbrake.yml b/compose/.apps/handbrake/handbrake.yml index 93f6fd7055..497c4e3bd1 100644 --- a/compose/.apps/handbrake/handbrake.yml +++ b/compose/.apps/handbrake/handbrake.yml @@ -1,14 +1,14 @@ services: - handbrake: - container_name: ${HANDBRAKE_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - GROUP_ID=${PGID} - USER_ID=${PUID} - TZ=${TZ} - restart: ${HANDBRAKE_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/handbrake:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${HANDBRAKE_VOLUME_OUTPUTDIR}:/output - - ${HANDBRAKE_VOLUME_WATCHDIR}:/watch + - ${${_APPNAME_}_VOLUME_OUTPUTDIR}:/output + - ${${_APPNAME_}_VOLUME_WATCHDIR}:/watch diff --git a/compose/.apps/headphones/headphones.aarch64.yml b/compose/.apps/headphones/headphones.aarch64.yml index 75fac2c08a..d628062d7c 100644 --- a/compose/.apps/headphones/headphones.aarch64.yml +++ b/compose/.apps/headphones/headphones.aarch64.yml @@ -1,3 +1,3 @@ services: - headphones: - image: lscr.io/linuxserver/headphones:${HEADPHONES_TAG} + ${_appname_}: + image: lscr.io/linuxserver/headphones:${${_APPNAME_}_TAG} diff --git a/compose/.apps/headphones/headphones.hostname.yml b/compose/.apps/headphones/headphones.hostname.yml index 8ebaf38029..4dc53c3782 100644 --- a/compose/.apps/headphones/headphones.hostname.yml +++ b/compose/.apps/headphones/headphones.hostname.yml @@ -1,3 +1,3 @@ services: - headphones: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/headphones/headphones.labels.yml b/compose/.apps/headphones/headphones.labels.yml index 2e3ca647d1..b0d3c468c3 100644 --- a/compose/.apps/headphones/headphones.labels.yml +++ b/compose/.apps/headphones/headphones.labels.yml @@ -1,12 +1,12 @@ services: - headphones: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Music PVR Client" com.dockstarter.appinfo.nicename: "Headphones" - com.dockstarter.appvars.headphones_container_name: "headphones" - com.dockstarter.appvars.headphones_enabled: "false" - com.dockstarter.appvars.headphones_network_mode: "" - com.dockstarter.appvars.headphones_port_8181: "8181" - com.dockstarter.appvars.headphones_restart: "unless-stopped" - com.dockstarter.appvars.headphones_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8181: "8181" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/headphones/headphones.netmode.yml b/compose/.apps/headphones/headphones.netmode.yml index 19210756a1..f36884ffb9 100644 --- a/compose/.apps/headphones/headphones.netmode.yml +++ b/compose/.apps/headphones/headphones.netmode.yml @@ -1,3 +1,3 @@ services: - headphones: - network_mode: ${HEADPHONES_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/headphones/headphones.ports.yml b/compose/.apps/headphones/headphones.ports.yml index b2da7002d8..be7c543d2e 100644 --- a/compose/.apps/headphones/headphones.ports.yml +++ b/compose/.apps/headphones/headphones.ports.yml @@ -1,4 +1,4 @@ services: - headphones: + ${_appname_}: ports: - - ${HEADPHONES_PORT_8181}:8181 + - ${${_APPNAME_}_PORT_8181}:8181 diff --git a/compose/.apps/headphones/headphones.x86_64.yml b/compose/.apps/headphones/headphones.x86_64.yml index 75fac2c08a..d628062d7c 100644 --- a/compose/.apps/headphones/headphones.x86_64.yml +++ b/compose/.apps/headphones/headphones.x86_64.yml @@ -1,3 +1,3 @@ services: - headphones: - image: lscr.io/linuxserver/headphones:${HEADPHONES_TAG} + ${_appname_}: + image: lscr.io/linuxserver/headphones:${${_APPNAME_}_TAG} diff --git a/compose/.apps/headphones/headphones.yml b/compose/.apps/headphones/headphones.yml index ccef6ba6d4..ace6d5d0ab 100644 --- a/compose/.apps/headphones/headphones.yml +++ b/compose/.apps/headphones/headphones.yml @@ -1,12 +1,12 @@ services: - headphones: - container_name: ${HEADPHONES_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${HEADPHONES_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/headphones:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/heimdall/heimdall.aarch64.yml b/compose/.apps/heimdall/heimdall.aarch64.yml index df3aec2ae3..fd3908df04 100644 --- a/compose/.apps/heimdall/heimdall.aarch64.yml +++ b/compose/.apps/heimdall/heimdall.aarch64.yml @@ -1,3 +1,3 @@ services: - heimdall: - image: lscr.io/linuxserver/heimdall:${HEIMDALL_TAG} + ${_appname_}: + image: lscr.io/linuxserver/heimdall:${${_APPNAME_}_TAG} diff --git a/compose/.apps/heimdall/heimdall.hostname.yml b/compose/.apps/heimdall/heimdall.hostname.yml index ef3edab88c..4dc53c3782 100644 --- a/compose/.apps/heimdall/heimdall.hostname.yml +++ b/compose/.apps/heimdall/heimdall.hostname.yml @@ -1,3 +1,3 @@ services: - heimdall: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/heimdall/heimdall.labels.yml b/compose/.apps/heimdall/heimdall.labels.yml index fd23099f23..97d26afd5e 100644 --- a/compose/.apps/heimdall/heimdall.labels.yml +++ b/compose/.apps/heimdall/heimdall.labels.yml @@ -1,13 +1,13 @@ services: - heimdall: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Application dashboard and launcher" com.dockstarter.appinfo.nicename: "Heimdall" - com.dockstarter.appvars.heimdall_container_name: "heimdall" - com.dockstarter.appvars.heimdall_enabled: "false" - com.dockstarter.appvars.heimdall_network_mode: "" - com.dockstarter.appvars.heimdall_port_443: "447" - com.dockstarter.appvars.heimdall_port_80: "8002" - com.dockstarter.appvars.heimdall_restart: "unless-stopped" - com.dockstarter.appvars.heimdall_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_443: "447" + com.dockstarter.appvars.${_appname_}_port_80: "8002" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/heimdall/heimdall.netmode.yml b/compose/.apps/heimdall/heimdall.netmode.yml index 1dc09ffb4e..f36884ffb9 100644 --- a/compose/.apps/heimdall/heimdall.netmode.yml +++ b/compose/.apps/heimdall/heimdall.netmode.yml @@ -1,3 +1,3 @@ services: - heimdall: - network_mode: ${HEIMDALL_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/heimdall/heimdall.ports.yml b/compose/.apps/heimdall/heimdall.ports.yml index f48eed4735..b90d412fbb 100644 --- a/compose/.apps/heimdall/heimdall.ports.yml +++ b/compose/.apps/heimdall/heimdall.ports.yml @@ -1,5 +1,5 @@ services: - heimdall: + ${_appname_}: ports: - - ${HEIMDALL_PORT_443}:443 - - ${HEIMDALL_PORT_80}:80 + - ${${_APPNAME_}_PORT_443}:443 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/heimdall/heimdall.x86_64.yml b/compose/.apps/heimdall/heimdall.x86_64.yml index df3aec2ae3..fd3908df04 100644 --- a/compose/.apps/heimdall/heimdall.x86_64.yml +++ b/compose/.apps/heimdall/heimdall.x86_64.yml @@ -1,3 +1,3 @@ services: - heimdall: - image: lscr.io/linuxserver/heimdall:${HEIMDALL_TAG} + ${_appname_}: + image: lscr.io/linuxserver/heimdall:${${_APPNAME_}_TAG} diff --git a/compose/.apps/heimdall/heimdall.yml b/compose/.apps/heimdall/heimdall.yml index d366b11227..ace6d5d0ab 100644 --- a/compose/.apps/heimdall/heimdall.yml +++ b/compose/.apps/heimdall/heimdall.yml @@ -1,12 +1,12 @@ services: - heimdall: - container_name: ${HEIMDALL_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${HEIMDALL_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/heimdall:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/homeassistant/homeassistant.aarch64.yml b/compose/.apps/homeassistant/homeassistant.aarch64.yml index 87b4a33958..dead196a5f 100644 --- a/compose/.apps/homeassistant/homeassistant.aarch64.yml +++ b/compose/.apps/homeassistant/homeassistant.aarch64.yml @@ -1,3 +1,3 @@ services: - homeassistant: - image: homeassistant/home-assistant:${HOMEASSISTANT_TAG} + ${_appname_}: + image: homeassistant/home-assistant:${${_APPNAME_}_TAG} diff --git a/compose/.apps/homeassistant/homeassistant.hostname.yml b/compose/.apps/homeassistant/homeassistant.hostname.yml index 3cfdd7c421..4dc53c3782 100644 --- a/compose/.apps/homeassistant/homeassistant.hostname.yml +++ b/compose/.apps/homeassistant/homeassistant.hostname.yml @@ -1,3 +1,3 @@ services: - homeassistant: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/homeassistant/homeassistant.labels.yml b/compose/.apps/homeassistant/homeassistant.labels.yml index 43e63d70dc..08a757e7b4 100644 --- a/compose/.apps/homeassistant/homeassistant.labels.yml +++ b/compose/.apps/homeassistant/homeassistant.labels.yml @@ -1,12 +1,12 @@ services: - homeassistant: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Track and control all devices at home and automate control" com.dockstarter.appinfo.nicename: "HomeAssistant" - com.dockstarter.appvars.homeassistant_container_name: "homeassistant" - com.dockstarter.appvars.homeassistant_enabled: "false" - com.dockstarter.appvars.homeassistant_network_mode: "" - com.dockstarter.appvars.homeassistant_port_8123: "8123" - com.dockstarter.appvars.homeassistant_restart: "unless-stopped" - com.dockstarter.appvars.homeassistant_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8123: "8123" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/homeassistant/homeassistant.netmode.yml b/compose/.apps/homeassistant/homeassistant.netmode.yml index 91e9288005..f36884ffb9 100644 --- a/compose/.apps/homeassistant/homeassistant.netmode.yml +++ b/compose/.apps/homeassistant/homeassistant.netmode.yml @@ -1,3 +1,3 @@ services: - homeassistant: - network_mode: ${HOMEASSISTANT_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/homeassistant/homeassistant.ports.yml b/compose/.apps/homeassistant/homeassistant.ports.yml index c87fea3f82..a75ad8e00c 100644 --- a/compose/.apps/homeassistant/homeassistant.ports.yml +++ b/compose/.apps/homeassistant/homeassistant.ports.yml @@ -1,4 +1,4 @@ services: - homeassistant: + ${_appname_}: ports: - - ${HOMEASSISTANT_PORT_8123}:8123 + - ${${_APPNAME_}_PORT_8123}:8123 diff --git a/compose/.apps/homeassistant/homeassistant.x86_64.yml b/compose/.apps/homeassistant/homeassistant.x86_64.yml index 87b4a33958..dead196a5f 100644 --- a/compose/.apps/homeassistant/homeassistant.x86_64.yml +++ b/compose/.apps/homeassistant/homeassistant.x86_64.yml @@ -1,3 +1,3 @@ services: - homeassistant: - image: homeassistant/home-assistant:${HOMEASSISTANT_TAG} + ${_appname_}: + image: homeassistant/home-assistant:${${_APPNAME_}_TAG} diff --git a/compose/.apps/homeassistant/homeassistant.yml b/compose/.apps/homeassistant/homeassistant.yml index f045393223..52df9aac13 100644 --- a/compose/.apps/homeassistant/homeassistant.yml +++ b/compose/.apps/homeassistant/homeassistant.yml @@ -1,10 +1,10 @@ services: - homeassistant: - container_name: ${HOMEASSISTANT_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${HOMEASSISTANT_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/homeassistant:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/homebridge/homebridge.aarch64.yml b/compose/.apps/homebridge/homebridge.aarch64.yml index 1eaa5fde79..32590271eb 100644 --- a/compose/.apps/homebridge/homebridge.aarch64.yml +++ b/compose/.apps/homebridge/homebridge.aarch64.yml @@ -1,3 +1,3 @@ services: - homebridge: - image: homebridge/homebridge:${HOMEBRIDGE_TAG} + ${_appname_}: + image: homebridge/homebridge:${${_APPNAME_}_TAG} diff --git a/compose/.apps/homebridge/homebridge.hostname.yml b/compose/.apps/homebridge/homebridge.hostname.yml index 2794bc183a..4dc53c3782 100644 --- a/compose/.apps/homebridge/homebridge.hostname.yml +++ b/compose/.apps/homebridge/homebridge.hostname.yml @@ -1,3 +1,3 @@ services: - homebridge: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/homebridge/homebridge.labels.yml b/compose/.apps/homebridge/homebridge.labels.yml index f9efb887e0..07e7f97805 100644 --- a/compose/.apps/homebridge/homebridge.labels.yml +++ b/compose/.apps/homebridge/homebridge.labels.yml @@ -1,13 +1,13 @@ services: - homebridge: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Homebridge is a lightweight NodeJS server you can run on your home network that emulates the iOS HomeKit API" com.dockstarter.appinfo.nicename: "Homebridge" - com.dockstarter.appvars.homebridge_container_name: "homebridge" - com.dockstarter.appvars.homebridge_enabled: "false" - com.dockstarter.appvars.homebridge_environment_enable_avahi: "0" - com.dockstarter.appvars.homebridge_network_mode: "host" - com.dockstarter.appvars.homebridge_port_8581: "8581" - com.dockstarter.appvars.homebridge_restart: "unless-stopped" - com.dockstarter.appvars.homebridge_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_enable_avahi: "0" + com.dockstarter.appvars.${_appname_}_network_mode: "host" + com.dockstarter.appvars.${_appname_}_port_8581: "8581" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/homebridge/homebridge.netmode.yml b/compose/.apps/homebridge/homebridge.netmode.yml index 88daa0a1c3..f36884ffb9 100644 --- a/compose/.apps/homebridge/homebridge.netmode.yml +++ b/compose/.apps/homebridge/homebridge.netmode.yml @@ -1,3 +1,3 @@ services: - homebridge: - network_mode: ${HOMEBRIDGE_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/homebridge/homebridge.ports.yml b/compose/.apps/homebridge/homebridge.ports.yml index f2ca7721d4..036ad7cb27 100644 --- a/compose/.apps/homebridge/homebridge.ports.yml +++ b/compose/.apps/homebridge/homebridge.ports.yml @@ -1,4 +1,4 @@ services: - homebridge: + ${_appname_}: ports: - - ${HOMEBRIDGE_PORT_8581}:8581 + - ${${_APPNAME_}_PORT_8581}:8581 diff --git a/compose/.apps/homebridge/homebridge.x86_64.yml b/compose/.apps/homebridge/homebridge.x86_64.yml index 1eaa5fde79..32590271eb 100644 --- a/compose/.apps/homebridge/homebridge.x86_64.yml +++ b/compose/.apps/homebridge/homebridge.x86_64.yml @@ -1,3 +1,3 @@ services: - homebridge: - image: homebridge/homebridge:${HOMEBRIDGE_TAG} + ${_appname_}: + image: homebridge/homebridge:${${_APPNAME_}_TAG} diff --git a/compose/.apps/homebridge/homebridge.yml b/compose/.apps/homebridge/homebridge.yml index 27a2c3f6a7..1b44080bd6 100644 --- a/compose/.apps/homebridge/homebridge.yml +++ b/compose/.apps/homebridge/homebridge.yml @@ -1,11 +1,11 @@ services: - homebridge: - container_name: ${HOMEBRIDGE_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - ENABLE_AVAHI=${HOMEBRIDGE_ENVIRONMENT_ENABLE_AVAHI} + - ENABLE_AVAHI=${${_APPNAME_}_ENVIRONMENT_ENABLE_AVAHI} - TZ=${TZ} - restart: ${HOMEBRIDGE_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/homebridge:/homebridge + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/homebridge - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/homepage/homepage.aarch64.yml b/compose/.apps/homepage/homepage.aarch64.yml index 32dcae28fa..5b4d0ea2d4 100644 --- a/compose/.apps/homepage/homepage.aarch64.yml +++ b/compose/.apps/homepage/homepage.aarch64.yml @@ -1,3 +1,3 @@ services: - homepage: - image: ghcr.io/gethomepage/homepage:${HOMEPAGE_TAG} + ${_appname_}: + image: ghcr.io/gethomepage/homepage:${${_APPNAME_}_TAG} diff --git a/compose/.apps/homepage/homepage.hostname.yml b/compose/.apps/homepage/homepage.hostname.yml index c896d50277..4dc53c3782 100644 --- a/compose/.apps/homepage/homepage.hostname.yml +++ b/compose/.apps/homepage/homepage.hostname.yml @@ -1,3 +1,3 @@ services: - homepage: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/homepage/homepage.labels.yml b/compose/.apps/homepage/homepage.labels.yml index 4d49493d83..783ca83a37 100644 --- a/compose/.apps/homepage/homepage.labels.yml +++ b/compose/.apps/homepage/homepage.labels.yml @@ -1,13 +1,13 @@ services: - homepage: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A highly customizable application dashboard with integrations for over 100 services" com.dockstarter.appinfo.nicename: "homepage" - com.dockstarter.appvars.homepage_container_name: "homepage" - com.dockstarter.appvars.homepage_enabled: "false" - com.dockstarter.appvars.homepage_network_mode: "host" - com.dockstarter.appvars.homepage_port_3000: "3000" - com.dockstarter.appvars.homepage_restart: "unless-stopped" - com.dockstarter.appvars.homepage_tag: "latest" - com.dockstarter.appvars.homepage_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "host" + com.dockstarter.appvars.${_appname_}_port_3000: "3000" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/homepage/homepage.netmode.yml b/compose/.apps/homepage/homepage.netmode.yml index 5fab23067f..f36884ffb9 100644 --- a/compose/.apps/homepage/homepage.netmode.yml +++ b/compose/.apps/homepage/homepage.netmode.yml @@ -1,3 +1,3 @@ services: - homepage: - network_mode: ${HOMEPAGE_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/homepage/homepage.ports.yml b/compose/.apps/homepage/homepage.ports.yml index 44e41f7868..40e1a7dee8 100644 --- a/compose/.apps/homepage/homepage.ports.yml +++ b/compose/.apps/homepage/homepage.ports.yml @@ -1,4 +1,4 @@ services: - homepage: + ${_appname_}: ports: - - ${HOMEPAGE_PORT_3000}:3000 + - ${${_APPNAME_}_PORT_3000}:3000 diff --git a/compose/.apps/homepage/homepage.x86_64.yml b/compose/.apps/homepage/homepage.x86_64.yml index 32dcae28fa..5b4d0ea2d4 100644 --- a/compose/.apps/homepage/homepage.x86_64.yml +++ b/compose/.apps/homepage/homepage.x86_64.yml @@ -1,3 +1,3 @@ services: - homepage: - image: ghcr.io/gethomepage/homepage:${HOMEPAGE_TAG} + ${_appname_}: + image: ghcr.io/gethomepage/homepage:${${_APPNAME_}_TAG} diff --git a/compose/.apps/homepage/homepage.yml b/compose/.apps/homepage/homepage.yml index d52fbba214..a2aa237bdc 100644 --- a/compose/.apps/homepage/homepage.yml +++ b/compose/.apps/homepage/homepage.yml @@ -1,13 +1,13 @@ services: - homepage: - container_name: ${HOMEPAGE_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${HOMEPAGE_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/homepage:/app/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/app/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${HOMEPAGE_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock + - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock diff --git a/compose/.apps/homer/homer.aarch64.yml b/compose/.apps/homer/homer.aarch64.yml index fc328df830..28e6fdccc6 100644 --- a/compose/.apps/homer/homer.aarch64.yml +++ b/compose/.apps/homer/homer.aarch64.yml @@ -1,3 +1,3 @@ services: - homer: - image: b4bz/homer:${HOMER_TAG} + ${_appname_}: + image: b4bz/homer:${${_APPNAME_}_TAG} diff --git a/compose/.apps/homer/homer.hostname.yml b/compose/.apps/homer/homer.hostname.yml index 31c6541b56..4dc53c3782 100644 --- a/compose/.apps/homer/homer.hostname.yml +++ b/compose/.apps/homer/homer.hostname.yml @@ -1,3 +1,3 @@ services: - homer: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/homer/homer.labels.yml b/compose/.apps/homer/homer.labels.yml index b621f5f25d..5d37f820a3 100644 --- a/compose/.apps/homer/homer.labels.yml +++ b/compose/.apps/homer/homer.labels.yml @@ -1,14 +1,14 @@ services: - homer: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A dead simple static HOMepage for your servER" com.dockstarter.appinfo.nicename: "Homer" - com.dockstarter.appvars.homer_container_name: "homer" - com.dockstarter.appvars.homer_enabled: "false" - com.dockstarter.appvars.homer_environment_init_assets: "1" - com.dockstarter.appvars.homer_environment_subfolder: "" - com.dockstarter.appvars.homer_network_mode: "" - com.dockstarter.appvars.homer_port_8080: "8080" - com.dockstarter.appvars.homer_restart: "unless-stopped" - com.dockstarter.appvars.homer_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_init_assets: "1" + com.dockstarter.appvars.${_appname_}_environment_subfolder: "" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8080: "8080" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/homer/homer.netmode.yml b/compose/.apps/homer/homer.netmode.yml index 7476f9bb94..f36884ffb9 100644 --- a/compose/.apps/homer/homer.netmode.yml +++ b/compose/.apps/homer/homer.netmode.yml @@ -1,3 +1,3 @@ services: - homer: - network_mode: ${HOMER_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/homer/homer.ports.yml b/compose/.apps/homer/homer.ports.yml index 8c92af5687..7d1c7e4455 100644 --- a/compose/.apps/homer/homer.ports.yml +++ b/compose/.apps/homer/homer.ports.yml @@ -1,4 +1,4 @@ services: - homer: + ${_appname_}: ports: - - ${HOMER_PORT_8080}:8080 + - ${${_APPNAME_}_PORT_8080}:8080 diff --git a/compose/.apps/homer/homer.x86_64.yml b/compose/.apps/homer/homer.x86_64.yml index fc328df830..28e6fdccc6 100644 --- a/compose/.apps/homer/homer.x86_64.yml +++ b/compose/.apps/homer/homer.x86_64.yml @@ -1,3 +1,3 @@ services: - homer: - image: b4bz/homer:${HOMER_TAG} + ${_appname_}: + image: b4bz/homer:${${_APPNAME_}_TAG} diff --git a/compose/.apps/homer/homer.yml b/compose/.apps/homer/homer.yml index ca5b04a1d5..febf72cc5b 100644 --- a/compose/.apps/homer/homer.yml +++ b/compose/.apps/homer/homer.yml @@ -1,14 +1,14 @@ services: - homer: - container_name: ${HOMER_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - INIT_ASSETS=${HOMER_ENVIRONMENT_INIT_ASSETS} + - INIT_ASSETS=${${_APPNAME_}_ENVIRONMENT_INIT_ASSETS} - PGID=${PGID} - PUID=${PUID} - - SUBFOLDER=${HOMER_ENVIRONMENT_SUBFOLDER} + - SUBFOLDER=${${_APPNAME_}_ENVIRONMENT_SUBFOLDER} - TZ=${TZ} - restart: ${HOMER_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage - - ${DOCKER_VOLUME_CONFIG}/homer:/www/assets + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/www/assets diff --git a/compose/.apps/htpcmanager/htpcmanager.aarch64.yml b/compose/.apps/htpcmanager/htpcmanager.aarch64.yml index cb1b8ac3e0..31e1a1fd0a 100644 --- a/compose/.apps/htpcmanager/htpcmanager.aarch64.yml +++ b/compose/.apps/htpcmanager/htpcmanager.aarch64.yml @@ -1,3 +1,3 @@ services: - htpcmanager: - image: lscr.io/linuxserver/htpcmanager:${HTPCMANAGER_TAG} + ${_appname_}: + image: lscr.io/linuxserver/htpcmanager:${${_APPNAME_}_TAG} diff --git a/compose/.apps/htpcmanager/htpcmanager.hostname.yml b/compose/.apps/htpcmanager/htpcmanager.hostname.yml index 5cab493ce6..4dc53c3782 100644 --- a/compose/.apps/htpcmanager/htpcmanager.hostname.yml +++ b/compose/.apps/htpcmanager/htpcmanager.hostname.yml @@ -1,3 +1,3 @@ services: - htpcmanager: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/htpcmanager/htpcmanager.labels.yml b/compose/.apps/htpcmanager/htpcmanager.labels.yml index c66a8d4020..dfdead93b7 100644 --- a/compose/.apps/htpcmanager/htpcmanager.labels.yml +++ b/compose/.apps/htpcmanager/htpcmanager.labels.yml @@ -1,12 +1,12 @@ services: - htpcmanager: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Front end for many htpc related applications" com.dockstarter.appinfo.nicename: "HTPCManager" - com.dockstarter.appvars.htpcmanager_container_name: "htpcmanager" - com.dockstarter.appvars.htpcmanager_enabled: "false" - com.dockstarter.appvars.htpcmanager_network_mode: "" - com.dockstarter.appvars.htpcmanager_port_8085: "8085" - com.dockstarter.appvars.htpcmanager_restart: "unless-stopped" - com.dockstarter.appvars.htpcmanager_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8085: "8085" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/htpcmanager/htpcmanager.netmode.yml b/compose/.apps/htpcmanager/htpcmanager.netmode.yml index 7374e6aba3..f36884ffb9 100644 --- a/compose/.apps/htpcmanager/htpcmanager.netmode.yml +++ b/compose/.apps/htpcmanager/htpcmanager.netmode.yml @@ -1,3 +1,3 @@ services: - htpcmanager: - network_mode: ${HTPCMANAGER_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/htpcmanager/htpcmanager.ports.yml b/compose/.apps/htpcmanager/htpcmanager.ports.yml index 7e9177fb2f..39ae5a919a 100644 --- a/compose/.apps/htpcmanager/htpcmanager.ports.yml +++ b/compose/.apps/htpcmanager/htpcmanager.ports.yml @@ -1,4 +1,4 @@ services: - htpcmanager: + ${_appname_}: ports: - - ${HTPCMANAGER_PORT_8085}:8085 + - ${${_APPNAME_}_PORT_8085}:8085 diff --git a/compose/.apps/htpcmanager/htpcmanager.x86_64.yml b/compose/.apps/htpcmanager/htpcmanager.x86_64.yml index cb1b8ac3e0..31e1a1fd0a 100644 --- a/compose/.apps/htpcmanager/htpcmanager.x86_64.yml +++ b/compose/.apps/htpcmanager/htpcmanager.x86_64.yml @@ -1,3 +1,3 @@ services: - htpcmanager: - image: lscr.io/linuxserver/htpcmanager:${HTPCMANAGER_TAG} + ${_appname_}: + image: lscr.io/linuxserver/htpcmanager:${${_APPNAME_}_TAG} diff --git a/compose/.apps/htpcmanager/htpcmanager.yml b/compose/.apps/htpcmanager/htpcmanager.yml index 764432270a..ace6d5d0ab 100644 --- a/compose/.apps/htpcmanager/htpcmanager.yml +++ b/compose/.apps/htpcmanager/htpcmanager.yml @@ -1,12 +1,12 @@ services: - htpcmanager: - container_name: ${HTPCMANAGER_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${HTPCMANAGER_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/htpcmanager:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/httpserver/httpserver.hostname.yml b/compose/.apps/httpserver/httpserver.hostname.yml index f5285f33e1..4dc53c3782 100644 --- a/compose/.apps/httpserver/httpserver.hostname.yml +++ b/compose/.apps/httpserver/httpserver.hostname.yml @@ -1,3 +1,3 @@ services: - httpserver: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/httpserver/httpserver.labels.yml b/compose/.apps/httpserver/httpserver.labels.yml index d2680a4fcc..e3e1e430f4 100644 --- a/compose/.apps/httpserver/httpserver.labels.yml +++ b/compose/.apps/httpserver/httpserver.labels.yml @@ -1,15 +1,15 @@ services: - httpserver: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "http-server is a simple binary to provide a static http server from a given folder." com.dockstarter.appinfo.nicename: "httpserver" - com.dockstarter.appvars.httpserver_container_name: "httpserver" - com.dockstarter.appvars.httpserver_enabled: "false" - com.dockstarter.appvars.httpserver_environment_file_server_color_set: "indigo-red" - com.dockstarter.appvars.httpserver_environment_file_server_title: "DockSTARTer" - com.dockstarter.appvars.httpserver_network_mode: "" - com.dockstarter.appvars.httpserver_port_5000: "5000" - com.dockstarter.appvars.httpserver_restart: "unless-stopped" - com.dockstarter.appvars.httpserver_tag: "latest" - com.dockstarter.appvars.httpserver_volume_html: "/mnt/html" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_file_server_color_set: "indigo-red" + com.dockstarter.appvars.${_appname_}_environment_file_server_title: "DockSTARTer" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_5000: "5000" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_html: "/mnt/html" diff --git a/compose/.apps/httpserver/httpserver.netmode.yml b/compose/.apps/httpserver/httpserver.netmode.yml index ca2ee97d71..f36884ffb9 100644 --- a/compose/.apps/httpserver/httpserver.netmode.yml +++ b/compose/.apps/httpserver/httpserver.netmode.yml @@ -1,3 +1,3 @@ services: - httpserver: - network_mode: ${HTTPSERVER_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/httpserver/httpserver.ports.yml b/compose/.apps/httpserver/httpserver.ports.yml index 37524a5116..ecb732db51 100644 --- a/compose/.apps/httpserver/httpserver.ports.yml +++ b/compose/.apps/httpserver/httpserver.ports.yml @@ -1,4 +1,4 @@ services: - httpserver: + ${_appname_}: ports: - - ${HTTPSERVER_PORT_5000}:5000 + - ${${_APPNAME_}_PORT_5000}:5000 diff --git a/compose/.apps/httpserver/httpserver.x86_64.yml b/compose/.apps/httpserver/httpserver.x86_64.yml index f3a8b911ac..c4a0233093 100644 --- a/compose/.apps/httpserver/httpserver.x86_64.yml +++ b/compose/.apps/httpserver/httpserver.x86_64.yml @@ -1,3 +1,3 @@ services: - httpserver: - image: ghcr.io/patrickdappollonio/docker-http-server:${HTTPSERVER_TAG} + ${_appname_}: + image: ghcr.io/patrickdappollonio/docker-http-server:${${_APPNAME_}_TAG} diff --git a/compose/.apps/httpserver/httpserver.yml b/compose/.apps/httpserver/httpserver.yml index 082e8e09b0..75a533520c 100644 --- a/compose/.apps/httpserver/httpserver.yml +++ b/compose/.apps/httpserver/httpserver.yml @@ -1,14 +1,14 @@ services: - httpserver: - container_name: ${HTTPSERVER_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - FILE_SERVER_COLOR_SET=${HTTPSERVER_ENVIRONMENT_FILE_SERVER_COLOR_SET} - - FILE_SERVER_TITLE=${HTTPSERVER_ENVIRONMENT_FILE_SERVER_TITLE} + - FILE_SERVER_COLOR_SET=${${_APPNAME_}_ENVIRONMENT_FILE_SERVER_COLOR_SET} + - FILE_SERVER_TITLE=${${_APPNAME_}_ENVIRONMENT_FILE_SERVER_TITLE} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${HTTPSERVER_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage - - ${HTTPSERVER_VOLUME_HTML}:/html + - ${${_APPNAME_}_VOLUME_HTML}:/html diff --git a/compose/.apps/huginn/huginn.hostname.yml b/compose/.apps/huginn/huginn.hostname.yml index 71545ba7e8..4dc53c3782 100644 --- a/compose/.apps/huginn/huginn.hostname.yml +++ b/compose/.apps/huginn/huginn.hostname.yml @@ -1,3 +1,3 @@ services: - huginn: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/huginn/huginn.labels.yml b/compose/.apps/huginn/huginn.labels.yml index 92ce1d3e0c..758306ea72 100644 --- a/compose/.apps/huginn/huginn.labels.yml +++ b/compose/.apps/huginn/huginn.labels.yml @@ -1,17 +1,17 @@ services: - huginn: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Huginn is a system for building agents that perform automated tasks for you online." com.dockstarter.appinfo.nicename: "Huginn" - com.dockstarter.appvars.huginn_container_name: "huginn" - com.dockstarter.appvars.huginn_enabled: "false" - com.dockstarter.appvars.huginn_environment_database_host: "mariadb" - com.dockstarter.appvars.huginn_environment_database_name: "huginn" - com.dockstarter.appvars.huginn_environment_database_password: "" - com.dockstarter.appvars.huginn_environment_database_port: "3306" - com.dockstarter.appvars.huginn_environment_database_username: "huginn" - com.dockstarter.appvars.huginn_network_mode: "" - com.dockstarter.appvars.huginn_port_3000: "3000" - com.dockstarter.appvars.huginn_restart: "unless-stopped" - com.dockstarter.appvars.huginn_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_database_host: "mariadb" + com.dockstarter.appvars.${_appname_}_environment_database_name: "huginn" + com.dockstarter.appvars.${_appname_}_environment_database_password: "" + com.dockstarter.appvars.${_appname_}_environment_database_port: "3306" + com.dockstarter.appvars.${_appname_}_environment_database_username: "huginn" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_3000: "3000" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/huginn/huginn.netmode.yml b/compose/.apps/huginn/huginn.netmode.yml index 86330080aa..f36884ffb9 100644 --- a/compose/.apps/huginn/huginn.netmode.yml +++ b/compose/.apps/huginn/huginn.netmode.yml @@ -1,3 +1,3 @@ services: - huginn: - network_mode: ${HUGINN_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/huginn/huginn.ports.yml b/compose/.apps/huginn/huginn.ports.yml index e32411cdf8..40e1a7dee8 100644 --- a/compose/.apps/huginn/huginn.ports.yml +++ b/compose/.apps/huginn/huginn.ports.yml @@ -1,4 +1,4 @@ services: - huginn: + ${_appname_}: ports: - - ${HUGINN_PORT_3000}:3000 + - ${${_APPNAME_}_PORT_3000}:3000 diff --git a/compose/.apps/huginn/huginn.x86_64.yml b/compose/.apps/huginn/huginn.x86_64.yml index 5f3286d70d..26d0a6fa62 100644 --- a/compose/.apps/huginn/huginn.x86_64.yml +++ b/compose/.apps/huginn/huginn.x86_64.yml @@ -1,3 +1,3 @@ services: - huginn: - image: huginn/huginn:${HUGINN_TAG} + ${_appname_}: + image: huginn/huginn:${${_APPNAME_}_TAG} diff --git a/compose/.apps/huginn/huginn.yml b/compose/.apps/huginn/huginn.yml index a6b94449c1..eba583eed9 100644 --- a/compose/.apps/huginn/huginn.yml +++ b/compose/.apps/huginn/huginn.yml @@ -1,16 +1,16 @@ services: - huginn: - container_name: ${HUGINN_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - HUGINN_DATABASE_HOST=${HUGINN_ENVIRONMENT_DATABASE_HOST} - - HUGINN_DATABASE_NAME=${HUGINN_ENVIRONMENT_DATABASE_NAME} - - HUGINN_DATABASE_PASSWORD=${HUGINN_ENVIRONMENT_DATABASE_PASSWORD} - - HUGINN_DATABASE_PORT=${HUGINN_ENVIRONMENT_DATABASE_PORT} - - HUGINN_DATABASE_USERNAME=${HUGINN_ENVIRONMENT_DATABASE_USERNAME} + - HUGINN_DATABASE_HOST=${${_APPNAME_}_ENVIRONMENT_DATABASE_HOST} + - HUGINN_DATABASE_NAME=${${_APPNAME_}_ENVIRONMENT_DATABASE_NAME} + - HUGINN_DATABASE_PASSWORD=${${_APPNAME_}_ENVIRONMENT_DATABASE_PASSWORD} + - HUGINN_DATABASE_PORT=${${_APPNAME_}_ENVIRONMENT_DATABASE_PORT} + - HUGINN_DATABASE_USERNAME=${${_APPNAME_}_ENVIRONMENT_DATABASE_USERNAME} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${HUGINN_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/hydra2/hydra2.aarch64.yml b/compose/.apps/hydra2/hydra2.aarch64.yml index 27afde6699..07cd128f98 100644 --- a/compose/.apps/hydra2/hydra2.aarch64.yml +++ b/compose/.apps/hydra2/hydra2.aarch64.yml @@ -1,3 +1,3 @@ services: hydra2: - image: lscr.io/linuxserver/hydra2:${HYDRA2_TAG} + image: lscr.io/linuxserver/hydra2:${${_APPNAME_}_TAG} diff --git a/compose/.apps/hydra2/hydra2.netmode.yml b/compose/.apps/hydra2/hydra2.netmode.yml index 412832dd85..46a79c72c7 100644 --- a/compose/.apps/hydra2/hydra2.netmode.yml +++ b/compose/.apps/hydra2/hydra2.netmode.yml @@ -1,3 +1,3 @@ services: hydra2: - network_mode: ${HYDRA2_NETWORK_MODE} + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/hydra2/hydra2.ports.yml b/compose/.apps/hydra2/hydra2.ports.yml index 8f8f000e7d..4ed3fe1fa6 100644 --- a/compose/.apps/hydra2/hydra2.ports.yml +++ b/compose/.apps/hydra2/hydra2.ports.yml @@ -1,4 +1,4 @@ services: hydra2: ports: - - ${HYDRA2_PORT_5076}:5076 + - ${${_APPNAME_}_PORT_5076}:5076 diff --git a/compose/.apps/hydra2/hydra2.x86_64.yml b/compose/.apps/hydra2/hydra2.x86_64.yml index 27afde6699..07cd128f98 100644 --- a/compose/.apps/hydra2/hydra2.x86_64.yml +++ b/compose/.apps/hydra2/hydra2.x86_64.yml @@ -1,3 +1,3 @@ services: hydra2: - image: lscr.io/linuxserver/hydra2:${HYDRA2_TAG} + image: lscr.io/linuxserver/hydra2:${${_APPNAME_}_TAG} diff --git a/compose/.apps/hydra2/hydra2.yml b/compose/.apps/hydra2/hydra2.yml index 924ef78bed..59409eacc0 100644 --- a/compose/.apps/hydra2/hydra2.yml +++ b/compose/.apps/hydra2/hydra2.yml @@ -1,12 +1,12 @@ services: hydra2: - container_name: ${HYDRA2_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${HYDRA2_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/hydra2:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/influxdb/influxdb.aarch64.yml b/compose/.apps/influxdb/influxdb.aarch64.yml index a44c4585c9..d5e56d79c4 100644 --- a/compose/.apps/influxdb/influxdb.aarch64.yml +++ b/compose/.apps/influxdb/influxdb.aarch64.yml @@ -1,3 +1,3 @@ services: - influxdb: - image: influxdb:${INFLUXDB_TAG} + ${_appname_}: + image: influxdb:${${_APPNAME_}_TAG} diff --git a/compose/.apps/influxdb/influxdb.hostname.yml b/compose/.apps/influxdb/influxdb.hostname.yml index b9b1518aa4..4dc53c3782 100644 --- a/compose/.apps/influxdb/influxdb.hostname.yml +++ b/compose/.apps/influxdb/influxdb.hostname.yml @@ -1,3 +1,3 @@ services: - influxdb: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/influxdb/influxdb.labels.yml b/compose/.apps/influxdb/influxdb.labels.yml index be868ce030..c70a073f44 100644 --- a/compose/.apps/influxdb/influxdb.labels.yml +++ b/compose/.apps/influxdb/influxdb.labels.yml @@ -1,12 +1,12 @@ services: - influxdb: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Time series database for recording metrics, events, and analytics" com.dockstarter.appinfo.nicename: "InfluxDB" - com.dockstarter.appvars.influxdb_container_name: "influxdb" - com.dockstarter.appvars.influxdb_enabled: "false" - com.dockstarter.appvars.influxdb_network_mode: "" - com.dockstarter.appvars.influxdb_port_8086: "8086" - com.dockstarter.appvars.influxdb_restart: "unless-stopped" - com.dockstarter.appvars.influxdb_tag: "1.8" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8086: "8086" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "1.8" diff --git a/compose/.apps/influxdb/influxdb.netmode.yml b/compose/.apps/influxdb/influxdb.netmode.yml index bde7fe4722..f36884ffb9 100644 --- a/compose/.apps/influxdb/influxdb.netmode.yml +++ b/compose/.apps/influxdb/influxdb.netmode.yml @@ -1,3 +1,3 @@ services: - influxdb: - network_mode: ${INFLUXDB_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/influxdb/influxdb.ports.yml b/compose/.apps/influxdb/influxdb.ports.yml index a69466c7c4..c11c0f0b5c 100644 --- a/compose/.apps/influxdb/influxdb.ports.yml +++ b/compose/.apps/influxdb/influxdb.ports.yml @@ -1,4 +1,4 @@ services: - influxdb: + ${_appname_}: ports: - - ${INFLUXDB_PORT_8086}:8086 + - ${${_APPNAME_}_PORT_8086}:8086 diff --git a/compose/.apps/influxdb/influxdb.x86_64.yml b/compose/.apps/influxdb/influxdb.x86_64.yml index a44c4585c9..d5e56d79c4 100644 --- a/compose/.apps/influxdb/influxdb.x86_64.yml +++ b/compose/.apps/influxdb/influxdb.x86_64.yml @@ -1,3 +1,3 @@ services: - influxdb: - image: influxdb:${INFLUXDB_TAG} + ${_appname_}: + image: influxdb:${${_APPNAME_}_TAG} diff --git a/compose/.apps/influxdb/influxdb.yml b/compose/.apps/influxdb/influxdb.yml index 8b45ce716f..686bb48562 100644 --- a/compose/.apps/influxdb/influxdb.yml +++ b/compose/.apps/influxdb/influxdb.yml @@ -1,10 +1,10 @@ services: - influxdb: - container_name: ${INFLUXDB_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${INFLUXDB_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/influxdb:/var/lib/influxdb + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/var/lib/influxdb - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/jackett/jackett.aarch64.yml b/compose/.apps/jackett/jackett.aarch64.yml index ffd22b9c58..a00bb83324 100644 --- a/compose/.apps/jackett/jackett.aarch64.yml +++ b/compose/.apps/jackett/jackett.aarch64.yml @@ -1,3 +1,3 @@ services: - jackett: - image: lscr.io/linuxserver/jackett:${JACKETT_TAG} + ${_appname_}: + image: lscr.io/linuxserver/jackett:${${_APPNAME_}_TAG} diff --git a/compose/.apps/jackett/jackett.hostname.yml b/compose/.apps/jackett/jackett.hostname.yml index 237e48f6fb..4dc53c3782 100644 --- a/compose/.apps/jackett/jackett.hostname.yml +++ b/compose/.apps/jackett/jackett.hostname.yml @@ -1,3 +1,3 @@ services: - jackett: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/jackett/jackett.labels.yml b/compose/.apps/jackett/jackett.labels.yml index 1207b6bcf2..be0ee99bda 100644 --- a/compose/.apps/jackett/jackett.labels.yml +++ b/compose/.apps/jackett/jackett.labels.yml @@ -1,12 +1,12 @@ services: - jackett: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "API Support for your favorite private trackers" com.dockstarter.appinfo.nicename: "Jackett" - com.dockstarter.appvars.jackett_container_name: "jackett" - com.dockstarter.appvars.jackett_enabled: "false" - com.dockstarter.appvars.jackett_network_mode: "" - com.dockstarter.appvars.jackett_port_9117: "9117" - com.dockstarter.appvars.jackett_restart: "unless-stopped" - com.dockstarter.appvars.jackett_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_9117: "9117" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/jackett/jackett.netmode.yml b/compose/.apps/jackett/jackett.netmode.yml index 4bf4db7c70..f36884ffb9 100644 --- a/compose/.apps/jackett/jackett.netmode.yml +++ b/compose/.apps/jackett/jackett.netmode.yml @@ -1,3 +1,3 @@ services: - jackett: - network_mode: ${JACKETT_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/jackett/jackett.ports.yml b/compose/.apps/jackett/jackett.ports.yml index 73d8cd3a20..01b72573f5 100644 --- a/compose/.apps/jackett/jackett.ports.yml +++ b/compose/.apps/jackett/jackett.ports.yml @@ -1,4 +1,4 @@ services: - jackett: + ${_appname_}: ports: - - ${JACKETT_PORT_9117}:9117 + - ${${_APPNAME_}_PORT_9117}:9117 diff --git a/compose/.apps/jackett/jackett.x86_64.yml b/compose/.apps/jackett/jackett.x86_64.yml index ffd22b9c58..a00bb83324 100644 --- a/compose/.apps/jackett/jackett.x86_64.yml +++ b/compose/.apps/jackett/jackett.x86_64.yml @@ -1,3 +1,3 @@ services: - jackett: - image: lscr.io/linuxserver/jackett:${JACKETT_TAG} + ${_appname_}: + image: lscr.io/linuxserver/jackett:${${_APPNAME_}_TAG} diff --git a/compose/.apps/jackett/jackett.yml b/compose/.apps/jackett/jackett.yml index 6431b79224..ace6d5d0ab 100644 --- a/compose/.apps/jackett/jackett.yml +++ b/compose/.apps/jackett/jackett.yml @@ -1,12 +1,12 @@ services: - jackett: - container_name: ${JACKETT_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${JACKETT_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/jackett:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/jellyfin/jellyfin.aarch64.yml b/compose/.apps/jellyfin/jellyfin.aarch64.yml index 314351aeb1..243042b538 100644 --- a/compose/.apps/jellyfin/jellyfin.aarch64.yml +++ b/compose/.apps/jellyfin/jellyfin.aarch64.yml @@ -1,3 +1,3 @@ services: - jellyfin: - image: lscr.io/linuxserver/jellyfin:${JELLYFIN_TAG} + ${_appname_}: + image: lscr.io/linuxserver/jellyfin:${${_APPNAME_}_TAG} diff --git a/compose/.apps/jellyfin/jellyfin.hostname.yml b/compose/.apps/jellyfin/jellyfin.hostname.yml index 55f8956a46..4dc53c3782 100644 --- a/compose/.apps/jellyfin/jellyfin.hostname.yml +++ b/compose/.apps/jellyfin/jellyfin.hostname.yml @@ -1,3 +1,3 @@ services: - jellyfin: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/jellyfin/jellyfin.labels.yml b/compose/.apps/jellyfin/jellyfin.labels.yml index 808e27eea8..adc45035cb 100644 --- a/compose/.apps/jellyfin/jellyfin.labels.yml +++ b/compose/.apps/jellyfin/jellyfin.labels.yml @@ -1,14 +1,14 @@ services: - jellyfin: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Free Software Media Browser" com.dockstarter.appinfo.nicename: "Jellyfin" - com.dockstarter.appvars.jellyfin_container_name: "jellyfin" - com.dockstarter.appvars.jellyfin_enabled: "false" - com.dockstarter.appvars.jellyfin_network_mode: "" - com.dockstarter.appvars.jellyfin_port_8096: "8096" - com.dockstarter.appvars.jellyfin_port_8920: "8920" - com.dockstarter.appvars.jellyfin_restart: "unless-stopped" - com.dockstarter.appvars.jellyfin_tag: "latest" - com.dockstarter.appvars.jellyfin_volume_transcodedir: "/tmp/jellyfin_transcode" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8096: "8096" + com.dockstarter.appvars.${_appname_}_port_8920: "8920" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_transcodedir: "/tmp/jellyfin_transcode" diff --git a/compose/.apps/jellyfin/jellyfin.netmode.yml b/compose/.apps/jellyfin/jellyfin.netmode.yml index 270c6835e6..f36884ffb9 100644 --- a/compose/.apps/jellyfin/jellyfin.netmode.yml +++ b/compose/.apps/jellyfin/jellyfin.netmode.yml @@ -1,3 +1,3 @@ services: - jellyfin: - network_mode: ${JELLYFIN_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/jellyfin/jellyfin.ports.yml b/compose/.apps/jellyfin/jellyfin.ports.yml index a33e729f38..aa8fa4bb5b 100644 --- a/compose/.apps/jellyfin/jellyfin.ports.yml +++ b/compose/.apps/jellyfin/jellyfin.ports.yml @@ -1,5 +1,5 @@ services: - jellyfin: + ${_appname_}: ports: - - ${JELLYFIN_PORT_8096}:8096 - - ${JELLYFIN_PORT_8920}:8920 + - ${${_APPNAME_}_PORT_8096}:8096 + - ${${_APPNAME_}_PORT_8920}:8920 diff --git a/compose/.apps/jellyfin/jellyfin.x86_64.yml b/compose/.apps/jellyfin/jellyfin.x86_64.yml index 314351aeb1..243042b538 100644 --- a/compose/.apps/jellyfin/jellyfin.x86_64.yml +++ b/compose/.apps/jellyfin/jellyfin.x86_64.yml @@ -1,3 +1,3 @@ services: - jellyfin: - image: lscr.io/linuxserver/jellyfin:${JELLYFIN_TAG} + ${_appname_}: + image: lscr.io/linuxserver/jellyfin:${${_APPNAME_}_TAG} diff --git a/compose/.apps/jellyfin/jellyfin.yml b/compose/.apps/jellyfin/jellyfin.yml index 3a4d3aa7fa..18af6350da 100644 --- a/compose/.apps/jellyfin/jellyfin.yml +++ b/compose/.apps/jellyfin/jellyfin.yml @@ -1,13 +1,13 @@ services: - jellyfin: - container_name: ${JELLYFIN_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${JELLYFIN_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/jellyfin:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${JELLYFIN_VOLUME_TRANSCODEDIR}:/transcode + - ${${_APPNAME_}_VOLUME_TRANSCODEDIR}:/transcode diff --git a/compose/.apps/jfago/jfago.aarch64.yml b/compose/.apps/jfago/jfago.aarch64.yml index 68f78f5ada..efb9a618b6 100644 --- a/compose/.apps/jfago/jfago.aarch64.yml +++ b/compose/.apps/jfago/jfago.aarch64.yml @@ -1,3 +1,3 @@ services: - jfago: - image: hrfee/jfa-go:${JFAGO_TAG} + ${_appname_}: + image: hrfee/jfa-go:${${_APPNAME_}_TAG} diff --git a/compose/.apps/jfago/jfago.hostname.yml b/compose/.apps/jfago/jfago.hostname.yml index 7f6b96da91..4dc53c3782 100644 --- a/compose/.apps/jfago/jfago.hostname.yml +++ b/compose/.apps/jfago/jfago.hostname.yml @@ -1,3 +1,3 @@ services: - jfago: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/jfago/jfago.labels.yml b/compose/.apps/jfago/jfago.labels.yml index bb2e76e72e..3f9baa6766 100644 --- a/compose/.apps/jfago/jfago.labels.yml +++ b/compose/.apps/jfago/jfago.labels.yml @@ -1,12 +1,12 @@ services: - jfago: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "User management app for Jellyfin" com.dockstarter.appinfo.nicename: "jfago" - com.dockstarter.appvars.jfago_container_name: "jfago" - com.dockstarter.appvars.jfago_enabled: "false" - com.dockstarter.appvars.jfago_network_mode: "" - com.dockstarter.appvars.jfago_port_8056: "8056" - com.dockstarter.appvars.jfago_restart: "unless-stopped" - com.dockstarter.appvars.jfago_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8056: "8056" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/jfago/jfago.netmode.yml b/compose/.apps/jfago/jfago.netmode.yml index 5ae433d4e8..f36884ffb9 100644 --- a/compose/.apps/jfago/jfago.netmode.yml +++ b/compose/.apps/jfago/jfago.netmode.yml @@ -1,3 +1,3 @@ services: - jfago: - network_mode: ${JFAGO_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/jfago/jfago.ports.yml b/compose/.apps/jfago/jfago.ports.yml index 089c80b880..0b698991f6 100644 --- a/compose/.apps/jfago/jfago.ports.yml +++ b/compose/.apps/jfago/jfago.ports.yml @@ -1,4 +1,4 @@ services: - jfago: + ${_appname_}: ports: - - ${JFAGO_PORT_8056}:8056 + - ${${_APPNAME_}_PORT_8056}:8056 diff --git a/compose/.apps/jfago/jfago.x86_64.yml b/compose/.apps/jfago/jfago.x86_64.yml index 68f78f5ada..efb9a618b6 100644 --- a/compose/.apps/jfago/jfago.x86_64.yml +++ b/compose/.apps/jfago/jfago.x86_64.yml @@ -1,3 +1,3 @@ services: - jfago: - image: hrfee/jfa-go:${JFAGO_TAG} + ${_appname_}: + image: hrfee/jfa-go:${${_APPNAME_}_TAG} diff --git a/compose/.apps/jfago/jfago.yml b/compose/.apps/jfago/jfago.yml index ce5b8dd573..d03247fd6a 100644 --- a/compose/.apps/jfago/jfago.yml +++ b/compose/.apps/jfago/jfago.yml @@ -1,11 +1,11 @@ services: - jfago: - container_name: ${JFAGO_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${JFAGO_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/jellyfin/app:/jf - - ${DOCKER_VOLUME_CONFIG}/jfago/:/data + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/app:/jf + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/:/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/kanboard/kanboard.aarch64.yml b/compose/.apps/kanboard/kanboard.aarch64.yml index af89f97e50..e792bba141 100644 --- a/compose/.apps/kanboard/kanboard.aarch64.yml +++ b/compose/.apps/kanboard/kanboard.aarch64.yml @@ -1,3 +1,3 @@ services: - kanboard: - image: webhippie/kanboard:${KANBOARD_TAG} + ${_appname_}: + image: webhippie/kanboard:${${_APPNAME_}_TAG} diff --git a/compose/.apps/kanboard/kanboard.hostname.yml b/compose/.apps/kanboard/kanboard.hostname.yml index 102706349b..4dc53c3782 100644 --- a/compose/.apps/kanboard/kanboard.hostname.yml +++ b/compose/.apps/kanboard/kanboard.hostname.yml @@ -1,3 +1,3 @@ services: - kanboard: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/kanboard/kanboard.labels.yml b/compose/.apps/kanboard/kanboard.labels.yml index a8a013a170..4a5b0afd25 100644 --- a/compose/.apps/kanboard/kanboard.labels.yml +++ b/compose/.apps/kanboard/kanboard.labels.yml @@ -1,12 +1,12 @@ services: - kanboard: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Kanboard is a free and open source Kanban project management software." com.dockstarter.appinfo.nicename: "Kanboard" - com.dockstarter.appvars.kanboard_container_name: "kanboard" - com.dockstarter.appvars.kanboard_enabled: "false" - com.dockstarter.appvars.kanboard_network_mode: "" - com.dockstarter.appvars.kanboard_port_8080: "8080" - com.dockstarter.appvars.kanboard_restart: "unless-stopped" - com.dockstarter.appvars.kanboard_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8080: "8080" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/kanboard/kanboard.netmode.yml b/compose/.apps/kanboard/kanboard.netmode.yml index 2eef5300bd..f36884ffb9 100644 --- a/compose/.apps/kanboard/kanboard.netmode.yml +++ b/compose/.apps/kanboard/kanboard.netmode.yml @@ -1,3 +1,3 @@ services: - kanboard: - network_mode: ${KANBOARD_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/kanboard/kanboard.ports.yml b/compose/.apps/kanboard/kanboard.ports.yml index 52118333e1..7d1c7e4455 100644 --- a/compose/.apps/kanboard/kanboard.ports.yml +++ b/compose/.apps/kanboard/kanboard.ports.yml @@ -1,4 +1,4 @@ services: - kanboard: + ${_appname_}: ports: - - ${KANBOARD_PORT_8080}:8080 + - ${${_APPNAME_}_PORT_8080}:8080 diff --git a/compose/.apps/kanboard/kanboard.x86_64.yml b/compose/.apps/kanboard/kanboard.x86_64.yml index af89f97e50..e792bba141 100644 --- a/compose/.apps/kanboard/kanboard.x86_64.yml +++ b/compose/.apps/kanboard/kanboard.x86_64.yml @@ -1,3 +1,3 @@ services: - kanboard: - image: webhippie/kanboard:${KANBOARD_TAG} + ${_appname_}: + image: webhippie/kanboard:${${_APPNAME_}_TAG} diff --git a/compose/.apps/kanboard/kanboard.yml b/compose/.apps/kanboard/kanboard.yml index f541d9e56f..38f70bd240 100644 --- a/compose/.apps/kanboard/kanboard.yml +++ b/compose/.apps/kanboard/kanboard.yml @@ -1,12 +1,12 @@ services: - kanboard: - container_name: ${KANBOARD_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${KANBOARD_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/kanboard:/var/www/app + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/var/www/app - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/kitana/kitana.aarch64.yml b/compose/.apps/kitana/kitana.aarch64.yml index 544ca8e5ea..2801442139 100644 --- a/compose/.apps/kitana/kitana.aarch64.yml +++ b/compose/.apps/kitana/kitana.aarch64.yml @@ -1,3 +1,3 @@ services: - kitana: - image: pannal/kitana:${KITANA_TAG} + ${_appname_}: + image: pannal/kitana:${${_APPNAME_}_TAG} diff --git a/compose/.apps/kitana/kitana.hostname.yml b/compose/.apps/kitana/kitana.hostname.yml index 0bad05850b..4dc53c3782 100644 --- a/compose/.apps/kitana/kitana.hostname.yml +++ b/compose/.apps/kitana/kitana.hostname.yml @@ -1,3 +1,3 @@ services: - kitana: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/kitana/kitana.labels.yml b/compose/.apps/kitana/kitana.labels.yml index 39772350a3..88a613e495 100644 --- a/compose/.apps/kitana/kitana.labels.yml +++ b/compose/.apps/kitana/kitana.labels.yml @@ -1,12 +1,12 @@ services: - kitana: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A Plex plugin web frontend" com.dockstarter.appinfo.nicename: "Kitana" - com.dockstarter.appvars.kitana_container_name: "kitana" - com.dockstarter.appvars.kitana_enabled: "false" - com.dockstarter.appvars.kitana_network_mode: "" - com.dockstarter.appvars.kitana_port_31337: "31337" - com.dockstarter.appvars.kitana_restart: "unless-stopped" - com.dockstarter.appvars.kitana_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_31337: "31337" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/kitana/kitana.netmode.yml b/compose/.apps/kitana/kitana.netmode.yml index 7a9c6492c5..f36884ffb9 100644 --- a/compose/.apps/kitana/kitana.netmode.yml +++ b/compose/.apps/kitana/kitana.netmode.yml @@ -1,3 +1,3 @@ services: - kitana: - network_mode: ${KITANA_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/kitana/kitana.ports.yml b/compose/.apps/kitana/kitana.ports.yml index 847d1b4e2c..99a3c6c894 100644 --- a/compose/.apps/kitana/kitana.ports.yml +++ b/compose/.apps/kitana/kitana.ports.yml @@ -1,4 +1,4 @@ services: - kitana: + ${_appname_}: ports: - - ${KITANA_PORT_31337}:31337 + - ${${_APPNAME_}_PORT_31337}:31337 diff --git a/compose/.apps/kitana/kitana.x86_64.yml b/compose/.apps/kitana/kitana.x86_64.yml index 544ca8e5ea..2801442139 100644 --- a/compose/.apps/kitana/kitana.x86_64.yml +++ b/compose/.apps/kitana/kitana.x86_64.yml @@ -1,3 +1,3 @@ services: - kitana: - image: pannal/kitana:${KITANA_TAG} + ${_appname_}: + image: pannal/kitana:${${_APPNAME_}_TAG} diff --git a/compose/.apps/kitana/kitana.yml b/compose/.apps/kitana/kitana.yml index 266d221547..a254ee3b53 100644 --- a/compose/.apps/kitana/kitana.yml +++ b/compose/.apps/kitana/kitana.yml @@ -1,11 +1,11 @@ services: - kitana: + ${_appname_}: command: -B 0.0.0.0:31337 -P - container_name: ${KITANA_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${KITANA_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/kitana:/app/data + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/app/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/kiwixserve/kiwixserve.aarch64.yml b/compose/.apps/kiwixserve/kiwixserve.aarch64.yml index f81ffc3a80..1c2b599a7f 100644 --- a/compose/.apps/kiwixserve/kiwixserve.aarch64.yml +++ b/compose/.apps/kiwixserve/kiwixserve.aarch64.yml @@ -1,3 +1,3 @@ services: - kiwixserve: - image: ghcr.io/kiwix/kiwix-serve:${KIWIXSERVE_TAG} + ${_appname_}: + image: ghcr.io/kiwix/kiwix-serve:${${_APPNAME_}_TAG} diff --git a/compose/.apps/kiwixserve/kiwixserve.hostname.yml b/compose/.apps/kiwixserve/kiwixserve.hostname.yml index 32f92d0690..4dc53c3782 100644 --- a/compose/.apps/kiwixserve/kiwixserve.hostname.yml +++ b/compose/.apps/kiwixserve/kiwixserve.hostname.yml @@ -1,3 +1,3 @@ services: - kiwixserve: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/kiwixserve/kiwixserve.labels.yml b/compose/.apps/kiwixserve/kiwixserve.labels.yml index 2a7f953fe1..d88eca116b 100644 --- a/compose/.apps/kiwixserve/kiwixserve.labels.yml +++ b/compose/.apps/kiwixserve/kiwixserve.labels.yml @@ -1,13 +1,13 @@ services: - kiwixserve: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Kiwix HTTP daemon" com.dockstarter.appinfo.nicename: "Kiwixserve" - com.dockstarter.appvars.kiwixserve_container_name: "kiwixserve" - com.dockstarter.appvars.kiwixserve_enabled: "false" - com.dockstarter.appvars.kiwixserve_environment_downloads: "https://download.kiwix.org/zim/wikipedia_en_all_maxi.zim" - com.dockstarter.appvars.kiwixserve_network_mode: "" - com.dockstarter.appvars.kiwixserve_port_80: "80" - com.dockstarter.appvars.kiwixserve_restart: "unless-stopped" - com.dockstarter.appvars.kiwixserve_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_downloads: "https://download.kiwix.org/zim/wikipedia_en_all_maxi.zim" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_80: "80" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/kiwixserve/kiwixserve.netmode.yml b/compose/.apps/kiwixserve/kiwixserve.netmode.yml index d3fa79a268..f36884ffb9 100644 --- a/compose/.apps/kiwixserve/kiwixserve.netmode.yml +++ b/compose/.apps/kiwixserve/kiwixserve.netmode.yml @@ -1,3 +1,3 @@ services: - kiwixserve: - network_mode: ${KIWIXSERVE_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/kiwixserve/kiwixserve.ports.yml b/compose/.apps/kiwixserve/kiwixserve.ports.yml index bbe751c552..c37afbebb5 100644 --- a/compose/.apps/kiwixserve/kiwixserve.ports.yml +++ b/compose/.apps/kiwixserve/kiwixserve.ports.yml @@ -1,4 +1,4 @@ services: - kiwixserve: + ${_appname_}: ports: - - ${KIWIXSERVE_PORT_80}:80 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/kiwixserve/kiwixserve.x86_64.yml b/compose/.apps/kiwixserve/kiwixserve.x86_64.yml index f81ffc3a80..1c2b599a7f 100644 --- a/compose/.apps/kiwixserve/kiwixserve.x86_64.yml +++ b/compose/.apps/kiwixserve/kiwixserve.x86_64.yml @@ -1,3 +1,3 @@ services: - kiwixserve: - image: ghcr.io/kiwix/kiwix-serve:${KIWIXSERVE_TAG} + ${_appname_}: + image: ghcr.io/kiwix/kiwix-serve:${${_APPNAME_}_TAG} diff --git a/compose/.apps/kiwixserve/kiwixserve.yml b/compose/.apps/kiwixserve/kiwixserve.yml index d307898be3..6a287f59d0 100644 --- a/compose/.apps/kiwixserve/kiwixserve.yml +++ b/compose/.apps/kiwixserve/kiwixserve.yml @@ -1,13 +1,13 @@ services: - kiwixserve: - container_name: ${KIWIXSERVE_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - DOWNLOAD=${KIWIXSERVE_ENVIRONMENT_DOWNLOADS} + - DOWNLOAD=${${_APPNAME_}_ENVIRONMENT_DOWNLOADS} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${KIWIXSERVE_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/kiwixserve:/data + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/komga/komga.aarch64.yml b/compose/.apps/komga/komga.aarch64.yml index 1d0f2000e3..29ca07fa81 100644 --- a/compose/.apps/komga/komga.aarch64.yml +++ b/compose/.apps/komga/komga.aarch64.yml @@ -1,3 +1,3 @@ services: - komga: - image: gotson/komga:${KOMGA_TAG} + ${_appname_}: + image: gotson/komga:${${_APPNAME_}_TAG} diff --git a/compose/.apps/komga/komga.hostname.yml b/compose/.apps/komga/komga.hostname.yml index e69189a7f1..4dc53c3782 100644 --- a/compose/.apps/komga/komga.hostname.yml +++ b/compose/.apps/komga/komga.hostname.yml @@ -1,3 +1,3 @@ services: - komga: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/komga/komga.labels.yml b/compose/.apps/komga/komga.labels.yml index e9333b61bd..bf70d97119 100644 --- a/compose/.apps/komga/komga.labels.yml +++ b/compose/.apps/komga/komga.labels.yml @@ -1,14 +1,14 @@ services: - komga: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A media server for your comics, mangas, BDs and magazines" com.dockstarter.appinfo.nicename: "Komga" - com.dockstarter.appvars.komga_container_name: "komga" - com.dockstarter.appvars.komga_enabled: "false" - com.dockstarter.appvars.komga_environment_baseurl: "" - com.dockstarter.appvars.komga_environment_scan_cron: "0 0 */8 * * ?" - com.dockstarter.appvars.komga_network_mode: "" - com.dockstarter.appvars.komga_port_25600: "25600" - com.dockstarter.appvars.komga_restart: "unless-stopped" - com.dockstarter.appvars.komga_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_baseurl: "" + com.dockstarter.appvars.${_appname_}_environment_scan_cron: "0 0 */8 * * ?" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_25600: "25600" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/komga/komga.netmode.yml b/compose/.apps/komga/komga.netmode.yml index 27e6dab9ef..f36884ffb9 100644 --- a/compose/.apps/komga/komga.netmode.yml +++ b/compose/.apps/komga/komga.netmode.yml @@ -1,3 +1,3 @@ services: - komga: - network_mode: ${KOMGA_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/komga/komga.ports.yml b/compose/.apps/komga/komga.ports.yml index f8dceb9bae..5df5538b1a 100644 --- a/compose/.apps/komga/komga.ports.yml +++ b/compose/.apps/komga/komga.ports.yml @@ -1,4 +1,4 @@ services: - komga: + ${_appname_}: ports: - - ${KOMGA_PORT_25600}:25600 + - ${${_APPNAME_}_PORT_25600}:25600 diff --git a/compose/.apps/komga/komga.x86_64.yml b/compose/.apps/komga/komga.x86_64.yml index 1d0f2000e3..29ca07fa81 100644 --- a/compose/.apps/komga/komga.x86_64.yml +++ b/compose/.apps/komga/komga.x86_64.yml @@ -1,3 +1,3 @@ services: - komga: - image: gotson/komga:${KOMGA_TAG} + ${_appname_}: + image: gotson/komga:${${_APPNAME_}_TAG} diff --git a/compose/.apps/komga/komga.yml b/compose/.apps/komga/komga.yml index 0dd0ee2ac0..832c35b599 100644 --- a/compose/.apps/komga/komga.yml +++ b/compose/.apps/komga/komga.yml @@ -1,13 +1,13 @@ services: - komga: - container_name: ${KOMGA_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - SERVER_SERVLET_CONTEXT_PATH=${KOMGA_ENVIRONMENT_BASEURL} - - KOMGA_LIBRARIES_SCAN_CRON=${KOMGA_ENVIRONMENT_SCAN_CRON} + - SERVER_SERVLET_CONTEXT_PATH=${${_APPNAME_}_ENVIRONMENT_BASEURL} + - KOMGA_LIBRARIES_SCAN_CRON=${${_APPNAME_}_ENVIRONMENT_SCAN_CRON} - TZ=${TZ} - restart: ${KOMGA_RESTART} + restart: ${${_APPNAME_}_RESTART} user: ${PUID}:${PGID} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/komga:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/lazylibrarian/lazylibrarian.aarch64.yml b/compose/.apps/lazylibrarian/lazylibrarian.aarch64.yml index 9d11fd8741..0867b40163 100644 --- a/compose/.apps/lazylibrarian/lazylibrarian.aarch64.yml +++ b/compose/.apps/lazylibrarian/lazylibrarian.aarch64.yml @@ -1,3 +1,3 @@ services: - lazylibrarian: - image: lscr.io/linuxserver/lazylibrarian:${LAZYLIBRARIAN_TAG} + ${_appname_}: + image: lscr.io/linuxserver/lazylibrarian:${${_APPNAME_}_TAG} diff --git a/compose/.apps/lazylibrarian/lazylibrarian.hostname.yml b/compose/.apps/lazylibrarian/lazylibrarian.hostname.yml index 3d92d31ae8..4dc53c3782 100644 --- a/compose/.apps/lazylibrarian/lazylibrarian.hostname.yml +++ b/compose/.apps/lazylibrarian/lazylibrarian.hostname.yml @@ -1,3 +1,3 @@ services: - lazylibrarian: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/lazylibrarian/lazylibrarian.labels.yml b/compose/.apps/lazylibrarian/lazylibrarian.labels.yml index c701af0385..9f4f42295b 100644 --- a/compose/.apps/lazylibrarian/lazylibrarian.labels.yml +++ b/compose/.apps/lazylibrarian/lazylibrarian.labels.yml @@ -1,12 +1,12 @@ services: - lazylibrarian: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Book PVR Client" com.dockstarter.appinfo.nicename: "LazyLibrarian" - com.dockstarter.appvars.lazylibrarian_container_name: "lazylibrarian" - com.dockstarter.appvars.lazylibrarian_enabled: "false" - com.dockstarter.appvars.lazylibrarian_network_mode: "" - com.dockstarter.appvars.lazylibrarian_port_5299: "5299" - com.dockstarter.appvars.lazylibrarian_restart: "unless-stopped" - com.dockstarter.appvars.lazylibrarian_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_5299: "5299" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/lazylibrarian/lazylibrarian.netmode.yml b/compose/.apps/lazylibrarian/lazylibrarian.netmode.yml index ce231d1725..f36884ffb9 100644 --- a/compose/.apps/lazylibrarian/lazylibrarian.netmode.yml +++ b/compose/.apps/lazylibrarian/lazylibrarian.netmode.yml @@ -1,3 +1,3 @@ services: - lazylibrarian: - network_mode: ${LAZYLIBRARIAN_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/lazylibrarian/lazylibrarian.ports.yml b/compose/.apps/lazylibrarian/lazylibrarian.ports.yml index 50b0ee258f..6dc1692194 100644 --- a/compose/.apps/lazylibrarian/lazylibrarian.ports.yml +++ b/compose/.apps/lazylibrarian/lazylibrarian.ports.yml @@ -1,4 +1,4 @@ services: - lazylibrarian: + ${_appname_}: ports: - - ${LAZYLIBRARIAN_PORT_5299}:5299 + - ${${_APPNAME_}_PORT_5299}:5299 diff --git a/compose/.apps/lazylibrarian/lazylibrarian.x86_64.yml b/compose/.apps/lazylibrarian/lazylibrarian.x86_64.yml index 9d11fd8741..0867b40163 100644 --- a/compose/.apps/lazylibrarian/lazylibrarian.x86_64.yml +++ b/compose/.apps/lazylibrarian/lazylibrarian.x86_64.yml @@ -1,3 +1,3 @@ services: - lazylibrarian: - image: lscr.io/linuxserver/lazylibrarian:${LAZYLIBRARIAN_TAG} + ${_appname_}: + image: lscr.io/linuxserver/lazylibrarian:${${_APPNAME_}_TAG} diff --git a/compose/.apps/lazylibrarian/lazylibrarian.yml b/compose/.apps/lazylibrarian/lazylibrarian.yml index b10851f764..ace6d5d0ab 100644 --- a/compose/.apps/lazylibrarian/lazylibrarian.yml +++ b/compose/.apps/lazylibrarian/lazylibrarian.yml @@ -1,12 +1,12 @@ services: - lazylibrarian: - container_name: ${LAZYLIBRARIAN_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${LAZYLIBRARIAN_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/lazylibrarian:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/ldapauth/ldapauth.aarch64.yml b/compose/.apps/ldapauth/ldapauth.aarch64.yml index f01ca2349e..d4bddf038c 100644 --- a/compose/.apps/ldapauth/ldapauth.aarch64.yml +++ b/compose/.apps/ldapauth/ldapauth.aarch64.yml @@ -1,3 +1,3 @@ services: - ldapauth: - image: lscr.io/linuxserver/ldap-auth:${LDAPAUTH_TAG} + ${_appname_}: + image: lscr.io/linuxserver/ldap-auth:${${_APPNAME_}_TAG} diff --git a/compose/.apps/ldapauth/ldapauth.hostname.yml b/compose/.apps/ldapauth/ldapauth.hostname.yml index 230598a859..4dc53c3782 100644 --- a/compose/.apps/ldapauth/ldapauth.hostname.yml +++ b/compose/.apps/ldapauth/ldapauth.hostname.yml @@ -1,3 +1,3 @@ services: - ldapauth: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/ldapauth/ldapauth.labels.yml b/compose/.apps/ldapauth/ldapauth.labels.yml index 8dbdf7f048..36d8bc54ee 100644 --- a/compose/.apps/ldapauth/ldapauth.labels.yml +++ b/compose/.apps/ldapauth/ldapauth.labels.yml @@ -1,16 +1,16 @@ services: - ldapauth: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Ldap-auth software is for authenticating users who request protected resources from servers proxied by nginx." com.dockstarter.appinfo.nicename: "ldapauth" - com.dockstarter.appvars.ldapauth_container_name: "ldapauth" - com.dockstarter.appvars.ldapauth_enabled: "false" - com.dockstarter.appvars.ldapauth_environment_certfile: "" - com.dockstarter.appvars.ldapauth_environment_fernetkey: "" - com.dockstarter.appvars.ldapauth_environment_keyfile: "" - com.dockstarter.appvars.ldapauth_network_mode: "" - com.dockstarter.appvars.ldapauth_port_8888: "8888" - com.dockstarter.appvars.ldapauth_port_9000: "9000" - com.dockstarter.appvars.ldapauth_restart: "unless-stopped" - com.dockstarter.appvars.ldapauth_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_certfile: "" + com.dockstarter.appvars.${_appname_}_environment_fernetkey: "" + com.dockstarter.appvars.${_appname_}_environment_keyfile: "" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8888: "8888" + com.dockstarter.appvars.${_appname_}_port_9000: "9000" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/ldapauth/ldapauth.netmode.yml b/compose/.apps/ldapauth/ldapauth.netmode.yml index 4c55d2bfa0..f36884ffb9 100644 --- a/compose/.apps/ldapauth/ldapauth.netmode.yml +++ b/compose/.apps/ldapauth/ldapauth.netmode.yml @@ -1,3 +1,3 @@ services: - ldapauth: - network_mode: ${LDAPAUTH_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/ldapauth/ldapauth.ports.yml b/compose/.apps/ldapauth/ldapauth.ports.yml index 5e21849cf2..4999480ff7 100644 --- a/compose/.apps/ldapauth/ldapauth.ports.yml +++ b/compose/.apps/ldapauth/ldapauth.ports.yml @@ -1,5 +1,5 @@ services: - ldapauth: + ${_appname_}: ports: - - ${LDAPAUTH_PORT_8888}:8888 - - ${LDAPAUTH_PORT_9000}:9000 + - ${${_APPNAME_}_PORT_8888}:8888 + - ${${_APPNAME_}_PORT_9000}:9000 diff --git a/compose/.apps/ldapauth/ldapauth.x86_64.yml b/compose/.apps/ldapauth/ldapauth.x86_64.yml index f01ca2349e..d4bddf038c 100644 --- a/compose/.apps/ldapauth/ldapauth.x86_64.yml +++ b/compose/.apps/ldapauth/ldapauth.x86_64.yml @@ -1,3 +1,3 @@ services: - ldapauth: - image: lscr.io/linuxserver/ldap-auth:${LDAPAUTH_TAG} + ${_appname_}: + image: lscr.io/linuxserver/ldap-auth:${${_APPNAME_}_TAG} diff --git a/compose/.apps/ldapauth/ldapauth.yml b/compose/.apps/ldapauth/ldapauth.yml index a1e17ffce0..ff1e454793 100644 --- a/compose/.apps/ldapauth/ldapauth.yml +++ b/compose/.apps/ldapauth/ldapauth.yml @@ -1,12 +1,12 @@ services: - ldapauth: - container_name: ${LDAPAUTH_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - CERTFILE=${LDAPAUTH_ENVIRONMENT_CERTFILE} - - FERNETKEY=${LDAPAUTH_ENVIRONMENT_FERNETKEY} - - KEYFILE=${LDAPAUTH_ENVIRONMENT_KEYFILE} + - CERTFILE=${${_APPNAME_}_ENVIRONMENT_CERTFILE} + - FERNETKEY=${${_APPNAME_}_ENVIRONMENT_FERNETKEY} + - KEYFILE=${${_APPNAME_}_ENVIRONMENT_KEYFILE} - TZ=${TZ} - restart: ${LDAPAUTH_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/letsencrypt/letsencrypt.aarch64.yml b/compose/.apps/letsencrypt/letsencrypt.aarch64.yml index 33ec111120..7b52412fe1 100644 --- a/compose/.apps/letsencrypt/letsencrypt.aarch64.yml +++ b/compose/.apps/letsencrypt/letsencrypt.aarch64.yml @@ -1,3 +1,3 @@ services: - letsencrypt: - image: lscr.io/linuxserver/letsencrypt:${LETSENCRYPT_TAG} + ${_appname_}: + image: lscr.io/linuxserver/letsencrypt:${${_APPNAME_}_TAG} diff --git a/compose/.apps/letsencrypt/letsencrypt.hostname.yml b/compose/.apps/letsencrypt/letsencrypt.hostname.yml index e371139ddc..4dc53c3782 100644 --- a/compose/.apps/letsencrypt/letsencrypt.hostname.yml +++ b/compose/.apps/letsencrypt/letsencrypt.hostname.yml @@ -1,3 +1,3 @@ services: - letsencrypt: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/letsencrypt/letsencrypt.labels.yml b/compose/.apps/letsencrypt/letsencrypt.labels.yml index 17d79dfe9f..918a2f712a 100644 --- a/compose/.apps/letsencrypt/letsencrypt.labels.yml +++ b/compose/.apps/letsencrypt/letsencrypt.labels.yml @@ -1,21 +1,21 @@ services: - letsencrypt: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) Use SWAG" com.dockstarter.appinfo.nicename: "LetsEncrypt" - com.dockstarter.appvars.letsencrypt_container_name: "letsencrypt" - com.dockstarter.appvars.letsencrypt_enabled: "false" - com.dockstarter.appvars.letsencrypt_environment_dnsplugin: "" - com.dockstarter.appvars.letsencrypt_environment_duckdnstoken: "" - com.dockstarter.appvars.letsencrypt_environment_email: "" - com.dockstarter.appvars.letsencrypt_environment_extra_domains: "" - com.dockstarter.appvars.letsencrypt_environment_only_subdomains: "false" - com.dockstarter.appvars.letsencrypt_environment_subdomains: "www" - com.dockstarter.appvars.letsencrypt_environment_url: "" - com.dockstarter.appvars.letsencrypt_environment_validation: "http" - com.dockstarter.appvars.letsencrypt_network_mode: "" - com.dockstarter.appvars.letsencrypt_port_443: "443" - com.dockstarter.appvars.letsencrypt_port_80: "80" - com.dockstarter.appvars.letsencrypt_restart: "unless-stopped" - com.dockstarter.appvars.letsencrypt_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_dnsplugin: "" + com.dockstarter.appvars.${_appname_}_environment_duckdnstoken: "" + com.dockstarter.appvars.${_appname_}_environment_email: "" + com.dockstarter.appvars.${_appname_}_environment_extra_domains: "" + com.dockstarter.appvars.${_appname_}_environment_only_subdomains: "false" + com.dockstarter.appvars.${_appname_}_environment_subdomains: "www" + com.dockstarter.appvars.${_appname_}_environment_url: "" + com.dockstarter.appvars.${_appname_}_environment_validation: "http" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_443: "443" + com.dockstarter.appvars.${_appname_}_port_80: "80" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/letsencrypt/letsencrypt.netmode.yml b/compose/.apps/letsencrypt/letsencrypt.netmode.yml index 125625fd83..f36884ffb9 100644 --- a/compose/.apps/letsencrypt/letsencrypt.netmode.yml +++ b/compose/.apps/letsencrypt/letsencrypt.netmode.yml @@ -1,3 +1,3 @@ services: - letsencrypt: - network_mode: ${LETSENCRYPT_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/letsencrypt/letsencrypt.ports.yml b/compose/.apps/letsencrypt/letsencrypt.ports.yml index 402e32137b..b90d412fbb 100644 --- a/compose/.apps/letsencrypt/letsencrypt.ports.yml +++ b/compose/.apps/letsencrypt/letsencrypt.ports.yml @@ -1,5 +1,5 @@ services: - letsencrypt: + ${_appname_}: ports: - - ${LETSENCRYPT_PORT_443}:443 - - ${LETSENCRYPT_PORT_80}:80 + - ${${_APPNAME_}_PORT_443}:443 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/letsencrypt/letsencrypt.x86_64.yml b/compose/.apps/letsencrypt/letsencrypt.x86_64.yml index 33ec111120..7b52412fe1 100644 --- a/compose/.apps/letsencrypt/letsencrypt.x86_64.yml +++ b/compose/.apps/letsencrypt/letsencrypt.x86_64.yml @@ -1,3 +1,3 @@ services: - letsencrypt: - image: lscr.io/linuxserver/letsencrypt:${LETSENCRYPT_TAG} + ${_appname_}: + image: lscr.io/linuxserver/letsencrypt:${${_APPNAME_}_TAG} diff --git a/compose/.apps/letsencrypt/letsencrypt.yml b/compose/.apps/letsencrypt/letsencrypt.yml index 9b71619a21..1325d14f1a 100644 --- a/compose/.apps/letsencrypt/letsencrypt.yml +++ b/compose/.apps/letsencrypt/letsencrypt.yml @@ -1,22 +1,22 @@ services: - letsencrypt: + ${_appname_}: cap_add: - NET_ADMIN - container_name: ${LETSENCRYPT_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - DNSPLUGIN=${LETSENCRYPT_ENVIRONMENT_DNSPLUGIN} - - DUCKDNSTOKEN=${LETSENCRYPT_ENVIRONMENT_DUCKDNSTOKEN} - - EMAIL=${LETSENCRYPT_ENVIRONMENT_EMAIL} - - EXTRA_DOMAINS=${LETSENCRYPT_ENVIRONMENT_EXTRA_DOMAINS} - - ONLY_SUBDOMAINS=${LETSENCRYPT_ENVIRONMENT_ONLY_SUBDOMAINS} + - DNSPLUGIN=${${_APPNAME_}_ENVIRONMENT_DNSPLUGIN} + - DUCKDNSTOKEN=${${_APPNAME_}_ENVIRONMENT_DUCKDNSTOKEN} + - EMAIL=${${_APPNAME_}_ENVIRONMENT_EMAIL} + - EXTRA_DOMAINS=${${_APPNAME_}_ENVIRONMENT_EXTRA_DOMAINS} + - ONLY_SUBDOMAINS=${${_APPNAME_}_ENVIRONMENT_ONLY_SUBDOMAINS} - PGID=${PGID} - PUID=${PUID} - - SUBDOMAINS=${LETSENCRYPT_ENVIRONMENT_SUBDOMAINS} + - SUBDOMAINS=${${_APPNAME_}_ENVIRONMENT_SUBDOMAINS} - TZ=${TZ} - - URL=${LETSENCRYPT_ENVIRONMENT_URL} - - VALIDATION=${LETSENCRYPT_ENVIRONMENT_VALIDATION} - restart: ${LETSENCRYPT_RESTART} + - URL=${${_APPNAME_}_ENVIRONMENT_URL} + - VALIDATION=${${_APPNAME_}_ENVIRONMENT_VALIDATION} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/letsencrypt:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/librespeed/librespeed.aarch64.yml b/compose/.apps/librespeed/librespeed.aarch64.yml index 132f2590a2..fc3a5f2cac 100644 --- a/compose/.apps/librespeed/librespeed.aarch64.yml +++ b/compose/.apps/librespeed/librespeed.aarch64.yml @@ -1,3 +1,3 @@ services: - librespeed: - image: lscr.io/linuxserver/librespeed:${LIBRESPEED_TAG} + ${_appname_}: + image: lscr.io/linuxserver/librespeed:${${_APPNAME_}_TAG} diff --git a/compose/.apps/librespeed/librespeed.hostname.yml b/compose/.apps/librespeed/librespeed.hostname.yml index be366559bc..4dc53c3782 100644 --- a/compose/.apps/librespeed/librespeed.hostname.yml +++ b/compose/.apps/librespeed/librespeed.hostname.yml @@ -1,3 +1,3 @@ services: - librespeed: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/librespeed/librespeed.labels.yml b/compose/.apps/librespeed/librespeed.labels.yml index 62ba4303af..71247ec8f0 100644 --- a/compose/.apps/librespeed/librespeed.labels.yml +++ b/compose/.apps/librespeed/librespeed.labels.yml @@ -1,18 +1,18 @@ services: - librespeed: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Lightweight Speedtest implementation" com.dockstarter.appinfo.nicename: "LibreSpeed" - com.dockstarter.appvars.librespeed_container_name: "librespeed" - com.dockstarter.appvars.librespeed_enabled: "false" - com.dockstarter.appvars.librespeed_environment_db_hostname: "" - com.dockstarter.appvars.librespeed_environment_db_name: "" - com.dockstarter.appvars.librespeed_environment_db_password: "" - com.dockstarter.appvars.librespeed_environment_db_type: "sqlite" - com.dockstarter.appvars.librespeed_environment_db_username: "" - com.dockstarter.appvars.librespeed_environment_password: "" - com.dockstarter.appvars.librespeed_network_mode: "" - com.dockstarter.appvars.librespeed_port_80: "8013" - com.dockstarter.appvars.librespeed_restart: "unless-stopped" - com.dockstarter.appvars.librespeed_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_db_hostname: "" + com.dockstarter.appvars.${_appname_}_environment_db_name: "" + com.dockstarter.appvars.${_appname_}_environment_db_password: "" + com.dockstarter.appvars.${_appname_}_environment_db_type: "sqlite" + com.dockstarter.appvars.${_appname_}_environment_db_username: "" + com.dockstarter.appvars.${_appname_}_environment_password: "" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_80: "8013" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/librespeed/librespeed.netmode.yml b/compose/.apps/librespeed/librespeed.netmode.yml index 72398fe2df..f36884ffb9 100644 --- a/compose/.apps/librespeed/librespeed.netmode.yml +++ b/compose/.apps/librespeed/librespeed.netmode.yml @@ -1,3 +1,3 @@ services: - librespeed: - network_mode: ${LIBRESPEED_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/librespeed/librespeed.ports.yml b/compose/.apps/librespeed/librespeed.ports.yml index 3556dd8bd6..c37afbebb5 100644 --- a/compose/.apps/librespeed/librespeed.ports.yml +++ b/compose/.apps/librespeed/librespeed.ports.yml @@ -1,4 +1,4 @@ services: - librespeed: + ${_appname_}: ports: - - ${LIBRESPEED_PORT_80}:80 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/librespeed/librespeed.x86_64.yml b/compose/.apps/librespeed/librespeed.x86_64.yml index 132f2590a2..fc3a5f2cac 100644 --- a/compose/.apps/librespeed/librespeed.x86_64.yml +++ b/compose/.apps/librespeed/librespeed.x86_64.yml @@ -1,3 +1,3 @@ services: - librespeed: - image: lscr.io/linuxserver/librespeed:${LIBRESPEED_TAG} + ${_appname_}: + image: lscr.io/linuxserver/librespeed:${${_APPNAME_}_TAG} diff --git a/compose/.apps/librespeed/librespeed.yml b/compose/.apps/librespeed/librespeed.yml index 5c7e34b8cc..545cf1704b 100644 --- a/compose/.apps/librespeed/librespeed.yml +++ b/compose/.apps/librespeed/librespeed.yml @@ -1,18 +1,18 @@ services: - librespeed: - container_name: ${LIBRESPEED_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - DB_HOSTNAME=${LIBRESPEED_ENVIRONMENT_DB_HOSTNAME} - - DB_NAME=${LIBRESPEED_ENVIRONMENT_DB_NAME} - - DB_PASSWORD=${LIBRESPEED_ENVIRONMENT_DB_PASSWORD} - - DB_TYPE=${LIBRESPEED_ENVIRONMENT_DB_TYPE} - - DB_USERNAME=${LIBRESPEED_ENVIRONMENT_DB_USERNAME} - - PASSWORD=${LIBRESPEED_ENVIRONMENT_PASSWORD} + - DB_HOSTNAME=${${_APPNAME_}_ENVIRONMENT_DB_HOSTNAME} + - DB_NAME=${${_APPNAME_}_ENVIRONMENT_DB_NAME} + - DB_PASSWORD=${${_APPNAME_}_ENVIRONMENT_DB_PASSWORD} + - DB_TYPE=${${_APPNAME_}_ENVIRONMENT_DB_TYPE} + - DB_USERNAME=${${_APPNAME_}_ENVIRONMENT_DB_USERNAME} + - PASSWORD=${${_APPNAME_}_ENVIRONMENT_PASSWORD} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${LIBRESPEED_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/librespeed:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/lidarr/lidarr.aarch64.yml b/compose/.apps/lidarr/lidarr.aarch64.yml index d8d4c3cfab..da99a08cce 100644 --- a/compose/.apps/lidarr/lidarr.aarch64.yml +++ b/compose/.apps/lidarr/lidarr.aarch64.yml @@ -1,3 +1,3 @@ services: - lidarr: - image: lscr.io/linuxserver/lidarr:${LIDARR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/lidarr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/lidarr/lidarr.hostname.yml b/compose/.apps/lidarr/lidarr.hostname.yml index b1e3e5d48f..4dc53c3782 100644 --- a/compose/.apps/lidarr/lidarr.hostname.yml +++ b/compose/.apps/lidarr/lidarr.hostname.yml @@ -1,3 +1,3 @@ services: - lidarr: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/lidarr/lidarr.labels.yml b/compose/.apps/lidarr/lidarr.labels.yml index 42de44f8a1..7c7252baac 100644 --- a/compose/.apps/lidarr/lidarr.labels.yml +++ b/compose/.apps/lidarr/lidarr.labels.yml @@ -1,12 +1,12 @@ services: - lidarr: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Music download manager for Usenet and BitTorrent users" com.dockstarter.appinfo.nicename: "Lidarr" - com.dockstarter.appvars.lidarr_container_name: "lidarr" - com.dockstarter.appvars.lidarr_enabled: "false" - com.dockstarter.appvars.lidarr_network_mode: "" - com.dockstarter.appvars.lidarr_port_8686: "8686" - com.dockstarter.appvars.lidarr_restart: "unless-stopped" - com.dockstarter.appvars.lidarr_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8686: "8686" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/lidarr/lidarr.netmode.yml b/compose/.apps/lidarr/lidarr.netmode.yml index 56744ef733..f36884ffb9 100644 --- a/compose/.apps/lidarr/lidarr.netmode.yml +++ b/compose/.apps/lidarr/lidarr.netmode.yml @@ -1,3 +1,3 @@ services: - lidarr: - network_mode: ${LIDARR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/lidarr/lidarr.ports.yml b/compose/.apps/lidarr/lidarr.ports.yml index 02e41cbe94..ee44d1ed7d 100644 --- a/compose/.apps/lidarr/lidarr.ports.yml +++ b/compose/.apps/lidarr/lidarr.ports.yml @@ -1,4 +1,4 @@ services: - lidarr: + ${_appname_}: ports: - - ${LIDARR_PORT_8686}:8686 + - ${${_APPNAME_}_PORT_8686}:8686 diff --git a/compose/.apps/lidarr/lidarr.x86_64.yml b/compose/.apps/lidarr/lidarr.x86_64.yml index d8d4c3cfab..da99a08cce 100644 --- a/compose/.apps/lidarr/lidarr.x86_64.yml +++ b/compose/.apps/lidarr/lidarr.x86_64.yml @@ -1,3 +1,3 @@ services: - lidarr: - image: lscr.io/linuxserver/lidarr:${LIDARR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/lidarr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/lidarr/lidarr.yml b/compose/.apps/lidarr/lidarr.yml index c497be6657..ace6d5d0ab 100644 --- a/compose/.apps/lidarr/lidarr.yml +++ b/compose/.apps/lidarr/lidarr.yml @@ -1,12 +1,12 @@ services: - lidarr: - container_name: ${LIDARR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${LIDARR_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/lidarr:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/limnoria/limnoria.aarch64.yml b/compose/.apps/limnoria/limnoria.aarch64.yml index 5ed79a12a6..812350188a 100644 --- a/compose/.apps/limnoria/limnoria.aarch64.yml +++ b/compose/.apps/limnoria/limnoria.aarch64.yml @@ -1,3 +1,3 @@ services: - limnoria: - image: lscr.io/linuxserver/limnoria:${LIMNORIA_TAG} + ${_appname_}: + image: lscr.io/linuxserver/limnoria:${${_APPNAME_}_TAG} diff --git a/compose/.apps/limnoria/limnoria.hostname.yml b/compose/.apps/limnoria/limnoria.hostname.yml index 33e58a906b..4dc53c3782 100644 --- a/compose/.apps/limnoria/limnoria.hostname.yml +++ b/compose/.apps/limnoria/limnoria.hostname.yml @@ -1,3 +1,3 @@ services: - limnoria: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/limnoria/limnoria.labels.yml b/compose/.apps/limnoria/limnoria.labels.yml index b2ee01c39c..7fa3d81f5b 100644 --- a/compose/.apps/limnoria/limnoria.labels.yml +++ b/compose/.apps/limnoria/limnoria.labels.yml @@ -1,12 +1,12 @@ services: - limnoria: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "User/programmer-friendly IRC bot" com.dockstarter.appinfo.nicename: "Limnoria" - com.dockstarter.appvars.limnoria_container_name: "limnoria" - com.dockstarter.appvars.limnoria_enabled: "false" - com.dockstarter.appvars.limnoria_network_mode: "" - com.dockstarter.appvars.limnoria_port_8080: "8080" - com.dockstarter.appvars.limnoria_restart: "unless-stopped" - com.dockstarter.appvars.limnoria_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8080: "8080" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/limnoria/limnoria.netmode.yml b/compose/.apps/limnoria/limnoria.netmode.yml index 8255e56fe3..f36884ffb9 100644 --- a/compose/.apps/limnoria/limnoria.netmode.yml +++ b/compose/.apps/limnoria/limnoria.netmode.yml @@ -1,3 +1,3 @@ services: - limnoria: - network_mode: ${LIMNORIA_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/limnoria/limnoria.ports.yml b/compose/.apps/limnoria/limnoria.ports.yml index 58909ea2c9..7d1c7e4455 100644 --- a/compose/.apps/limnoria/limnoria.ports.yml +++ b/compose/.apps/limnoria/limnoria.ports.yml @@ -1,4 +1,4 @@ services: - limnoria: + ${_appname_}: ports: - - ${LIMNORIA_PORT_8080}:8080 + - ${${_APPNAME_}_PORT_8080}:8080 diff --git a/compose/.apps/limnoria/limnoria.x86_64.yml b/compose/.apps/limnoria/limnoria.x86_64.yml index 5ed79a12a6..812350188a 100644 --- a/compose/.apps/limnoria/limnoria.x86_64.yml +++ b/compose/.apps/limnoria/limnoria.x86_64.yml @@ -1,3 +1,3 @@ services: - limnoria: - image: lscr.io/linuxserver/limnoria:${LIMNORIA_TAG} + ${_appname_}: + image: lscr.io/linuxserver/limnoria:${${_APPNAME_}_TAG} diff --git a/compose/.apps/limnoria/limnoria.yml b/compose/.apps/limnoria/limnoria.yml index 6a9eca984e..ace6d5d0ab 100644 --- a/compose/.apps/limnoria/limnoria.yml +++ b/compose/.apps/limnoria/limnoria.yml @@ -1,12 +1,12 @@ services: - limnoria: - container_name: ${LIMNORIA_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${LIMNORIA_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/limnoria:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/logarr/logarr.hostname.yml b/compose/.apps/logarr/logarr.hostname.yml index cf439fe2a0..4dc53c3782 100644 --- a/compose/.apps/logarr/logarr.hostname.yml +++ b/compose/.apps/logarr/logarr.hostname.yml @@ -1,3 +1,3 @@ services: - logarr: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/logarr/logarr.labels.yml b/compose/.apps/logarr/logarr.labels.yml index 400f989b66..c8cd50573d 100644 --- a/compose/.apps/logarr/logarr.labels.yml +++ b/compose/.apps/logarr/logarr.labels.yml @@ -1,12 +1,12 @@ services: - logarr: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Self-hosted, single-page, log consolidation tool" com.dockstarter.appinfo.nicename: "Logarr" - com.dockstarter.appvars.logarr_container_name: "logarr" - com.dockstarter.appvars.logarr_enabled: "false" - com.dockstarter.appvars.logarr_network_mode: "" - com.dockstarter.appvars.logarr_port_80: "8003" - com.dockstarter.appvars.logarr_restart: "unless-stopped" - com.dockstarter.appvars.logarr_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_80: "8003" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/logarr/logarr.netmode.yml b/compose/.apps/logarr/logarr.netmode.yml index ba34dfd293..f36884ffb9 100644 --- a/compose/.apps/logarr/logarr.netmode.yml +++ b/compose/.apps/logarr/logarr.netmode.yml @@ -1,3 +1,3 @@ services: - logarr: - network_mode: ${LOGARR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/logarr/logarr.ports.yml b/compose/.apps/logarr/logarr.ports.yml index 3a1833c4ff..c37afbebb5 100644 --- a/compose/.apps/logarr/logarr.ports.yml +++ b/compose/.apps/logarr/logarr.ports.yml @@ -1,4 +1,4 @@ services: - logarr: + ${_appname_}: ports: - - ${LOGARR_PORT_80}:80 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/logarr/logarr.x86_64.yml b/compose/.apps/logarr/logarr.x86_64.yml index 685948ca21..8fad4f4d36 100644 --- a/compose/.apps/logarr/logarr.x86_64.yml +++ b/compose/.apps/logarr/logarr.x86_64.yml @@ -1,3 +1,3 @@ services: - logarr: - image: monitorr/logarr:${LOGARR_TAG} + ${_appname_}: + image: monitorr/logarr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/logarr/logarr.yml b/compose/.apps/logarr/logarr.yml index 2074ddd54a..1400b8ff07 100644 --- a/compose/.apps/logarr/logarr.yml +++ b/compose/.apps/logarr/logarr.yml @@ -1,13 +1,13 @@ services: - logarr: - container_name: ${LOGARR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${LOGARR_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/logarr:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_CONFIG}:/var/log/logarrlogs:ro - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/logitechmediaserver/logitechmediaserver.aarch64.yml b/compose/.apps/logitechmediaserver/logitechmediaserver.aarch64.yml index 02d1c4d817..c64fbda26f 100644 --- a/compose/.apps/logitechmediaserver/logitechmediaserver.aarch64.yml +++ b/compose/.apps/logitechmediaserver/logitechmediaserver.aarch64.yml @@ -1,3 +1,3 @@ services: - logitechmediaserver: - image: lmscommunity/logitechmediaserver:${LOGITECHMEDIASERVER_TAG} + ${_appname_}: + image: lmscommunity/logitechmediaserver:${${_APPNAME_}_TAG} diff --git a/compose/.apps/logitechmediaserver/logitechmediaserver.hostname.yml b/compose/.apps/logitechmediaserver/logitechmediaserver.hostname.yml index c5af0fd4a7..4dc53c3782 100644 --- a/compose/.apps/logitechmediaserver/logitechmediaserver.hostname.yml +++ b/compose/.apps/logitechmediaserver/logitechmediaserver.hostname.yml @@ -1,3 +1,3 @@ services: - logitechmediaserver: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/logitechmediaserver/logitechmediaserver.labels.yml b/compose/.apps/logitechmediaserver/logitechmediaserver.labels.yml index f0f039255f..2e9b6965b1 100644 --- a/compose/.apps/logitechmediaserver/logitechmediaserver.labels.yml +++ b/compose/.apps/logitechmediaserver/logitechmediaserver.labels.yml @@ -1,14 +1,14 @@ services: - logitechmediaserver: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "LogitechMediaServer(SqueezeBox)" com.dockstarter.appinfo.nicename: "LogitechMediaServer" - com.dockstarter.appvars.logitechmediaserver_container_name: "logitechmediaserver" - com.dockstarter.appvars.logitechmediaserver_enabled: "false" - com.dockstarter.appvars.logitechmediaserver_network_mode: "" - com.dockstarter.appvars.logitechmediaserver_port_3483: "3483" - com.dockstarter.appvars.logitechmediaserver_port_9000: "9000" - com.dockstarter.appvars.logitechmediaserver_port_9090: "9090" - com.dockstarter.appvars.logitechmediaserver_restart: "unless-stopped" - com.dockstarter.appvars.logitechmediaserver_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_3483: "3483" + com.dockstarter.appvars.${_appname_}_port_9000: "9000" + com.dockstarter.appvars.${_appname_}_port_9090: "9090" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/logitechmediaserver/logitechmediaserver.netmode.yml b/compose/.apps/logitechmediaserver/logitechmediaserver.netmode.yml index e2a8f3122c..f36884ffb9 100644 --- a/compose/.apps/logitechmediaserver/logitechmediaserver.netmode.yml +++ b/compose/.apps/logitechmediaserver/logitechmediaserver.netmode.yml @@ -1,3 +1,3 @@ services: - logitechmediaserver: - network_mode: ${LOGITECHMEDIASERVER_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/logitechmediaserver/logitechmediaserver.ports.yml b/compose/.apps/logitechmediaserver/logitechmediaserver.ports.yml index 70a518ec4e..0838244555 100644 --- a/compose/.apps/logitechmediaserver/logitechmediaserver.ports.yml +++ b/compose/.apps/logitechmediaserver/logitechmediaserver.ports.yml @@ -1,7 +1,7 @@ services: - logitechmediaserver: + ${_appname_}: ports: - - ${LOGITECHMEDIASERVER_PORT_3483}:3483 - - ${LOGITECHMEDIASERVER_PORT_3483}:3483/udp - - ${LOGITECHMEDIASERVER_PORT_9000}:9000 - - ${LOGITECHMEDIASERVER_PORT_9090}:9090 + - ${${_APPNAME_}_PORT_3483}:3483 + - ${${_APPNAME_}_PORT_3483}:3483/udp + - ${${_APPNAME_}_PORT_9000}:9000 + - ${${_APPNAME_}_PORT_9090}:9090 diff --git a/compose/.apps/logitechmediaserver/logitechmediaserver.x86_64.yml b/compose/.apps/logitechmediaserver/logitechmediaserver.x86_64.yml index 02d1c4d817..c64fbda26f 100644 --- a/compose/.apps/logitechmediaserver/logitechmediaserver.x86_64.yml +++ b/compose/.apps/logitechmediaserver/logitechmediaserver.x86_64.yml @@ -1,3 +1,3 @@ services: - logitechmediaserver: - image: lmscommunity/logitechmediaserver:${LOGITECHMEDIASERVER_TAG} + ${_appname_}: + image: lmscommunity/logitechmediaserver:${${_APPNAME_}_TAG} diff --git a/compose/.apps/logitechmediaserver/logitechmediaserver.yml b/compose/.apps/logitechmediaserver/logitechmediaserver.yml index d0898ce87b..ace6d5d0ab 100644 --- a/compose/.apps/logitechmediaserver/logitechmediaserver.yml +++ b/compose/.apps/logitechmediaserver/logitechmediaserver.yml @@ -1,12 +1,12 @@ services: - logitechmediaserver: - container_name: ${LOGITECHMEDIASERVER_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${LOGITECHMEDIASERVER_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/logitechmediaserver:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/makemkv/makemkv.hostname.yml b/compose/.apps/makemkv/makemkv.hostname.yml index 4e003d889a..4dc53c3782 100644 --- a/compose/.apps/makemkv/makemkv.hostname.yml +++ b/compose/.apps/makemkv/makemkv.hostname.yml @@ -1,3 +1,3 @@ services: - makemkv: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/makemkv/makemkv.labels.yml b/compose/.apps/makemkv/makemkv.labels.yml index feef02c26c..80619c7f76 100644 --- a/compose/.apps/makemkv/makemkv.labels.yml +++ b/compose/.apps/makemkv/makemkv.labels.yml @@ -1,13 +1,13 @@ services: - makemkv: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Convert video that you own into free and patents-unencumbered format" com.dockstarter.appinfo.nicename: "MakeMKV" - com.dockstarter.appvars.makemkv_container_name: "makemkv" - com.dockstarter.appvars.makemkv_enabled: "false" - com.dockstarter.appvars.makemkv_network_mode: "" - com.dockstarter.appvars.makemkv_port_5800: "5800" - com.dockstarter.appvars.makemkv_restart: "unless-stopped" - com.dockstarter.appvars.makemkv_tag: "latest" - com.dockstarter.appvars.makemkv_volume_outputdir: "/mnt/makemkv/output" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_5800: "5800" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_outputdir: "/mnt/makemkv/output" diff --git a/compose/.apps/makemkv/makemkv.netmode.yml b/compose/.apps/makemkv/makemkv.netmode.yml index f41379bf34..f36884ffb9 100644 --- a/compose/.apps/makemkv/makemkv.netmode.yml +++ b/compose/.apps/makemkv/makemkv.netmode.yml @@ -1,3 +1,3 @@ services: - makemkv: - network_mode: ${MAKEMKV_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/makemkv/makemkv.ports.yml b/compose/.apps/makemkv/makemkv.ports.yml index 17907e9e8c..e628931935 100644 --- a/compose/.apps/makemkv/makemkv.ports.yml +++ b/compose/.apps/makemkv/makemkv.ports.yml @@ -1,4 +1,4 @@ services: - makemkv: + ${_appname_}: ports: - - ${MAKEMKV_PORT_5800}:5800 + - ${${_APPNAME_}_PORT_5800}:5800 diff --git a/compose/.apps/makemkv/makemkv.x86_64.yml b/compose/.apps/makemkv/makemkv.x86_64.yml index 10082b471d..c106500515 100644 --- a/compose/.apps/makemkv/makemkv.x86_64.yml +++ b/compose/.apps/makemkv/makemkv.x86_64.yml @@ -1,3 +1,3 @@ services: - makemkv: - image: jlesage/makemkv:${MAKEMKV_TAG} + ${_appname_}: + image: jlesage/makemkv:${${_APPNAME_}_TAG} diff --git a/compose/.apps/makemkv/makemkv.yml b/compose/.apps/makemkv/makemkv.yml index 0c4e93ca7d..a5ca0990ed 100644 --- a/compose/.apps/makemkv/makemkv.yml +++ b/compose/.apps/makemkv/makemkv.yml @@ -1,13 +1,13 @@ services: - makemkv: - container_name: ${MAKEMKV_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - GROUP_ID=${PGID} - USER_ID=${PUID} - TZ=${TZ} - restart: ${MAKEMKV_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/makemkv:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${MAKEMKV_VOLUME_OUTPUTDIR}:/output + - ${${_APPNAME_}_VOLUME_OUTPUTDIR}:/output diff --git a/compose/.apps/mariadb/mariadb.aarch64.yml b/compose/.apps/mariadb/mariadb.aarch64.yml index 3a08710368..6b52ed3b07 100644 --- a/compose/.apps/mariadb/mariadb.aarch64.yml +++ b/compose/.apps/mariadb/mariadb.aarch64.yml @@ -1,3 +1,3 @@ services: - mariadb: - image: lscr.io/linuxserver/mariadb:${MARIADB_TAG} + ${_appname_}: + image: lscr.io/linuxserver/mariadb:${${_APPNAME_}_TAG} diff --git a/compose/.apps/mariadb/mariadb.hostname.yml b/compose/.apps/mariadb/mariadb.hostname.yml index d65c126356..4dc53c3782 100644 --- a/compose/.apps/mariadb/mariadb.hostname.yml +++ b/compose/.apps/mariadb/mariadb.hostname.yml @@ -1,3 +1,3 @@ services: - mariadb: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/mariadb/mariadb.labels.yml b/compose/.apps/mariadb/mariadb.labels.yml index e109533bae..b61c5d85b7 100644 --- a/compose/.apps/mariadb/mariadb.labels.yml +++ b/compose/.apps/mariadb/mariadb.labels.yml @@ -1,13 +1,13 @@ services: - mariadb: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "One of the most popular database servers" com.dockstarter.appinfo.nicename: "MariaDB" - com.dockstarter.appvars.mariadb_container_name: "mariadb" - com.dockstarter.appvars.mariadb_enabled: "false" - com.dockstarter.appvars.mariadb_environment_mysql_root_password: "" - com.dockstarter.appvars.mariadb_network_mode: "" - com.dockstarter.appvars.mariadb_port_3306: "3306" - com.dockstarter.appvars.mariadb_restart: "unless-stopped" - com.dockstarter.appvars.mariadb_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_mysql_root_password: "" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_3306: "3306" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/mariadb/mariadb.netmode.yml b/compose/.apps/mariadb/mariadb.netmode.yml index 1c9cd62b7b..f36884ffb9 100644 --- a/compose/.apps/mariadb/mariadb.netmode.yml +++ b/compose/.apps/mariadb/mariadb.netmode.yml @@ -1,3 +1,3 @@ services: - mariadb: - network_mode: ${MARIADB_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/mariadb/mariadb.ports.yml b/compose/.apps/mariadb/mariadb.ports.yml index 8c72257318..19490f3d1c 100644 --- a/compose/.apps/mariadb/mariadb.ports.yml +++ b/compose/.apps/mariadb/mariadb.ports.yml @@ -1,4 +1,4 @@ services: - mariadb: + ${_appname_}: ports: - - ${MARIADB_PORT_3306}:3306 + - ${${_APPNAME_}_PORT_3306}:3306 diff --git a/compose/.apps/mariadb/mariadb.x86_64.yml b/compose/.apps/mariadb/mariadb.x86_64.yml index 3a08710368..6b52ed3b07 100644 --- a/compose/.apps/mariadb/mariadb.x86_64.yml +++ b/compose/.apps/mariadb/mariadb.x86_64.yml @@ -1,3 +1,3 @@ services: - mariadb: - image: lscr.io/linuxserver/mariadb:${MARIADB_TAG} + ${_appname_}: + image: lscr.io/linuxserver/mariadb:${${_APPNAME_}_TAG} diff --git a/compose/.apps/mariadb/mariadb.yml b/compose/.apps/mariadb/mariadb.yml index 5387115e6b..1c796584ad 100644 --- a/compose/.apps/mariadb/mariadb.yml +++ b/compose/.apps/mariadb/mariadb.yml @@ -1,13 +1,13 @@ services: - mariadb: - container_name: ${MARIADB_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - MYSQL_ROOT_PASSWORD=${MARIADB_ENVIRONMENT_MYSQL_ROOT_PASSWORD} + - MYSQL_ROOT_PASSWORD=${${_APPNAME_}_ENVIRONMENT_MYSQL_ROOT_PASSWORD} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${MARIADB_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/mariadb:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/mcmyadmin2/mcmyadmin2.netmode.yml b/compose/.apps/mcmyadmin2/mcmyadmin2.netmode.yml index 530fcbc8ba..5e949eeccf 100644 --- a/compose/.apps/mcmyadmin2/mcmyadmin2.netmode.yml +++ b/compose/.apps/mcmyadmin2/mcmyadmin2.netmode.yml @@ -1,3 +1,3 @@ services: mcmyadmin2: - network_mode: ${MCMYADMIN2_NETWORK_MODE} + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/mcmyadmin2/mcmyadmin2.ports.yml b/compose/.apps/mcmyadmin2/mcmyadmin2.ports.yml index 38e0b6c454..742bd0c3e8 100644 --- a/compose/.apps/mcmyadmin2/mcmyadmin2.ports.yml +++ b/compose/.apps/mcmyadmin2/mcmyadmin2.ports.yml @@ -1,5 +1,5 @@ services: mcmyadmin2: ports: - - ${MCMYADMIN2_PORT_25565}:25565 - - ${MCMYADMIN2_PORT_8080}:8080 + - ${${_APPNAME_}_PORT_25565}:25565 + - ${${_APPNAME_}_PORT_8080}:8080 diff --git a/compose/.apps/mcmyadmin2/mcmyadmin2.x86_64.yml b/compose/.apps/mcmyadmin2/mcmyadmin2.x86_64.yml index 9e8cbd71d9..9a7f45e9c6 100644 --- a/compose/.apps/mcmyadmin2/mcmyadmin2.x86_64.yml +++ b/compose/.apps/mcmyadmin2/mcmyadmin2.x86_64.yml @@ -1,3 +1,3 @@ services: mcmyadmin2: - image: lscr.io/linuxserver/mcmyadmin2:${MCMYADMIN2_TAG} + image: lscr.io/linuxserver/mcmyadmin2:${${_APPNAME_}_TAG} diff --git a/compose/.apps/mcmyadmin2/mcmyadmin2.yml b/compose/.apps/mcmyadmin2/mcmyadmin2.yml index 952e4a83e6..af145fd62e 100644 --- a/compose/.apps/mcmyadmin2/mcmyadmin2.yml +++ b/compose/.apps/mcmyadmin2/mcmyadmin2.yml @@ -1,12 +1,12 @@ services: mcmyadmin2: - container_name: ${MCMYADMIN2_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${MCMYADMIN2_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/mcmyadmin2:/minecraft + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/minecraft - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/medusa/medusa.aarch64.yml b/compose/.apps/medusa/medusa.aarch64.yml index fac44a4043..65e886cfac 100644 --- a/compose/.apps/medusa/medusa.aarch64.yml +++ b/compose/.apps/medusa/medusa.aarch64.yml @@ -1,3 +1,3 @@ services: - medusa: - image: lscr.io/linuxserver/medusa:${MEDUSA_TAG} + ${_appname_}: + image: lscr.io/linuxserver/medusa:${${_APPNAME_}_TAG} diff --git a/compose/.apps/medusa/medusa.hostname.yml b/compose/.apps/medusa/medusa.hostname.yml index 6ce3958a17..4dc53c3782 100644 --- a/compose/.apps/medusa/medusa.hostname.yml +++ b/compose/.apps/medusa/medusa.hostname.yml @@ -1,3 +1,3 @@ services: - medusa: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/medusa/medusa.labels.yml b/compose/.apps/medusa/medusa.labels.yml index 3074eb367a..0aa6758566 100644 --- a/compose/.apps/medusa/medusa.labels.yml +++ b/compose/.apps/medusa/medusa.labels.yml @@ -1,12 +1,12 @@ services: - medusa: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Automatic Video Library Manager for TV Shows" com.dockstarter.appinfo.nicename: "Medusa" - com.dockstarter.appvars.medusa_container_name: "medusa" - com.dockstarter.appvars.medusa_enabled: "false" - com.dockstarter.appvars.medusa_network_mode: "" - com.dockstarter.appvars.medusa_port_8081: "8081" - com.dockstarter.appvars.medusa_restart: "unless-stopped" - com.dockstarter.appvars.medusa_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8081: "8081" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/medusa/medusa.netmode.yml b/compose/.apps/medusa/medusa.netmode.yml index 55e7dd45ac..f36884ffb9 100644 --- a/compose/.apps/medusa/medusa.netmode.yml +++ b/compose/.apps/medusa/medusa.netmode.yml @@ -1,3 +1,3 @@ services: - medusa: - network_mode: ${MEDUSA_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/medusa/medusa.ports.yml b/compose/.apps/medusa/medusa.ports.yml index dde1f1d578..b70b0fc494 100644 --- a/compose/.apps/medusa/medusa.ports.yml +++ b/compose/.apps/medusa/medusa.ports.yml @@ -1,4 +1,4 @@ services: - medusa: + ${_appname_}: ports: - - ${MEDUSA_PORT_8081}:8081 + - ${${_APPNAME_}_PORT_8081}:8081 diff --git a/compose/.apps/medusa/medusa.x86_64.yml b/compose/.apps/medusa/medusa.x86_64.yml index fac44a4043..65e886cfac 100644 --- a/compose/.apps/medusa/medusa.x86_64.yml +++ b/compose/.apps/medusa/medusa.x86_64.yml @@ -1,3 +1,3 @@ services: - medusa: - image: lscr.io/linuxserver/medusa:${MEDUSA_TAG} + ${_appname_}: + image: lscr.io/linuxserver/medusa:${${_APPNAME_}_TAG} diff --git a/compose/.apps/medusa/medusa.yml b/compose/.apps/medusa/medusa.yml index 72dc682968..ace6d5d0ab 100644 --- a/compose/.apps/medusa/medusa.yml +++ b/compose/.apps/medusa/medusa.yml @@ -1,12 +1,12 @@ services: - medusa: - container_name: ${MEDUSA_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${MEDUSA_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/medusa:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.hostname.yml b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.hostname.yml index 5ef22748c1..4dc53c3782 100644 --- a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.hostname.yml +++ b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.hostname.yml @@ -1,3 +1,3 @@ services: - minecraftbedrockserver: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.labels.yml b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.labels.yml index f3b9a66fcd..fb0ede289e 100644 --- a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.labels.yml +++ b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.labels.yml @@ -1,14 +1,14 @@ services: - minecraftbedrockserver: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Minecraft Bedrock Server" com.dockstarter.appinfo.nicename: "MinecraftBedrockServer" - com.dockstarter.appvars.minecraftbedrockserver_container_name: "minecraftbedrockserver" - com.dockstarter.appvars.minecraftbedrockserver_enabled: "false" - com.dockstarter.appvars.minecraftbedrockserver_environment_eula: "TRUE" - com.dockstarter.appvars.minecraftbedrockserver_environment_version: "LATEST" - com.dockstarter.appvars.minecraftbedrockserver_network_mode: "" - com.dockstarter.appvars.minecraftbedrockserver_port_19132: "19132" - com.dockstarter.appvars.minecraftbedrockserver_restart: "unless-stopped" - com.dockstarter.appvars.minecraftbedrockserver_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_eula: "TRUE" + com.dockstarter.appvars.${_appname_}_environment_version: "LATEST" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_19132: "19132" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.netmode.yml b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.netmode.yml index 726ae68313..f36884ffb9 100644 --- a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.netmode.yml +++ b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.netmode.yml @@ -1,3 +1,3 @@ services: - minecraftbedrockserver: - network_mode: ${MINECRAFTBEDROCKSERVER_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.ports.yml b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.ports.yml index e2a51b9439..9034cc977d 100644 --- a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.ports.yml +++ b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.ports.yml @@ -1,4 +1,4 @@ services: - minecraftbedrockserver: + ${_appname_}: ports: - - ${MINECRAFTBEDROCKSERVER_PORT_19132}:19132/udp + - ${${_APPNAME_}_PORT_19132}:19132/udp diff --git a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.x86_64.yml b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.x86_64.yml index f51058aac3..c15956af44 100644 --- a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.x86_64.yml +++ b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.x86_64.yml @@ -1,3 +1,3 @@ services: - minecraftbedrockserver: - image: itzg/minecraft-bedrock-server:${MINECRAFTBEDROCKSERVER_TAG} + ${_appname_}: + image: itzg/minecraft-bedrock-server:${${_APPNAME_}_TAG} diff --git a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.yml b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.yml index 80ba0495d7..dcd90fa040 100644 --- a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.yml +++ b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.yml @@ -1,14 +1,14 @@ services: - minecraftbedrockserver: - container_name: ${MINECRAFTBEDROCKSERVER_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - EULA=${MINECRAFTBEDROCKSERVER_ENVIRONMENT_EULA} + - EULA=${${_APPNAME_}_ENVIRONMENT_EULA} - GID=${PGID} - TZ=${TZ} - UID=${PUID} - - VERSION=${MINECRAFTBEDROCKSERVER_ENVIRONMENT_VERSION} - restart: ${MINECRAFTBEDROCKSERVER_RESTART} + - VERSION=${${_APPNAME_}_ENVIRONMENT_VERSION} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/minecraftbedrockserver:/data + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/minecraftserver/minecraftserver.aarch64.yml b/compose/.apps/minecraftserver/minecraftserver.aarch64.yml index 808cf10bc8..4799fb995e 100644 --- a/compose/.apps/minecraftserver/minecraftserver.aarch64.yml +++ b/compose/.apps/minecraftserver/minecraftserver.aarch64.yml @@ -1,3 +1,3 @@ services: - minecraftserver: - image: itzg/minecraft-server:${MINECRAFTSERVER_TAG} + ${_appname_}: + image: itzg/minecraft-server:${${_APPNAME_}_TAG} diff --git a/compose/.apps/minecraftserver/minecraftserver.hostname.yml b/compose/.apps/minecraftserver/minecraftserver.hostname.yml index 01210cc64c..4dc53c3782 100644 --- a/compose/.apps/minecraftserver/minecraftserver.hostname.yml +++ b/compose/.apps/minecraftserver/minecraftserver.hostname.yml @@ -1,3 +1,3 @@ services: - minecraftserver: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/minecraftserver/minecraftserver.labels.yml b/compose/.apps/minecraftserver/minecraftserver.labels.yml index d8267174a1..3a62ca5121 100644 --- a/compose/.apps/minecraftserver/minecraftserver.labels.yml +++ b/compose/.apps/minecraftserver/minecraftserver.labels.yml @@ -1,15 +1,15 @@ services: - minecraftserver: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Minecraft Java Edition Server" com.dockstarter.appinfo.nicename: "MinecraftServer" - com.dockstarter.appvars.minecraftserver_container_name: "minecraftserver" - com.dockstarter.appvars.minecraftserver_enabled: "false" - com.dockstarter.appvars.minecraftserver_environment_eula: "TRUE" - com.dockstarter.appvars.minecraftserver_environment_type: "VANILLA" - com.dockstarter.appvars.minecraftserver_environment_version: "LATEST" - com.dockstarter.appvars.minecraftserver_network_mode: "" - com.dockstarter.appvars.minecraftserver_port_25565: "25565" - com.dockstarter.appvars.minecraftserver_restart: "unless-stopped" - com.dockstarter.appvars.minecraftserver_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_eula: "TRUE" + com.dockstarter.appvars.${_appname_}_environment_type: "VANILLA" + com.dockstarter.appvars.${_appname_}_environment_version: "LATEST" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_25565: "25565" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/minecraftserver/minecraftserver.netmode.yml b/compose/.apps/minecraftserver/minecraftserver.netmode.yml index 6647703958..f36884ffb9 100644 --- a/compose/.apps/minecraftserver/minecraftserver.netmode.yml +++ b/compose/.apps/minecraftserver/minecraftserver.netmode.yml @@ -1,3 +1,3 @@ services: - minecraftserver: - network_mode: ${MINECRAFTSERVER_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/minecraftserver/minecraftserver.ports.yml b/compose/.apps/minecraftserver/minecraftserver.ports.yml index 67c568382e..e8c16ce0d1 100644 --- a/compose/.apps/minecraftserver/minecraftserver.ports.yml +++ b/compose/.apps/minecraftserver/minecraftserver.ports.yml @@ -1,4 +1,4 @@ services: - minecraftserver: + ${_appname_}: ports: - - ${MINECRAFTSERVER_PORT_25565}:25565 + - ${${_APPNAME_}_PORT_25565}:25565 diff --git a/compose/.apps/minecraftserver/minecraftserver.x86_64.yml b/compose/.apps/minecraftserver/minecraftserver.x86_64.yml index 808cf10bc8..4799fb995e 100644 --- a/compose/.apps/minecraftserver/minecraftserver.x86_64.yml +++ b/compose/.apps/minecraftserver/minecraftserver.x86_64.yml @@ -1,3 +1,3 @@ services: - minecraftserver: - image: itzg/minecraft-server:${MINECRAFTSERVER_TAG} + ${_appname_}: + image: itzg/minecraft-server:${${_APPNAME_}_TAG} diff --git a/compose/.apps/minecraftserver/minecraftserver.yml b/compose/.apps/minecraftserver/minecraftserver.yml index f75cab1805..bb5bbc197b 100644 --- a/compose/.apps/minecraftserver/minecraftserver.yml +++ b/compose/.apps/minecraftserver/minecraftserver.yml @@ -1,15 +1,15 @@ services: - minecraftserver: - container_name: ${MINECRAFTSERVER_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - EULA=${MINECRAFTSERVER_ENVIRONMENT_EULA} + - EULA=${${_APPNAME_}_ENVIRONMENT_EULA} - GID=${PGID} - - TYPE=${MINECRAFTSERVER_ENVIRONMENT_TYPE} + - TYPE=${${_APPNAME_}_ENVIRONMENT_TYPE} - TZ=${TZ} - UID=${PUID} - - VERSION=${MINECRAFTSERVER_ENVIRONMENT_VERSION} - restart: ${MINECRAFTSERVER_RESTART} + - VERSION=${${_APPNAME_}_ENVIRONMENT_VERSION} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/minecraftserver:/data + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/monitorr/monitorr.hostname.yml b/compose/.apps/monitorr/monitorr.hostname.yml index 1ba13f990f..4dc53c3782 100644 --- a/compose/.apps/monitorr/monitorr.hostname.yml +++ b/compose/.apps/monitorr/monitorr.hostname.yml @@ -1,3 +1,3 @@ services: - monitorr: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/monitorr/monitorr.labels.yml b/compose/.apps/monitorr/monitorr.labels.yml index 74adae3283..ca3ae3e5d4 100644 --- a/compose/.apps/monitorr/monitorr.labels.yml +++ b/compose/.apps/monitorr/monitorr.labels.yml @@ -1,12 +1,12 @@ services: - monitorr: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Webfront to live display the status of any webapp or service" com.dockstarter.appinfo.nicename: "Monitorr" - com.dockstarter.appvars.monitorr_container_name: "monitorr" - com.dockstarter.appvars.monitorr_enabled: "false" - com.dockstarter.appvars.monitorr_network_mode: "" - com.dockstarter.appvars.monitorr_port_80: "8004" - com.dockstarter.appvars.monitorr_restart: "unless-stopped" - com.dockstarter.appvars.monitorr_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_80: "8004" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/monitorr/monitorr.netmode.yml b/compose/.apps/monitorr/monitorr.netmode.yml index 34dbf38cd0..f36884ffb9 100644 --- a/compose/.apps/monitorr/monitorr.netmode.yml +++ b/compose/.apps/monitorr/monitorr.netmode.yml @@ -1,3 +1,3 @@ services: - monitorr: - network_mode: ${MONITORR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/monitorr/monitorr.ports.yml b/compose/.apps/monitorr/monitorr.ports.yml index 542e698500..c37afbebb5 100644 --- a/compose/.apps/monitorr/monitorr.ports.yml +++ b/compose/.apps/monitorr/monitorr.ports.yml @@ -1,4 +1,4 @@ services: - monitorr: + ${_appname_}: ports: - - ${MONITORR_PORT_80}:80 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/monitorr/monitorr.x86_64.yml b/compose/.apps/monitorr/monitorr.x86_64.yml index 4f14a9590c..907a98bb78 100644 --- a/compose/.apps/monitorr/monitorr.x86_64.yml +++ b/compose/.apps/monitorr/monitorr.x86_64.yml @@ -1,3 +1,3 @@ services: - monitorr: - image: monitorr/monitorr:${MONITORR_TAG} + ${_appname_}: + image: monitorr/monitorr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/monitorr/monitorr.yml b/compose/.apps/monitorr/monitorr.yml index 5a6e8cd848..bff36b5c0f 100644 --- a/compose/.apps/monitorr/monitorr.yml +++ b/compose/.apps/monitorr/monitorr.yml @@ -1,12 +1,12 @@ services: - monitorr: - container_name: ${MONITORR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${MONITORR_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/monitorr:/app + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/app - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/mosquitto/mosquitto.aarch64.yml b/compose/.apps/mosquitto/mosquitto.aarch64.yml index 1127c7dd30..f2f90644c2 100644 --- a/compose/.apps/mosquitto/mosquitto.aarch64.yml +++ b/compose/.apps/mosquitto/mosquitto.aarch64.yml @@ -1,3 +1,3 @@ services: - mosquitto: - image: eclipse-mosquitto:${MOSQUITTO_TAG} + ${_appname_}: + image: eclipse-mosquitto:${${_APPNAME_}_TAG} diff --git a/compose/.apps/mosquitto/mosquitto.hostname.yml b/compose/.apps/mosquitto/mosquitto.hostname.yml index c39e1b27f7..4dc53c3782 100644 --- a/compose/.apps/mosquitto/mosquitto.hostname.yml +++ b/compose/.apps/mosquitto/mosquitto.hostname.yml @@ -1,3 +1,3 @@ services: - mosquitto: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/mosquitto/mosquitto.labels.yml b/compose/.apps/mosquitto/mosquitto.labels.yml index ad3f0d6b32..fcaff84550 100644 --- a/compose/.apps/mosquitto/mosquitto.labels.yml +++ b/compose/.apps/mosquitto/mosquitto.labels.yml @@ -1,13 +1,13 @@ services: - mosquitto: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Open source implementation of a server for version 5.0, 3.1.1, and 3.1 of the MQTT protocol" com.dockstarter.appinfo.nicename: "Mosquitto" - com.dockstarter.appvars.mosquitto_container_name: "mosquitto" - com.dockstarter.appvars.mosquitto_enabled: "false" - com.dockstarter.appvars.mosquitto_network_mode: "" - com.dockstarter.appvars.mosquitto_port_1883: "1883" - com.dockstarter.appvars.mosquitto_port_9001: "9001" - com.dockstarter.appvars.mosquitto_restart: "unless-stopped" - com.dockstarter.appvars.mosquitto_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_1883: "1883" + com.dockstarter.appvars.${_appname_}_port_9001: "9001" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/mosquitto/mosquitto.netmode.yml b/compose/.apps/mosquitto/mosquitto.netmode.yml index 4f9ad554d2..f36884ffb9 100644 --- a/compose/.apps/mosquitto/mosquitto.netmode.yml +++ b/compose/.apps/mosquitto/mosquitto.netmode.yml @@ -1,3 +1,3 @@ services: - mosquitto: - network_mode: ${MOSQUITTO_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/mosquitto/mosquitto.ports.yml b/compose/.apps/mosquitto/mosquitto.ports.yml index ea40c2f33f..d94621f307 100644 --- a/compose/.apps/mosquitto/mosquitto.ports.yml +++ b/compose/.apps/mosquitto/mosquitto.ports.yml @@ -1,5 +1,5 @@ services: - mosquitto: + ${_appname_}: ports: - - ${MOSQUITTO_PORT_1883}:1883 - - ${MOSQUITTO_PORT_9001}:9001 + - ${${_APPNAME_}_PORT_1883}:1883 + - ${${_APPNAME_}_PORT_9001}:9001 diff --git a/compose/.apps/mosquitto/mosquitto.x86_64.yml b/compose/.apps/mosquitto/mosquitto.x86_64.yml index 1127c7dd30..f2f90644c2 100644 --- a/compose/.apps/mosquitto/mosquitto.x86_64.yml +++ b/compose/.apps/mosquitto/mosquitto.x86_64.yml @@ -1,3 +1,3 @@ services: - mosquitto: - image: eclipse-mosquitto:${MOSQUITTO_TAG} + ${_appname_}: + image: eclipse-mosquitto:${${_APPNAME_}_TAG} diff --git a/compose/.apps/mosquitto/mosquitto.yml b/compose/.apps/mosquitto/mosquitto.yml index 46a8c642e0..84f6a1a9a6 100644 --- a/compose/.apps/mosquitto/mosquitto.yml +++ b/compose/.apps/mosquitto/mosquitto.yml @@ -1,14 +1,14 @@ services: - mosquitto: - container_name: ${MOSQUITTO_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${MOSQUITTO_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/mosquitto:/mosquitto/config - - ${DOCKER_VOLUME_CONFIG}/mosquitto/data:/mosquitto/data - - ${DOCKER_VOLUME_CONFIG}/mosquitto/log:/mosquitto/log + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/mosquitto/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/data:/mosquitto/data + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/log:/mosquitto/log - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/moviematch/moviematch.aarch64.yml b/compose/.apps/moviematch/moviematch.aarch64.yml index 97a72cb885..39c691fe27 100644 --- a/compose/.apps/moviematch/moviematch.aarch64.yml +++ b/compose/.apps/moviematch/moviematch.aarch64.yml @@ -1,3 +1,3 @@ services: - moviematch: - image: lukechannings/moviematch:${MOVIEMATCH_TAG} + ${_appname_}: + image: lukechannings/moviematch:${${_APPNAME_}_TAG} diff --git a/compose/.apps/moviematch/moviematch.hostname.yml b/compose/.apps/moviematch/moviematch.hostname.yml index fd5f583b1e..4dc53c3782 100644 --- a/compose/.apps/moviematch/moviematch.hostname.yml +++ b/compose/.apps/moviematch/moviematch.hostname.yml @@ -1,3 +1,3 @@ services: - moviematch: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/moviematch/moviematch.labels.yml b/compose/.apps/moviematch/moviematch.labels.yml index fd321dc20e..649adbeb68 100644 --- a/compose/.apps/moviematch/moviematch.labels.yml +++ b/compose/.apps/moviematch/moviematch.labels.yml @@ -1,15 +1,15 @@ services: - moviematch: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Have you ever spent longer deciding on a movie than it'd take to juwatch a random movie? This is an app that helps you and your frienpick a movie to watch from a Plex server." com.dockstarter.appinfo.nicename: "Moviematch" - com.dockstarter.appvars.moviematch_container_name: "moviematch" - com.dockstarter.appvars.moviematch_enabled: "false" - com.dockstarter.appvars.moviematch_environment_log_level: "INFO" - com.dockstarter.appvars.moviematch_environment_plex_token: "" - com.dockstarter.appvars.moviematch_environment_plex_url: "" - com.dockstarter.appvars.moviematch_network_mode: "" - com.dockstarter.appvars.moviematch_port_8000: "8000" - com.dockstarter.appvars.moviematch_restart: "unless-stopped" - com.dockstarter.appvars.moviematch_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_log_level: "INFO" + com.dockstarter.appvars.${_appname_}_environment_plex_token: "" + com.dockstarter.appvars.${_appname_}_environment_plex_url: "" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8000: "8000" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/moviematch/moviematch.netmode.yml b/compose/.apps/moviematch/moviematch.netmode.yml index f013943743..f36884ffb9 100644 --- a/compose/.apps/moviematch/moviematch.netmode.yml +++ b/compose/.apps/moviematch/moviematch.netmode.yml @@ -1,3 +1,3 @@ services: - moviematch: - network_mode: ${MOVIEMATCH_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/moviematch/moviematch.ports.yml b/compose/.apps/moviematch/moviematch.ports.yml index c3c773c3b6..33070f8cee 100644 --- a/compose/.apps/moviematch/moviematch.ports.yml +++ b/compose/.apps/moviematch/moviematch.ports.yml @@ -1,4 +1,4 @@ services: - moviematch: + ${_appname_}: ports: - - ${MOVIEMATCH_PORT_8000}:8000 + - ${${_APPNAME_}_PORT_8000}:8000 diff --git a/compose/.apps/moviematch/moviematch.x86_64.yml b/compose/.apps/moviematch/moviematch.x86_64.yml index 97a72cb885..39c691fe27 100644 --- a/compose/.apps/moviematch/moviematch.x86_64.yml +++ b/compose/.apps/moviematch/moviematch.x86_64.yml @@ -1,3 +1,3 @@ services: - moviematch: - image: lukechannings/moviematch:${MOVIEMATCH_TAG} + ${_appname_}: + image: lukechannings/moviematch:${${_APPNAME_}_TAG} diff --git a/compose/.apps/moviematch/moviematch.yml b/compose/.apps/moviematch/moviematch.yml index e0b8ee4e64..1af452a000 100644 --- a/compose/.apps/moviematch/moviematch.yml +++ b/compose/.apps/moviematch/moviematch.yml @@ -1,15 +1,15 @@ services: - moviematch: - container_name: ${MOVIEMATCH_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - LOG_LEVEL=${MOVIEMATCH_ENVIRONMENT_LOG_LEVEL} + - LOG_LEVEL=${${_APPNAME_}_ENVIRONMENT_LOG_LEVEL} - PGID=${PGID} - - PLEX_TOKEN=${MOVIEMATCH_ENVIRONMENT_PLEX_TOKEN} - - PLEX_URL=${MOVIEMATCH_ENVIRONMENT_PLEX_URL} + - PLEX_TOKEN=${${_APPNAME_}_ENVIRONMENT_PLEX_TOKEN} + - PLEX_URL=${${_APPNAME_}_ENVIRONMENT_PLEX_URL} - PUID=${PUID} - TZ=${TZ} - restart: ${MOVIEMATCH_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/moviematch:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/murmur/murmur.hostname.yml b/compose/.apps/murmur/murmur.hostname.yml index 731ffd4c52..4dc53c3782 100644 --- a/compose/.apps/murmur/murmur.hostname.yml +++ b/compose/.apps/murmur/murmur.hostname.yml @@ -1,3 +1,3 @@ services: - murmur: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/murmur/murmur.labels.yml b/compose/.apps/murmur/murmur.labels.yml index a71a84a887..9c2cbcc209 100644 --- a/compose/.apps/murmur/murmur.labels.yml +++ b/compose/.apps/murmur/murmur.labels.yml @@ -1,13 +1,13 @@ services: - murmur: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Murmur is the server for Mumble, a voice over IP application" com.dockstarter.appinfo.nicename: "Murmur" - com.dockstarter.appvars.murmur_container_name: "murmur" - com.dockstarter.appvars.murmur_enabled: "false" - com.dockstarter.appvars.murmur_environment_supw: "" - com.dockstarter.appvars.murmur_network_mode: "" - com.dockstarter.appvars.murmur_port_64738: "64738" - com.dockstarter.appvars.murmur_restart: "unless-stopped" - com.dockstarter.appvars.murmur_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_supw: "" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_64738: "64738" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/murmur/murmur.netmode.yml b/compose/.apps/murmur/murmur.netmode.yml index cb6c584080..f36884ffb9 100644 --- a/compose/.apps/murmur/murmur.netmode.yml +++ b/compose/.apps/murmur/murmur.netmode.yml @@ -1,3 +1,3 @@ services: - murmur: - network_mode: ${MURMUR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/murmur/murmur.ports.yml b/compose/.apps/murmur/murmur.ports.yml index 07b56ea2a6..607f115065 100644 --- a/compose/.apps/murmur/murmur.ports.yml +++ b/compose/.apps/murmur/murmur.ports.yml @@ -1,5 +1,5 @@ services: - murmur: + ${_appname_}: ports: - - ${MURMUR_PORT_64738}:64738 - - ${MURMUR_PORT_64738}:64738/udp + - ${${_APPNAME_}_PORT_64738}:64738 + - ${${_APPNAME_}_PORT_64738}:64738/udp diff --git a/compose/.apps/murmur/murmur.x86_64.yml b/compose/.apps/murmur/murmur.x86_64.yml index ff16afde85..31629e4139 100644 --- a/compose/.apps/murmur/murmur.x86_64.yml +++ b/compose/.apps/murmur/murmur.x86_64.yml @@ -1,3 +1,3 @@ services: - murmur: - image: goofball222/murmur:${MURMUR_TAG} + ${_appname_}: + image: goofball222/murmur:${${_APPNAME_}_TAG} diff --git a/compose/.apps/murmur/murmur.yml b/compose/.apps/murmur/murmur.yml index d3e25f3978..eaaacceb09 100644 --- a/compose/.apps/murmur/murmur.yml +++ b/compose/.apps/murmur/murmur.yml @@ -1,16 +1,16 @@ services: - murmur: - container_name: ${MURMUR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - MURMUR_SUPW=${MURMUR_ENVIRONMENT_SUPW} + - MURMUR_SUPW=${${_APPNAME_}_ENVIRONMENT_SUPW} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${MURMUR_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/murmur/cert:/opt/murmur/cert - - ${DOCKER_VOLUME_CONFIG}/murmur/config:/opt/murmur/config - - ${DOCKER_VOLUME_CONFIG}/murmur/data:/opt/murmur/data - - ${DOCKER_VOLUME_CONFIG}/murmur/log:/opt/murmur/log + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/cert:/opt/murmur/cert + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/config:/opt/murmur/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/data:/opt/murmur/data + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/log:/opt/murmur/log - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/muximux/muximux.aarch64.yml b/compose/.apps/muximux/muximux.aarch64.yml index 55970bf1d7..7df2be186e 100644 --- a/compose/.apps/muximux/muximux.aarch64.yml +++ b/compose/.apps/muximux/muximux.aarch64.yml @@ -1,3 +1,3 @@ services: - muximux: - image: lscr.io/linuxserver/muximux:${MUXIMUX_TAG} + ${_appname_}: + image: lscr.io/linuxserver/muximux:${${_APPNAME_}_TAG} diff --git a/compose/.apps/muximux/muximux.hostname.yml b/compose/.apps/muximux/muximux.hostname.yml index c638700c7f..4dc53c3782 100644 --- a/compose/.apps/muximux/muximux.hostname.yml +++ b/compose/.apps/muximux/muximux.hostname.yml @@ -1,3 +1,3 @@ services: - muximux: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/muximux/muximux.labels.yml b/compose/.apps/muximux/muximux.labels.yml index daebc309cd..48a7089619 100644 --- a/compose/.apps/muximux/muximux.labels.yml +++ b/compose/.apps/muximux/muximux.labels.yml @@ -1,12 +1,12 @@ services: - muximux: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) Use Heimdall or Organizr" com.dockstarter.appinfo.nicename: "Muximux" - com.dockstarter.appvars.muximux_container_name: "muximux" - com.dockstarter.appvars.muximux_enabled: "false" - com.dockstarter.appvars.muximux_network_mode: "" - com.dockstarter.appvars.muximux_port_80: "8005" - com.dockstarter.appvars.muximux_restart: "unless-stopped" - com.dockstarter.appvars.muximux_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_80: "8005" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/muximux/muximux.netmode.yml b/compose/.apps/muximux/muximux.netmode.yml index be62e9e3fc..f36884ffb9 100644 --- a/compose/.apps/muximux/muximux.netmode.yml +++ b/compose/.apps/muximux/muximux.netmode.yml @@ -1,3 +1,3 @@ services: - muximux: - network_mode: ${MUXIMUX_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/muximux/muximux.ports.yml b/compose/.apps/muximux/muximux.ports.yml index 3c159ba43f..c37afbebb5 100644 --- a/compose/.apps/muximux/muximux.ports.yml +++ b/compose/.apps/muximux/muximux.ports.yml @@ -1,4 +1,4 @@ services: - muximux: + ${_appname_}: ports: - - ${MUXIMUX_PORT_80}:80 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/muximux/muximux.x86_64.yml b/compose/.apps/muximux/muximux.x86_64.yml index 55970bf1d7..7df2be186e 100644 --- a/compose/.apps/muximux/muximux.x86_64.yml +++ b/compose/.apps/muximux/muximux.x86_64.yml @@ -1,3 +1,3 @@ services: - muximux: - image: lscr.io/linuxserver/muximux:${MUXIMUX_TAG} + ${_appname_}: + image: lscr.io/linuxserver/muximux:${${_APPNAME_}_TAG} diff --git a/compose/.apps/muximux/muximux.yml b/compose/.apps/muximux/muximux.yml index bc81487137..ace6d5d0ab 100644 --- a/compose/.apps/muximux/muximux.yml +++ b/compose/.apps/muximux/muximux.yml @@ -1,12 +1,12 @@ services: - muximux: - container_name: ${MUXIMUX_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${MUXIMUX_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/muximux:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/mylar/mylar.aarch64.yml b/compose/.apps/mylar/mylar.aarch64.yml index 762d33be21..47b54ba190 100644 --- a/compose/.apps/mylar/mylar.aarch64.yml +++ b/compose/.apps/mylar/mylar.aarch64.yml @@ -1,3 +1,3 @@ services: - mylar: - image: lscr.io/linuxserver/mylar:${MYLAR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/mylar:${${_APPNAME_}_TAG} diff --git a/compose/.apps/mylar/mylar.hostname.yml b/compose/.apps/mylar/mylar.hostname.yml index 2cc98cb641..4dc53c3782 100644 --- a/compose/.apps/mylar/mylar.hostname.yml +++ b/compose/.apps/mylar/mylar.hostname.yml @@ -1,3 +1,3 @@ services: - mylar: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/mylar/mylar.labels.yml b/compose/.apps/mylar/mylar.labels.yml index 99c7a5c9fa..6096c00056 100644 --- a/compose/.apps/mylar/mylar.labels.yml +++ b/compose/.apps/mylar/mylar.labels.yml @@ -1,12 +1,12 @@ services: - mylar: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) Use Mylar3" com.dockstarter.appinfo.nicename: "Mylar" - com.dockstarter.appvars.mylar_container_name: "mylar" - com.dockstarter.appvars.mylar_enabled: "false" - com.dockstarter.appvars.mylar_network_mode: "" - com.dockstarter.appvars.mylar_port_8090: "8090" - com.dockstarter.appvars.mylar_restart: "unless-stopped" - com.dockstarter.appvars.mylar_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8090: "8090" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/mylar/mylar.netmode.yml b/compose/.apps/mylar/mylar.netmode.yml index d563e0726a..f36884ffb9 100644 --- a/compose/.apps/mylar/mylar.netmode.yml +++ b/compose/.apps/mylar/mylar.netmode.yml @@ -1,3 +1,3 @@ services: - mylar: - network_mode: ${MYLAR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/mylar/mylar.ports.yml b/compose/.apps/mylar/mylar.ports.yml index 676e679a30..a15055b16a 100644 --- a/compose/.apps/mylar/mylar.ports.yml +++ b/compose/.apps/mylar/mylar.ports.yml @@ -1,4 +1,4 @@ services: - mylar: + ${_appname_}: ports: - - ${MYLAR_PORT_8090}:8090 + - ${${_APPNAME_}_PORT_8090}:8090 diff --git a/compose/.apps/mylar/mylar.x86_64.yml b/compose/.apps/mylar/mylar.x86_64.yml index 762d33be21..47b54ba190 100644 --- a/compose/.apps/mylar/mylar.x86_64.yml +++ b/compose/.apps/mylar/mylar.x86_64.yml @@ -1,3 +1,3 @@ services: - mylar: - image: lscr.io/linuxserver/mylar:${MYLAR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/mylar:${${_APPNAME_}_TAG} diff --git a/compose/.apps/mylar/mylar.yml b/compose/.apps/mylar/mylar.yml index 971f32cd47..ace6d5d0ab 100644 --- a/compose/.apps/mylar/mylar.yml +++ b/compose/.apps/mylar/mylar.yml @@ -1,12 +1,12 @@ services: - mylar: - container_name: ${MYLAR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${MYLAR_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/mylar:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/mylar3/mylar3.aarch64.yml b/compose/.apps/mylar3/mylar3.aarch64.yml index ee7c3b9cd8..b63cd11b11 100644 --- a/compose/.apps/mylar3/mylar3.aarch64.yml +++ b/compose/.apps/mylar3/mylar3.aarch64.yml @@ -1,3 +1,3 @@ services: mylar3: - image: lscr.io/linuxserver/mylar3:${MYLAR3_TAG} + image: lscr.io/linuxserver/mylar3:${${_APPNAME_}_TAG} diff --git a/compose/.apps/mylar3/mylar3.labels.yml b/compose/.apps/mylar3/mylar3.labels.yml index 1d85a6eb4e..2cf35e4b05 100644 --- a/compose/.apps/mylar3/mylar3.labels.yml +++ b/compose/.apps/mylar3/mylar3.labels.yml @@ -4,9 +4,9 @@ services: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Comic book PVR client" com.dockstarter.appinfo.nicename: "Mylar3" - com.dockstarter.appvars.mylar3_container_name: "mylar3" - com.dockstarter.appvars.mylar3_enabled: "false" - com.dockstarter.appvars.mylar3_network_mode: "" - com.dockstarter.appvars.mylar3_port_8090: "8090" - com.dockstarter.appvars.mylar3_restart: "unless-stopped" - com.dockstarter.appvars.mylar3_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8090: "8090" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/mylar3/mylar3.netmode.yml b/compose/.apps/mylar3/mylar3.netmode.yml index 3742bc067f..cad798e5bc 100644 --- a/compose/.apps/mylar3/mylar3.netmode.yml +++ b/compose/.apps/mylar3/mylar3.netmode.yml @@ -1,3 +1,3 @@ services: mylar3: - network_mode: ${MYLAR3_NETWORK_MODE} + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/mylar3/mylar3.ports.yml b/compose/.apps/mylar3/mylar3.ports.yml index 41e44c799f..f1df618d85 100644 --- a/compose/.apps/mylar3/mylar3.ports.yml +++ b/compose/.apps/mylar3/mylar3.ports.yml @@ -1,4 +1,4 @@ services: mylar3: ports: - - ${MYLAR3_PORT_8090}:8090 + - ${${_APPNAME_}_PORT_8090}:8090 diff --git a/compose/.apps/mylar3/mylar3.x86_64.yml b/compose/.apps/mylar3/mylar3.x86_64.yml index ee7c3b9cd8..b63cd11b11 100644 --- a/compose/.apps/mylar3/mylar3.x86_64.yml +++ b/compose/.apps/mylar3/mylar3.x86_64.yml @@ -1,3 +1,3 @@ services: mylar3: - image: lscr.io/linuxserver/mylar3:${MYLAR3_TAG} + image: lscr.io/linuxserver/mylar3:${${_APPNAME_}_TAG} diff --git a/compose/.apps/mylar3/mylar3.yml b/compose/.apps/mylar3/mylar3.yml index 227a64360f..63d53329a4 100644 --- a/compose/.apps/mylar3/mylar3.yml +++ b/compose/.apps/mylar3/mylar3.yml @@ -1,12 +1,12 @@ services: mylar3: - container_name: ${MYLAR3_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${MYLAR3_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/mylar3:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/netdata/netdata.aarch64.yml b/compose/.apps/netdata/netdata.aarch64.yml index fd5290064f..ccc9e6c92b 100644 --- a/compose/.apps/netdata/netdata.aarch64.yml +++ b/compose/.apps/netdata/netdata.aarch64.yml @@ -1,3 +1,3 @@ services: - netdata: - image: netdata/netdata:${NETDATA_TAG} + ${_appname_}: + image: netdata/netdata:${${_APPNAME_}_TAG} diff --git a/compose/.apps/netdata/netdata.hostname.yml b/compose/.apps/netdata/netdata.hostname.yml index 3fd673cca8..4dc53c3782 100644 --- a/compose/.apps/netdata/netdata.hostname.yml +++ b/compose/.apps/netdata/netdata.hostname.yml @@ -1,3 +1,3 @@ services: - netdata: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/netdata/netdata.labels.yml b/compose/.apps/netdata/netdata.labels.yml index 0b2175f571..facd743292 100644 --- a/compose/.apps/netdata/netdata.labels.yml +++ b/compose/.apps/netdata/netdata.labels.yml @@ -1,13 +1,13 @@ services: - netdata: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Distributed real-time performance and health monitoring" com.dockstarter.appinfo.nicename: "Netdata" - com.dockstarter.appvars.netdata_container_name: "netdata" - com.dockstarter.appvars.netdata_enabled: "false" - com.dockstarter.appvars.netdata_network_mode: "" - com.dockstarter.appvars.netdata_port_19999: "19999" - com.dockstarter.appvars.netdata_restart: "unless-stopped" - com.dockstarter.appvars.netdata_tag: "latest" - com.dockstarter.appvars.netdata_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_19999: "19999" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/netdata/netdata.netmode.yml b/compose/.apps/netdata/netdata.netmode.yml index f87ab8d081..f36884ffb9 100644 --- a/compose/.apps/netdata/netdata.netmode.yml +++ b/compose/.apps/netdata/netdata.netmode.yml @@ -1,3 +1,3 @@ services: - netdata: - network_mode: ${NETDATA_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/netdata/netdata.ports.yml b/compose/.apps/netdata/netdata.ports.yml index 87ea9a60fb..ff0c707985 100644 --- a/compose/.apps/netdata/netdata.ports.yml +++ b/compose/.apps/netdata/netdata.ports.yml @@ -1,4 +1,4 @@ services: - netdata: + ${_appname_}: ports: - - ${NETDATA_PORT_19999}:19999 + - ${${_APPNAME_}_PORT_19999}:19999 diff --git a/compose/.apps/netdata/netdata.x86_64.yml b/compose/.apps/netdata/netdata.x86_64.yml index fd5290064f..ccc9e6c92b 100644 --- a/compose/.apps/netdata/netdata.x86_64.yml +++ b/compose/.apps/netdata/netdata.x86_64.yml @@ -1,3 +1,3 @@ services: - netdata: - image: netdata/netdata:${NETDATA_TAG} + ${_appname_}: + image: netdata/netdata:${${_APPNAME_}_TAG} diff --git a/compose/.apps/netdata/netdata.yml b/compose/.apps/netdata/netdata.yml index 6c7fd88b8d..69db90be96 100644 --- a/compose/.apps/netdata/netdata.yml +++ b/compose/.apps/netdata/netdata.yml @@ -1,12 +1,12 @@ services: - netdata: + ${_appname_}: cap_add: - SYS_PTRACE - container_name: ${NETDATA_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${DOCKER_GID} - TZ=${TZ} - restart: ${NETDATA_RESTART} + restart: ${${_APPNAME_}_RESTART} security_opt: - apparmor:unconfined volumes: @@ -18,4 +18,4 @@ services: - /proc:/host/proc:ro - /sys:/host/sys:ro - ${DOCKER_VOLUME_STORAGE}:/storage - - ${NETDATA_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock:ro + - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock:ro diff --git a/compose/.apps/nextcloud/nextcloud.aarch64.yml b/compose/.apps/nextcloud/nextcloud.aarch64.yml index 39c6f90901..9cc559223c 100644 --- a/compose/.apps/nextcloud/nextcloud.aarch64.yml +++ b/compose/.apps/nextcloud/nextcloud.aarch64.yml @@ -1,3 +1,3 @@ services: - nextcloud: - image: lscr.io/linuxserver/nextcloud:${NEXTCLOUD_TAG} + ${_appname_}: + image: lscr.io/linuxserver/nextcloud:${${_APPNAME_}_TAG} diff --git a/compose/.apps/nextcloud/nextcloud.hostname.yml b/compose/.apps/nextcloud/nextcloud.hostname.yml index 9553aab97c..4dc53c3782 100644 --- a/compose/.apps/nextcloud/nextcloud.hostname.yml +++ b/compose/.apps/nextcloud/nextcloud.hostname.yml @@ -1,3 +1,3 @@ services: - nextcloud: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/nextcloud/nextcloud.labels.yml b/compose/.apps/nextcloud/nextcloud.labels.yml index 87225f52fa..725aef0ef8 100644 --- a/compose/.apps/nextcloud/nextcloud.labels.yml +++ b/compose/.apps/nextcloud/nextcloud.labels.yml @@ -1,13 +1,13 @@ services: - nextcloud: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Gives you access to all your files wherever you are" com.dockstarter.appinfo.nicename: "Nextcloud" - com.dockstarter.appvars.nextcloud_container_name: "nextcloud" - com.dockstarter.appvars.nextcloud_enabled: "false" - com.dockstarter.appvars.nextcloud_network_mode: "" - com.dockstarter.appvars.nextcloud_port_443: "444" - com.dockstarter.appvars.nextcloud_restart: "unless-stopped" - com.dockstarter.appvars.nextcloud_tag: "latest" - com.dockstarter.appvars.nextcloud_volume_datadir: "/mnt/nextcloud" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_443: "444" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_datadir: "/mnt/nextcloud" diff --git a/compose/.apps/nextcloud/nextcloud.netmode.yml b/compose/.apps/nextcloud/nextcloud.netmode.yml index 8862afa2f5..f36884ffb9 100644 --- a/compose/.apps/nextcloud/nextcloud.netmode.yml +++ b/compose/.apps/nextcloud/nextcloud.netmode.yml @@ -1,3 +1,3 @@ services: - nextcloud: - network_mode: ${NEXTCLOUD_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/nextcloud/nextcloud.ports.yml b/compose/.apps/nextcloud/nextcloud.ports.yml index f55db7b205..0213e0baa0 100644 --- a/compose/.apps/nextcloud/nextcloud.ports.yml +++ b/compose/.apps/nextcloud/nextcloud.ports.yml @@ -1,4 +1,4 @@ services: - nextcloud: + ${_appname_}: ports: - - ${NEXTCLOUD_PORT_443}:443 + - ${${_APPNAME_}_PORT_443}:443 diff --git a/compose/.apps/nextcloud/nextcloud.x86_64.yml b/compose/.apps/nextcloud/nextcloud.x86_64.yml index 39c6f90901..9cc559223c 100644 --- a/compose/.apps/nextcloud/nextcloud.x86_64.yml +++ b/compose/.apps/nextcloud/nextcloud.x86_64.yml @@ -1,3 +1,3 @@ services: - nextcloud: - image: lscr.io/linuxserver/nextcloud:${NEXTCLOUD_TAG} + ${_appname_}: + image: lscr.io/linuxserver/nextcloud:${${_APPNAME_}_TAG} diff --git a/compose/.apps/nextcloud/nextcloud.yml b/compose/.apps/nextcloud/nextcloud.yml index 855d935b80..c4f2d01d4c 100644 --- a/compose/.apps/nextcloud/nextcloud.yml +++ b/compose/.apps/nextcloud/nextcloud.yml @@ -1,13 +1,13 @@ services: - nextcloud: - container_name: ${NEXTCLOUD_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${NEXTCLOUD_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/nextcloud:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${NEXTCLOUD_VOLUME_DATADIR}:/data + - ${${_APPNAME_}_VOLUME_DATADIR}:/data diff --git a/compose/.apps/nodered/nodered.aarch64.yml b/compose/.apps/nodered/nodered.aarch64.yml index 80bd31ae73..42531af7d0 100644 --- a/compose/.apps/nodered/nodered.aarch64.yml +++ b/compose/.apps/nodered/nodered.aarch64.yml @@ -1,3 +1,3 @@ services: - nodered: - image: nodered/node-red:${NODERED_TAG} + ${_appname_}: + image: nodered/node-red:${${_APPNAME_}_TAG} diff --git a/compose/.apps/nodered/nodered.hostname.yml b/compose/.apps/nodered/nodered.hostname.yml index 897a3e2806..4dc53c3782 100644 --- a/compose/.apps/nodered/nodered.hostname.yml +++ b/compose/.apps/nodered/nodered.hostname.yml @@ -1,3 +1,3 @@ services: - nodered: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/nodered/nodered.labels.yml b/compose/.apps/nodered/nodered.labels.yml index 651f90480d..e1c49d4313 100644 --- a/compose/.apps/nodered/nodered.labels.yml +++ b/compose/.apps/nodered/nodered.labels.yml @@ -1,12 +1,12 @@ services: - nodered: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Low-code programming for event-driven applications" com.dockstarter.appinfo.nicename: "Nodered" - com.dockstarter.appvars.nodered_container_name: "nodered" - com.dockstarter.appvars.nodered_enabled: "false" - com.dockstarter.appvars.nodered_network_mode: "" - com.dockstarter.appvars.nodered_port_1880: "1880" - com.dockstarter.appvars.nodered_restart: "unless-stopped" - com.dockstarter.appvars.nodered_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_1880: "1880" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/nodered/nodered.netmode.yml b/compose/.apps/nodered/nodered.netmode.yml index 46e475be9f..f36884ffb9 100644 --- a/compose/.apps/nodered/nodered.netmode.yml +++ b/compose/.apps/nodered/nodered.netmode.yml @@ -1,3 +1,3 @@ services: - nodered: - network_mode: ${NODERED_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/nodered/nodered.ports.yml b/compose/.apps/nodered/nodered.ports.yml index 570f0c1d2a..218cf3c5c5 100644 --- a/compose/.apps/nodered/nodered.ports.yml +++ b/compose/.apps/nodered/nodered.ports.yml @@ -1,4 +1,4 @@ services: - nodered: + ${_appname_}: ports: - - ${NODERED_PORT_1880}:1880 + - ${${_APPNAME_}_PORT_1880}:1880 diff --git a/compose/.apps/nodered/nodered.x86_64.yml b/compose/.apps/nodered/nodered.x86_64.yml index 80bd31ae73..42531af7d0 100644 --- a/compose/.apps/nodered/nodered.x86_64.yml +++ b/compose/.apps/nodered/nodered.x86_64.yml @@ -1,3 +1,3 @@ services: - nodered: - image: nodered/node-red:${NODERED_TAG} + ${_appname_}: + image: nodered/node-red:${${_APPNAME_}_TAG} diff --git a/compose/.apps/nodered/nodered.yml b/compose/.apps/nodered/nodered.yml index e1c247da76..cfb557d420 100644 --- a/compose/.apps/nodered/nodered.yml +++ b/compose/.apps/nodered/nodered.yml @@ -1,10 +1,10 @@ services: - nodered: - container_name: ${NODERED_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${NODERED_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/nodered:/data + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/nzbget/nzbget.aarch64.yml b/compose/.apps/nzbget/nzbget.aarch64.yml index 12b0b65976..552a516b37 100644 --- a/compose/.apps/nzbget/nzbget.aarch64.yml +++ b/compose/.apps/nzbget/nzbget.aarch64.yml @@ -1,3 +1,3 @@ services: - nzbget: - image: lscr.io/linuxserver/nzbget:${NZBGET_TAG} + ${_appname_}: + image: lscr.io/linuxserver/nzbget:${${_APPNAME_}_TAG} diff --git a/compose/.apps/nzbget/nzbget.hostname.yml b/compose/.apps/nzbget/nzbget.hostname.yml index 140fc483a8..4dc53c3782 100644 --- a/compose/.apps/nzbget/nzbget.hostname.yml +++ b/compose/.apps/nzbget/nzbget.hostname.yml @@ -1,3 +1,3 @@ services: - nzbget: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/nzbget/nzbget.labels.yml b/compose/.apps/nzbget/nzbget.labels.yml index a4ef7023cc..16b6fa8e7d 100644 --- a/compose/.apps/nzbget/nzbget.labels.yml +++ b/compose/.apps/nzbget/nzbget.labels.yml @@ -1,12 +1,12 @@ services: - nzbget: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Efficient usenet downloader" com.dockstarter.appinfo.nicename: "NZBGet" - com.dockstarter.appvars.nzbget_container_name: "nzbget" - com.dockstarter.appvars.nzbget_enabled: "false" - com.dockstarter.appvars.nzbget_network_mode: "" - com.dockstarter.appvars.nzbget_port_6789: "6789" - com.dockstarter.appvars.nzbget_restart: "unless-stopped" - com.dockstarter.appvars.nzbget_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_6789: "6789" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/nzbget/nzbget.netmode.yml b/compose/.apps/nzbget/nzbget.netmode.yml index bfb349b3fe..f36884ffb9 100644 --- a/compose/.apps/nzbget/nzbget.netmode.yml +++ b/compose/.apps/nzbget/nzbget.netmode.yml @@ -1,3 +1,3 @@ services: - nzbget: - network_mode: ${NZBGET_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/nzbget/nzbget.ports.yml b/compose/.apps/nzbget/nzbget.ports.yml index 9513fc7a57..f13a978b28 100644 --- a/compose/.apps/nzbget/nzbget.ports.yml +++ b/compose/.apps/nzbget/nzbget.ports.yml @@ -1,4 +1,4 @@ services: - nzbget: + ${_appname_}: ports: - - ${NZBGET_PORT_6789}:6789 + - ${${_APPNAME_}_PORT_6789}:6789 diff --git a/compose/.apps/nzbget/nzbget.x86_64.yml b/compose/.apps/nzbget/nzbget.x86_64.yml index 12b0b65976..552a516b37 100644 --- a/compose/.apps/nzbget/nzbget.x86_64.yml +++ b/compose/.apps/nzbget/nzbget.x86_64.yml @@ -1,3 +1,3 @@ services: - nzbget: - image: lscr.io/linuxserver/nzbget:${NZBGET_TAG} + ${_appname_}: + image: lscr.io/linuxserver/nzbget:${${_APPNAME_}_TAG} diff --git a/compose/.apps/nzbget/nzbget.yml b/compose/.apps/nzbget/nzbget.yml index 9b9ce1cec9..ace6d5d0ab 100644 --- a/compose/.apps/nzbget/nzbget.yml +++ b/compose/.apps/nzbget/nzbget.yml @@ -1,12 +1,12 @@ services: - nzbget: - container_name: ${NZBGET_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${NZBGET_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/nzbget:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/nzbgetvpn/nzbgetvpn.hostname.yml b/compose/.apps/nzbgetvpn/nzbgetvpn.hostname.yml index dca005bfb3..4dc53c3782 100644 --- a/compose/.apps/nzbgetvpn/nzbgetvpn.hostname.yml +++ b/compose/.apps/nzbgetvpn/nzbgetvpn.hostname.yml @@ -1,3 +1,3 @@ services: - nzbgetvpn: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/nzbgetvpn/nzbgetvpn.labels.yml b/compose/.apps/nzbgetvpn/nzbgetvpn.labels.yml index 4addd0b0ab..5e539cedbd 100644 --- a/compose/.apps/nzbgetvpn/nzbgetvpn.labels.yml +++ b/compose/.apps/nzbgetvpn/nzbgetvpn.labels.yml @@ -1,24 +1,24 @@ services: - nzbgetvpn: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "NZBGet with PrivoxyVPN" com.dockstarter.appinfo.nicename: "NZBGetVPN" - com.dockstarter.appvars.nzbgetvpn_container_name: "nzbgetvpn" - com.dockstarter.appvars.nzbgetvpn_enabled: "false" - com.dockstarter.appvars.nzbgetvpn_environment_enable_privoxy: "no" - com.dockstarter.appvars.nzbgetvpn_environment_lan_network: "192.168.x.x/24" - com.dockstarter.appvars.nzbgetvpn_environment_name_servers: "1.1.1.1,8.8.8.8" - com.dockstarter.appvars.nzbgetvpn_environment_vpn_client: "openvpn" - com.dockstarter.appvars.nzbgetvpn_environment_vpn_enable: "no" - com.dockstarter.appvars.nzbgetvpn_environment_vpn_input_ports: "" - com.dockstarter.appvars.nzbgetvpn_environment_vpn_options: "" - com.dockstarter.appvars.nzbgetvpn_environment_vpn_output_ports: "" - com.dockstarter.appvars.nzbgetvpn_environment_vpn_pass: "your-vpn-pass" - com.dockstarter.appvars.nzbgetvpn_environment_vpn_prov: "custom" - com.dockstarter.appvars.nzbgetvpn_environment_vpn_user: "your-vpn-user" - com.dockstarter.appvars.nzbgetvpn_network_mode: "" - com.dockstarter.appvars.nzbgetvpn_port_6789: "6789" - com.dockstarter.appvars.nzbgetvpn_port_8118: "8118" - com.dockstarter.appvars.nzbgetvpn_restart: "unless-stopped" - com.dockstarter.appvars.nzbgetvpn_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_enable_privoxy: "no" + com.dockstarter.appvars.${_appname_}_environment_lan_network: "192.168.x.x/24" + com.dockstarter.appvars.${_appname_}_environment_name_servers: "1.1.1.1,8.8.8.8" + com.dockstarter.appvars.${_appname_}_environment_vpn_client: "openvpn" + com.dockstarter.appvars.${_appname_}_environment_vpn_enable: "no" + com.dockstarter.appvars.${_appname_}_environment_vpn_input_ports: "" + com.dockstarter.appvars.${_appname_}_environment_vpn_options: "" + com.dockstarter.appvars.${_appname_}_environment_vpn_output_ports: "" + com.dockstarter.appvars.${_appname_}_environment_vpn_pass: "your-vpn-pass" + com.dockstarter.appvars.${_appname_}_environment_vpn_prov: "custom" + com.dockstarter.appvars.${_appname_}_environment_vpn_user: "your-vpn-user" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_6789: "6789" + com.dockstarter.appvars.${_appname_}_port_8118: "8118" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/nzbgetvpn/nzbgetvpn.netmode.yml b/compose/.apps/nzbgetvpn/nzbgetvpn.netmode.yml index 453578116c..f36884ffb9 100644 --- a/compose/.apps/nzbgetvpn/nzbgetvpn.netmode.yml +++ b/compose/.apps/nzbgetvpn/nzbgetvpn.netmode.yml @@ -1,3 +1,3 @@ services: - nzbgetvpn: - network_mode: ${NZBGETVPN_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/nzbgetvpn/nzbgetvpn.ports.yml b/compose/.apps/nzbgetvpn/nzbgetvpn.ports.yml index 0688fb38ab..ef9c872d12 100644 --- a/compose/.apps/nzbgetvpn/nzbgetvpn.ports.yml +++ b/compose/.apps/nzbgetvpn/nzbgetvpn.ports.yml @@ -1,5 +1,5 @@ services: - nzbgetvpn: + ${_appname_}: ports: - - ${NZBGETVPN_PORT_6789}:6789 - - ${NZBGETVPN_PORT_8118}:8118 + - ${${_APPNAME_}_PORT_6789}:6789 + - ${${_APPNAME_}_PORT_8118}:8118 diff --git a/compose/.apps/nzbgetvpn/nzbgetvpn.x86_64.yml b/compose/.apps/nzbgetvpn/nzbgetvpn.x86_64.yml index 8fbcc186f4..3ad00bfdae 100644 --- a/compose/.apps/nzbgetvpn/nzbgetvpn.x86_64.yml +++ b/compose/.apps/nzbgetvpn/nzbgetvpn.x86_64.yml @@ -1,3 +1,3 @@ services: - nzbgetvpn: - image: jshridha/docker-nzbgetvpn:${NZBGETVPN_TAG} + ${_appname_}: + image: jshridha/docker-nzbgetvpn:${${_APPNAME_}_TAG} diff --git a/compose/.apps/nzbgetvpn/nzbgetvpn.yml b/compose/.apps/nzbgetvpn/nzbgetvpn.yml index 450028d2f4..7cc77e89ea 100644 --- a/compose/.apps/nzbgetvpn/nzbgetvpn.yml +++ b/compose/.apps/nzbgetvpn/nzbgetvpn.yml @@ -1,29 +1,29 @@ services: - nzbgetvpn: + ${_appname_}: cap_add: - NET_ADMIN - SYS_MODULE - container_name: ${NZBGETVPN_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - ENABLE_PRIVOXY=${NZBGETVPN_ENVIRONMENT_ENABLE_PRIVOXY} - - LAN_NETWORK=${NZBGETVPN_ENVIRONMENT_LAN_NETWORK} - - NAME_SERVERS=${NZBGETVPN_ENVIRONMENT_NAME_SERVERS} + - ENABLE_PRIVOXY=${${_APPNAME_}_ENVIRONMENT_ENABLE_PRIVOXY} + - LAN_NETWORK=${${_APPNAME_}_ENVIRONMENT_LAN_NETWORK} + - NAME_SERVERS=${${_APPNAME_}_ENVIRONMENT_NAME_SERVERS} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - VPN_CLIENT=${NZBGETVPN_ENVIRONMENT_VPN_CLIENT} - - VPN_ENABLED=${NZBGETVPN_ENVIRONMENT_VPN_ENABLE} - - VPN_INPUT_PORTS=${NZBGETVPN_ENVIRONMENT_VPN_INPUT_PORTS} - - VPN_OPTIONS=${NZBGETVPN_ENVIRONMENT_VPN_OPTIONS} - - VPN_OUTPUT_PORTS=${NZBGETVPN_ENVIRONMENT_VPN_OUTPUT_PORTS} - - VPN_PASS=${NZBGETVPN_ENVIRONMENT_VPN_PASS} - - VPN_PROV=${NZBGETVPN_ENVIRONMENT_VPN_PROV} - - VPN_USER=${NZBGETVPN_ENVIRONMENT_VPN_USER} + - VPN_CLIENT=${${_APPNAME_}_ENVIRONMENT_VPN_CLIENT} + - VPN_ENABLED=${${_APPNAME_}_ENVIRONMENT_VPN_ENABLE} + - VPN_INPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_VPN_INPUT_PORTS} + - VPN_OPTIONS=${${_APPNAME_}_ENVIRONMENT_VPN_OPTIONS} + - VPN_OUTPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_VPN_OUTPUT_PORTS} + - VPN_PASS=${${_APPNAME_}_ENVIRONMENT_VPN_PASS} + - VPN_PROV=${${_APPNAME_}_ENVIRONMENT_VPN_PROV} + - VPN_USER=${${_APPNAME_}_ENVIRONMENT_VPN_USER} privileged: true - restart: ${NZBGETVPN_RESTART} + restart: ${${_APPNAME_}_RESTART} sysctls: - net.ipv4.conf.all.src_valid_mark=1 volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/nzbgetvpn:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/nzbhydra2/nzbhydra2.aarch64.yml b/compose/.apps/nzbhydra2/nzbhydra2.aarch64.yml index 244effa9f3..7c85728a7d 100644 --- a/compose/.apps/nzbhydra2/nzbhydra2.aarch64.yml +++ b/compose/.apps/nzbhydra2/nzbhydra2.aarch64.yml @@ -1,3 +1,3 @@ services: nzbhydra2: - image: lscr.io/linuxserver/nzbhydra2:${NZBHYDRA2_TAG} + image: lscr.io/linuxserver/nzbhydra2:${${_APPNAME_}_TAG} diff --git a/compose/.apps/nzbhydra2/nzbhydra2.labels.yml b/compose/.apps/nzbhydra2/nzbhydra2.labels.yml index 67610b43eb..bf8934323a 100644 --- a/compose/.apps/nzbhydra2/nzbhydra2.labels.yml +++ b/compose/.apps/nzbhydra2/nzbhydra2.labels.yml @@ -4,9 +4,9 @@ services: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Meta search for NZB indexers" com.dockstarter.appinfo.nicename: "NZBHydra2" - com.dockstarter.appvars.nzbhydra2_container_name: "nzbhydra2" - com.dockstarter.appvars.nzbhydra2_enabled: "false" - com.dockstarter.appvars.nzbhydra2_network_mode: "" - com.dockstarter.appvars.nzbhydra2_port_5076: "5076" - com.dockstarter.appvars.nzbhydra2_restart: "unless-stopped" - com.dockstarter.appvars.nzbhydra2_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_5076: "5076" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/nzbhydra2/nzbhydra2.netmode.yml b/compose/.apps/nzbhydra2/nzbhydra2.netmode.yml index ba43edecd3..d000179deb 100644 --- a/compose/.apps/nzbhydra2/nzbhydra2.netmode.yml +++ b/compose/.apps/nzbhydra2/nzbhydra2.netmode.yml @@ -1,3 +1,3 @@ services: nzbhydra2: - network_mode: ${NZBHYDRA2_NETWORK_MODE} + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/nzbhydra2/nzbhydra2.ports.yml b/compose/.apps/nzbhydra2/nzbhydra2.ports.yml index f91bde94ca..38ca6aba54 100644 --- a/compose/.apps/nzbhydra2/nzbhydra2.ports.yml +++ b/compose/.apps/nzbhydra2/nzbhydra2.ports.yml @@ -1,4 +1,4 @@ services: nzbhydra2: ports: - - ${NZBHYDRA2_PORT_5076}:5076 + - ${${_APPNAME_}_PORT_5076}:5076 diff --git a/compose/.apps/nzbhydra2/nzbhydra2.x86_64.yml b/compose/.apps/nzbhydra2/nzbhydra2.x86_64.yml index 244effa9f3..7c85728a7d 100644 --- a/compose/.apps/nzbhydra2/nzbhydra2.x86_64.yml +++ b/compose/.apps/nzbhydra2/nzbhydra2.x86_64.yml @@ -1,3 +1,3 @@ services: nzbhydra2: - image: lscr.io/linuxserver/nzbhydra2:${NZBHYDRA2_TAG} + image: lscr.io/linuxserver/nzbhydra2:${${_APPNAME_}_TAG} diff --git a/compose/.apps/nzbhydra2/nzbhydra2.yml b/compose/.apps/nzbhydra2/nzbhydra2.yml index 448a578245..4cb0f318a0 100644 --- a/compose/.apps/nzbhydra2/nzbhydra2.yml +++ b/compose/.apps/nzbhydra2/nzbhydra2.yml @@ -1,12 +1,12 @@ services: nzbhydra2: - container_name: ${NZBHYDRA2_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${NZBHYDRA2_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/nzbhydra2:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/omadacontroller/omadacontroller.aarch64.yml b/compose/.apps/omadacontroller/omadacontroller.aarch64.yml index 2eddb46232..dbc2fd6329 100644 --- a/compose/.apps/omadacontroller/omadacontroller.aarch64.yml +++ b/compose/.apps/omadacontroller/omadacontroller.aarch64.yml @@ -1,3 +1,3 @@ services: - omadacontroller: - image: mbentley/omada-controller:${OMADACONTROLLER_TAG} + ${_appname_}: + image: mbentley/omada-controller:${${_APPNAME_}_TAG} diff --git a/compose/.apps/omadacontroller/omadacontroller.hostname.yml b/compose/.apps/omadacontroller/omadacontroller.hostname.yml index 143aee7713..4dc53c3782 100644 --- a/compose/.apps/omadacontroller/omadacontroller.hostname.yml +++ b/compose/.apps/omadacontroller/omadacontroller.hostname.yml @@ -1,3 +1,3 @@ services: - omadacontroller: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/omadacontroller/omadacontroller.labels.yml b/compose/.apps/omadacontroller/omadacontroller.labels.yml index 15f81733b5..14dd3c8f16 100644 --- a/compose/.apps/omadacontroller/omadacontroller.labels.yml +++ b/compose/.apps/omadacontroller/omadacontroller.labels.yml @@ -1,22 +1,22 @@ services: - omadacontroller: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Docker image based off of Ubuntu:18.04 for TP-Link Omada Controller to control TP-Link Omada EAP Series Wireless Access Points" com.dockstarter.appinfo.nicename: "OmadaController" - com.dockstarter.appvars.omadacontroller_container_name: "omadacontroller" - com.dockstarter.appvars.omadacontroller_enabled: "false" - com.dockstarter.appvars.omadacontroller_environment_show_mongodb_logs: "false" - com.dockstarter.appvars.omadacontroller_environment_show_server_logs: "true" - com.dockstarter.appvars.omadacontroller_environment_small_files: "false" - com.dockstarter.appvars.omadacontroller_network_mode: "" - com.dockstarter.appvars.omadacontroller_port_27001: "27001" - com.dockstarter.appvars.omadacontroller_port_29810: "29810" - com.dockstarter.appvars.omadacontroller_port_29811: "29811" - com.dockstarter.appvars.omadacontroller_port_29812: "29812" - com.dockstarter.appvars.omadacontroller_port_29813: "29813" - com.dockstarter.appvars.omadacontroller_port_29814: "29814" - com.dockstarter.appvars.omadacontroller_port_8043: "8043" - com.dockstarter.appvars.omadacontroller_port_8088: "8088" - com.dockstarter.appvars.omadacontroller_restart: "unless-stopped" - com.dockstarter.appvars.omadacontroller_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_show_mongodb_logs: "false" + com.dockstarter.appvars.${_appname_}_environment_show_server_logs: "true" + com.dockstarter.appvars.${_appname_}_environment_small_files: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_27001: "27001" + com.dockstarter.appvars.${_appname_}_port_29810: "29810" + com.dockstarter.appvars.${_appname_}_port_29811: "29811" + com.dockstarter.appvars.${_appname_}_port_29812: "29812" + com.dockstarter.appvars.${_appname_}_port_29813: "29813" + com.dockstarter.appvars.${_appname_}_port_29814: "29814" + com.dockstarter.appvars.${_appname_}_port_8043: "8043" + com.dockstarter.appvars.${_appname_}_port_8088: "8088" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/omadacontroller/omadacontroller.netmode.yml b/compose/.apps/omadacontroller/omadacontroller.netmode.yml index 40417a8bcf..f36884ffb9 100644 --- a/compose/.apps/omadacontroller/omadacontroller.netmode.yml +++ b/compose/.apps/omadacontroller/omadacontroller.netmode.yml @@ -1,3 +1,3 @@ services: - omadacontroller: - network_mode: ${OMADACONTROLLER_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/omadacontroller/omadacontroller.ports.yml b/compose/.apps/omadacontroller/omadacontroller.ports.yml index 5a9dcd68e5..9b187f49cd 100644 --- a/compose/.apps/omadacontroller/omadacontroller.ports.yml +++ b/compose/.apps/omadacontroller/omadacontroller.ports.yml @@ -1,11 +1,11 @@ services: - omadacontroller: + ${_appname_}: ports: - - ${OMADACONTROLLER_PORT_8043}:8043 - - ${OMADACONTROLLER_PORT_8088}:8088 - - ${OMADACONTROLLER_PORT_27001}:27001/udp - - ${OMADACONTROLLER_PORT_29810}:29810/udp - - ${OMADACONTROLLER_PORT_29811}:29811 - - ${OMADACONTROLLER_PORT_29812}:29812 - - ${OMADACONTROLLER_PORT_29813}:29813 - - ${OMADACONTROLLER_PORT_29814}:29814 + - ${${_APPNAME_}_PORT_8043}:8043 + - ${${_APPNAME_}_PORT_8088}:8088 + - ${${_APPNAME_}_PORT_27001}:27001/udp + - ${${_APPNAME_}_PORT_29810}:29810/udp + - ${${_APPNAME_}_PORT_29811}:29811 + - ${${_APPNAME_}_PORT_29812}:29812 + - ${${_APPNAME_}_PORT_29813}:29813 + - ${${_APPNAME_}_PORT_29814}:29814 diff --git a/compose/.apps/omadacontroller/omadacontroller.x86_64.yml b/compose/.apps/omadacontroller/omadacontroller.x86_64.yml index 2eddb46232..dbc2fd6329 100644 --- a/compose/.apps/omadacontroller/omadacontroller.x86_64.yml +++ b/compose/.apps/omadacontroller/omadacontroller.x86_64.yml @@ -1,3 +1,3 @@ services: - omadacontroller: - image: mbentley/omada-controller:${OMADACONTROLLER_TAG} + ${_appname_}: + image: mbentley/omada-controller:${${_APPNAME_}_TAG} diff --git a/compose/.apps/omadacontroller/omadacontroller.yml b/compose/.apps/omadacontroller/omadacontroller.yml index b512b2ffbd..5f039aa87c 100644 --- a/compose/.apps/omadacontroller/omadacontroller.yml +++ b/compose/.apps/omadacontroller/omadacontroller.yml @@ -1,25 +1,25 @@ services: - omadacontroller: - container_name: ${OMADACONTROLLER_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - MANAGE_HTTP_PORT=${OMADACONTROLLER_PORT_8088} - - MANAGE_HTTPS_PORT=${OMADACONTROLLER_PORT_8043} + - MANAGE_HTTP_PORT=${${_APPNAME_}_PORT_8088} + - MANAGE_HTTPS_PORT=${${_APPNAME_}_PORT_8043} - PGID=${PGID} - - PORT_ADOPT_V1=${OMADACONTROLLER_PORT_29812} - - PORT_APP_DISCOVERY=${OMADACONTROLLER_PORT_27001} - - PORT_DISCOVERY=${OMADACONTROLLER_PORT_29810} - - PORT_MANAGER_V1=${OMADACONTROLLER_PORT_29811} - - PORT_MANAGER_V2=${OMADACONTROLLER_PORT_29814} - - PORT_UPGRADE_V1=${OMADACONTROLLER_PORT_29813} + - PORT_ADOPT_V1=${${_APPNAME_}_PORT_29812} + - PORT_APP_DISCOVERY=${${_APPNAME_}_PORT_27001} + - PORT_DISCOVERY=${${_APPNAME_}_PORT_29810} + - PORT_MANAGER_V1=${${_APPNAME_}_PORT_29811} + - PORT_MANAGER_V2=${${_APPNAME_}_PORT_29814} + - PORT_UPGRADE_V1=${${_APPNAME_}_PORT_29813} - PUID=${PUID} - - SHOW_MONGODB_LOGS=${OMADACONTROLLER_ENVIRONMENT_SHOW_MONGODB_LOGS} - - SHOW_SERVER_LOGS=${OMADACONTROLLER_ENVIRONMENT_SHOW_SERVER_LOGS} - - SMALL_FILES=${OMADACONTROLLER_ENVIRONMENT_SMALL_FILES} + - SHOW_MONGODB_LOGS=${${_APPNAME_}_ENVIRONMENT_SHOW_MONGODB_LOGS} + - SHOW_SERVER_LOGS=${${_APPNAME_}_ENVIRONMENT_SHOW_SERVER_LOGS} + - SMALL_FILES=${${_APPNAME_}_ENVIRONMENT_SMALL_FILES} - TZ=${TZ} - restart: ${OMADACONTROLLER_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/omadacontroller:/opt/tplink/EAPController/data - - ${DOCKER_VOLUME_CONFIG}/omadacontroller/logs:/opt/tplink/EAPController/logs - - ${DOCKER_VOLUME_CONFIG}/omadacontroller/work:/opt/tplink/EAPController/work + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/opt/tplink/EAPController/data + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/logs:/opt/tplink/EAPController/logs + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/work:/opt/tplink/EAPController/work - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/ombi/ombi.aarch64.yml b/compose/.apps/ombi/ombi.aarch64.yml index 8d1ece8bc2..737ae80b46 100644 --- a/compose/.apps/ombi/ombi.aarch64.yml +++ b/compose/.apps/ombi/ombi.aarch64.yml @@ -1,3 +1,3 @@ services: - ombi: - image: lscr.io/linuxserver/ombi:${OMBI_TAG} + ${_appname_}: + image: lscr.io/linuxserver/ombi:${${_APPNAME_}_TAG} diff --git a/compose/.apps/ombi/ombi.hostname.yml b/compose/.apps/ombi/ombi.hostname.yml index e4dcc7a287..4dc53c3782 100644 --- a/compose/.apps/ombi/ombi.hostname.yml +++ b/compose/.apps/ombi/ombi.hostname.yml @@ -1,3 +1,3 @@ services: - ombi: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/ombi/ombi.labels.yml b/compose/.apps/ombi/ombi.labels.yml index c0ad183265..9d0248ace5 100644 --- a/compose/.apps/ombi/ombi.labels.yml +++ b/compose/.apps/ombi/ombi.labels.yml @@ -1,12 +1,12 @@ services: - ombi: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Allow your users to Request Movies, TV Shows and Albums" com.dockstarter.appinfo.nicename: "Ombi" - com.dockstarter.appvars.ombi_container_name: "ombi" - com.dockstarter.appvars.ombi_enabled: "false" - com.dockstarter.appvars.ombi_network_mode: "" - com.dockstarter.appvars.ombi_port_3579: "3579" - com.dockstarter.appvars.ombi_restart: "unless-stopped" - com.dockstarter.appvars.ombi_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_3579: "3579" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/ombi/ombi.netmode.yml b/compose/.apps/ombi/ombi.netmode.yml index 9789e8e65f..f36884ffb9 100644 --- a/compose/.apps/ombi/ombi.netmode.yml +++ b/compose/.apps/ombi/ombi.netmode.yml @@ -1,3 +1,3 @@ services: - ombi: - network_mode: ${OMBI_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/ombi/ombi.ports.yml b/compose/.apps/ombi/ombi.ports.yml index 8945b3260b..38fd242fd2 100644 --- a/compose/.apps/ombi/ombi.ports.yml +++ b/compose/.apps/ombi/ombi.ports.yml @@ -1,4 +1,4 @@ services: - ombi: + ${_appname_}: ports: - - ${OMBI_PORT_3579}:3579 + - ${${_APPNAME_}_PORT_3579}:3579 diff --git a/compose/.apps/ombi/ombi.x86_64.yml b/compose/.apps/ombi/ombi.x86_64.yml index 8d1ece8bc2..737ae80b46 100644 --- a/compose/.apps/ombi/ombi.x86_64.yml +++ b/compose/.apps/ombi/ombi.x86_64.yml @@ -1,3 +1,3 @@ services: - ombi: - image: lscr.io/linuxserver/ombi:${OMBI_TAG} + ${_appname_}: + image: lscr.io/linuxserver/ombi:${${_APPNAME_}_TAG} diff --git a/compose/.apps/ombi/ombi.yml b/compose/.apps/ombi/ombi.yml index ef565c1bd2..ace6d5d0ab 100644 --- a/compose/.apps/ombi/ombi.yml +++ b/compose/.apps/ombi/ombi.yml @@ -1,12 +1,12 @@ services: - ombi: - container_name: ${OMBI_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${OMBI_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/ombi:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/openldap/openldap.aarch64.yml b/compose/.apps/openldap/openldap.aarch64.yml index 31371b1105..e643004044 100644 --- a/compose/.apps/openldap/openldap.aarch64.yml +++ b/compose/.apps/openldap/openldap.aarch64.yml @@ -1,3 +1,3 @@ services: - openldap: - image: osixia/openldap:${OPENLDAP_TAG} + ${_appname_}: + image: osixia/openldap:${${_APPNAME_}_TAG} diff --git a/compose/.apps/openldap/openldap.hostname.yml b/compose/.apps/openldap/openldap.hostname.yml index 3023693e1c..4dc53c3782 100644 --- a/compose/.apps/openldap/openldap.hostname.yml +++ b/compose/.apps/openldap/openldap.hostname.yml @@ -1,3 +1,3 @@ services: - openldap: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/openldap/openldap.labels.yml b/compose/.apps/openldap/openldap.labels.yml index 386ee6bac3..66fcf8c637 100644 --- a/compose/.apps/openldap/openldap.labels.yml +++ b/compose/.apps/openldap/openldap.labels.yml @@ -1,21 +1,21 @@ services: - openldap: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "OpenLDAP with TLS, multi master replication and easy bootstrap." com.dockstarter.appinfo.nicename: "OpenLDAP" - com.dockstarter.appvars.openldap_container_name: "openldap" - com.dockstarter.appvars.openldap_enabled: "false" - com.dockstarter.appvars.openldap_environment_admin_password: "admin" - com.dockstarter.appvars.openldap_environment_backend: "mdb" - com.dockstarter.appvars.openldap_environment_config_password: "config" - com.dockstarter.appvars.openldap_environment_domain: "example.org" - com.dockstarter.appvars.openldap_environment_organisation: "example inc." - com.dockstarter.appvars.openldap_environment_readonly_user: "false" - com.dockstarter.appvars.openldap_environment_readonly_user_password: "readonly" - com.dockstarter.appvars.openldap_environment_readonly_user_username: "readonly" - com.dockstarter.appvars.openldap_network_mode: "" - com.dockstarter.appvars.openldap_port_389: "389" - com.dockstarter.appvars.openldap_port_636: "636" - com.dockstarter.appvars.openldap_restart: "unless-stopped" - com.dockstarter.appvars.openldap_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_admin_password: "admin" + com.dockstarter.appvars.${_appname_}_environment_backend: "mdb" + com.dockstarter.appvars.${_appname_}_environment_config_password: "config" + com.dockstarter.appvars.${_appname_}_environment_domain: "example.org" + com.dockstarter.appvars.${_appname_}_environment_organisation: "example inc." + com.dockstarter.appvars.${_appname_}_environment_readonly_user: "false" + com.dockstarter.appvars.${_appname_}_environment_readonly_user_password: "readonly" + com.dockstarter.appvars.${_appname_}_environment_readonly_user_username: "readonly" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_389: "389" + com.dockstarter.appvars.${_appname_}_port_636: "636" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/openldap/openldap.netmode.yml b/compose/.apps/openldap/openldap.netmode.yml index 80df61a495..f36884ffb9 100644 --- a/compose/.apps/openldap/openldap.netmode.yml +++ b/compose/.apps/openldap/openldap.netmode.yml @@ -1,3 +1,3 @@ services: - openldap: - network_mode: ${OPENLDAP_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/openldap/openldap.ports.yml b/compose/.apps/openldap/openldap.ports.yml index 034198b11b..92bad13df5 100644 --- a/compose/.apps/openldap/openldap.ports.yml +++ b/compose/.apps/openldap/openldap.ports.yml @@ -1,5 +1,5 @@ services: - openldap: + ${_appname_}: ports: - - ${OPENLDAP_PORT_389}:389 - - ${OPENLDAP_PORT_636}:636 + - ${${_APPNAME_}_PORT_389}:389 + - ${${_APPNAME_}_PORT_636}:636 diff --git a/compose/.apps/openldap/openldap.x86_64.yml b/compose/.apps/openldap/openldap.x86_64.yml index 31371b1105..e643004044 100644 --- a/compose/.apps/openldap/openldap.x86_64.yml +++ b/compose/.apps/openldap/openldap.x86_64.yml @@ -1,3 +1,3 @@ services: - openldap: - image: osixia/openldap:${OPENLDAP_TAG} + ${_appname_}: + image: osixia/openldap:${${_APPNAME_}_TAG} diff --git a/compose/.apps/openldap/openldap.yml b/compose/.apps/openldap/openldap.yml index 6865b5b902..aad06214d4 100644 --- a/compose/.apps/openldap/openldap.yml +++ b/compose/.apps/openldap/openldap.yml @@ -1,21 +1,21 @@ services: - openldap: - container_name: ${OPENLDAP_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - LDAP_ADMIN_PASSWORD=${OPENLDAP_ENVIRONMENT_ADMIN_PASSWORD} - - LDAP_BACKEND=${OPENLDAP_ENVIRONMENT_BACKEND} - - LDAP_CONFIG_PASSWORD=${OPENLDAP_ENVIRONMENT_CONFIG_PASSWORD} - - LDAP_DOMAIN=${OPENLDAP_ENVIRONMENT_DOMAIN} + - LDAP_ADMIN_PASSWORD=${${_APPNAME_}_ENVIRONMENT_ADMIN_PASSWORD} + - LDAP_BACKEND=${${_APPNAME_}_ENVIRONMENT_BACKEND} + - LDAP_CONFIG_PASSWORD=${${_APPNAME_}_ENVIRONMENT_CONFIG_PASSWORD} + - LDAP_DOMAIN=${${_APPNAME_}_ENVIRONMENT_DOMAIN} - LDAP_OPENLDAP_GID=${PGID} - LDAP_OPENLDAP_UID=${PUID} - - LDAP_ORGANISATION=${OPENLDAP_ENVIRONMENT_ORGANISATION} - - LDAP_READONLY_USER_PASSWORD=${OPENLDAP_ENVIRONMENT_READONLY_USER_PASSWORD} - - LDAP_READONLY_USER_USERNAME=${OPENLDAP_ENVIRONMENT_READONLY_USER_USERNAME} - - LDAP_READONLY_USER=${OPENLDAP_ENVIRONMENT_READONLY_USER} + - LDAP_ORGANISATION=${${_APPNAME_}_ENVIRONMENT_ORGANISATION} + - LDAP_READONLY_USER_PASSWORD=${${_APPNAME_}_ENVIRONMENT_READONLY_USER_PASSWORD} + - LDAP_READONLY_USER_USERNAME=${${_APPNAME_}_ENVIRONMENT_READONLY_USER_USERNAME} + - LDAP_READONLY_USER=${${_APPNAME_}_ENVIRONMENT_READONLY_USER} - TZ=${TZ} - restart: ${OPENLDAP_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/openldap/database:/var/lib/ldap - - ${DOCKER_VOLUME_CONFIG}/openldap/config:/etc/ldap/ + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/database:/var/lib/ldap + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/config:/etc/ldap/ - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/openspeedtest/openspeedtest.aarch64.yml b/compose/.apps/openspeedtest/openspeedtest.aarch64.yml index f7d84c8b93..a36b05856c 100644 --- a/compose/.apps/openspeedtest/openspeedtest.aarch64.yml +++ b/compose/.apps/openspeedtest/openspeedtest.aarch64.yml @@ -1,3 +1,3 @@ services: - openspeedtest: - image: openspeedtest/latest:${OPENSPEEDTEST_TAG} + ${_appname_}: + image: openspeedtest/latest:${${_APPNAME_}_TAG} diff --git a/compose/.apps/openspeedtest/openspeedtest.hostname.yml b/compose/.apps/openspeedtest/openspeedtest.hostname.yml index 971d0ba09e..4dc53c3782 100644 --- a/compose/.apps/openspeedtest/openspeedtest.hostname.yml +++ b/compose/.apps/openspeedtest/openspeedtest.hostname.yml @@ -1,3 +1,3 @@ services: - openspeedtest: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/openspeedtest/openspeedtest.labels.yml b/compose/.apps/openspeedtest/openspeedtest.labels.yml index d930d1b3ce..4b9a81affb 100644 --- a/compose/.apps/openspeedtest/openspeedtest.labels.yml +++ b/compose/.apps/openspeedtest/openspeedtest.labels.yml @@ -1,14 +1,14 @@ services: - openspeedtest: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "This is a self-hosted speedtest service" com.dockstarter.appinfo.nicename: "OpenSpeedTest" - com.dockstarter.appvars.openspeedtest_container_name: "openspeedtest" - com.dockstarter.appvars.openspeedtest_enabled: "false" - com.dockstarter.appvars.openspeedtest_environment_base_path: "/" - com.dockstarter.appvars.openspeedtest_network_mode: "" - com.dockstarter.appvars.openspeedtest_port_3000: "3000" - com.dockstarter.appvars.openspeedtest_port_3001: "3001" - com.dockstarter.appvars.openspeedtest_restart: "unless-stopped" - com.dockstarter.appvars.openspeedtest_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_base_path: "/" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_3000: "3000" + com.dockstarter.appvars.${_appname_}_port_3001: "3001" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/openspeedtest/openspeedtest.netmode.yml b/compose/.apps/openspeedtest/openspeedtest.netmode.yml index e2c3e906d1..f36884ffb9 100644 --- a/compose/.apps/openspeedtest/openspeedtest.netmode.yml +++ b/compose/.apps/openspeedtest/openspeedtest.netmode.yml @@ -1,3 +1,3 @@ services: - openspeedtest: - network_mode: ${OPENSPEEDTEST_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/openspeedtest/openspeedtest.ports.yml b/compose/.apps/openspeedtest/openspeedtest.ports.yml index bb6a052eb6..05b2c2d6d3 100644 --- a/compose/.apps/openspeedtest/openspeedtest.ports.yml +++ b/compose/.apps/openspeedtest/openspeedtest.ports.yml @@ -1,5 +1,5 @@ services: - openspeedtest: + ${_appname_}: ports: - - ${OPENSPEEDTEST_PORT_3000}:3000 - - ${OPENSPEEDTEST_PORT_3001}:3001 + - ${${_APPNAME_}_PORT_3000}:3000 + - ${${_APPNAME_}_PORT_3001}:3001 diff --git a/compose/.apps/openspeedtest/openspeedtest.x86_64.yml b/compose/.apps/openspeedtest/openspeedtest.x86_64.yml index f7d84c8b93..a36b05856c 100644 --- a/compose/.apps/openspeedtest/openspeedtest.x86_64.yml +++ b/compose/.apps/openspeedtest/openspeedtest.x86_64.yml @@ -1,3 +1,3 @@ services: - openspeedtest: - image: openspeedtest/latest:${OPENSPEEDTEST_TAG} + ${_appname_}: + image: openspeedtest/latest:${${_APPNAME_}_TAG} diff --git a/compose/.apps/openspeedtest/openspeedtest.yml b/compose/.apps/openspeedtest/openspeedtest.yml index 000db14ded..b6fff875ee 100644 --- a/compose/.apps/openspeedtest/openspeedtest.yml +++ b/compose/.apps/openspeedtest/openspeedtest.yml @@ -1,13 +1,13 @@ services: - openspeedtest: - container_name: ${OPENSPEEDTEST_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - - BASE_PATH=${OPENSPEEDTEST_ENVIRONMENT_BASE_PATH} + - BASE_PATH=${${_APPNAME_}_ENVIRONMENT_BASE_PATH} - TZ=${TZ} - restart: ${OPENSPEEDTEST_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/openspeedtest:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/openvpnas/openvpnas.hostname.yml b/compose/.apps/openvpnas/openvpnas.hostname.yml index bbdd7cd5a8..4dc53c3782 100644 --- a/compose/.apps/openvpnas/openvpnas.hostname.yml +++ b/compose/.apps/openvpnas/openvpnas.hostname.yml @@ -1,3 +1,3 @@ services: - openvpnas: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/openvpnas/openvpnas.labels.yml b/compose/.apps/openvpnas/openvpnas.labels.yml index 9179de471e..119466321d 100644 --- a/compose/.apps/openvpnas/openvpnas.labels.yml +++ b/compose/.apps/openvpnas/openvpnas.labels.yml @@ -1,15 +1,15 @@ services: - openvpnas: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Secure network tunneling VPN" com.dockstarter.appinfo.nicename: "OpenVPNAS" - com.dockstarter.appvars.openvpnas_container_name: "openvpnas" - com.dockstarter.appvars.openvpnas_enabled: "false" - com.dockstarter.appvars.openvpnas_environment_interface: "eth0" - com.dockstarter.appvars.openvpnas_network_mode: "" - com.dockstarter.appvars.openvpnas_port_1194: "1194" - com.dockstarter.appvars.openvpnas_port_943: "943" - com.dockstarter.appvars.openvpnas_port_9443: "9443" - com.dockstarter.appvars.openvpnas_restart: "unless-stopped" - com.dockstarter.appvars.openvpnas_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_interface: "eth0" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_1194: "1194" + com.dockstarter.appvars.${_appname_}_port_943: "943" + com.dockstarter.appvars.${_appname_}_port_9443: "9443" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/openvpnas/openvpnas.netmode.yml b/compose/.apps/openvpnas/openvpnas.netmode.yml index f61f3e1222..f36884ffb9 100644 --- a/compose/.apps/openvpnas/openvpnas.netmode.yml +++ b/compose/.apps/openvpnas/openvpnas.netmode.yml @@ -1,3 +1,3 @@ services: - openvpnas: - network_mode: ${OPENVPNAS_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/openvpnas/openvpnas.ports.yml b/compose/.apps/openvpnas/openvpnas.ports.yml index 04e59e6419..4447ab29fb 100644 --- a/compose/.apps/openvpnas/openvpnas.ports.yml +++ b/compose/.apps/openvpnas/openvpnas.ports.yml @@ -1,6 +1,6 @@ services: - openvpnas: + ${_appname_}: ports: - - ${OPENVPNAS_PORT_1194}:1194/udp - - ${OPENVPNAS_PORT_943}:943 - - ${OPENVPNAS_PORT_9443}:9443 + - ${${_APPNAME_}_PORT_1194}:1194/udp + - ${${_APPNAME_}_PORT_943}:943 + - ${${_APPNAME_}_PORT_9443}:9443 diff --git a/compose/.apps/openvpnas/openvpnas.x86_64.yml b/compose/.apps/openvpnas/openvpnas.x86_64.yml index b8c0b365eb..2e81426a2c 100644 --- a/compose/.apps/openvpnas/openvpnas.x86_64.yml +++ b/compose/.apps/openvpnas/openvpnas.x86_64.yml @@ -1,3 +1,3 @@ services: - openvpnas: - image: lscr.io/linuxserver/openvpn-as:${OPENVPNAS_TAG} + ${_appname_}: + image: lscr.io/linuxserver/openvpn-as:${${_APPNAME_}_TAG} diff --git a/compose/.apps/openvpnas/openvpnas.yml b/compose/.apps/openvpnas/openvpnas.yml index 4965ef3304..7cb9b7036b 100644 --- a/compose/.apps/openvpnas/openvpnas.yml +++ b/compose/.apps/openvpnas/openvpnas.yml @@ -1,15 +1,15 @@ services: - openvpnas: + ${_appname_}: cap_add: - NET_ADMIN - container_name: ${OPENVPNAS_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - INTERFACE=${OPENVPNAS_ENVIRONMENT_INTERFACE} + - INTERFACE=${${_APPNAME_}_ENVIRONMENT_INTERFACE} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${OPENVPNAS_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/openvpnas:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/organizr/organizr.aarch64.yml b/compose/.apps/organizr/organizr.aarch64.yml index 7524cafced..5ff5cf7973 100644 --- a/compose/.apps/organizr/organizr.aarch64.yml +++ b/compose/.apps/organizr/organizr.aarch64.yml @@ -1,3 +1,3 @@ services: - organizr: - image: ghcr.io/organizr/organizr:${ORGANIZR_TAG} + ${_appname_}: + image: ghcr.io/organizr/organizr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/organizr/organizr.hostname.yml b/compose/.apps/organizr/organizr.hostname.yml index 884c751806..4dc53c3782 100644 --- a/compose/.apps/organizr/organizr.hostname.yml +++ b/compose/.apps/organizr/organizr.hostname.yml @@ -1,3 +1,3 @@ services: - organizr: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/organizr/organizr.labels.yml b/compose/.apps/organizr/organizr.labels.yml index 033d4a2df7..ee6e541fdd 100644 --- a/compose/.apps/organizr/organizr.labels.yml +++ b/compose/.apps/organizr/organizr.labels.yml @@ -1,14 +1,14 @@ services: - organizr: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "HTPC/Homelab Services Organizer" com.dockstarter.appinfo.nicename: "Organizr" - com.dockstarter.appvars.organizr_container_name: "organizr" - com.dockstarter.appvars.organizr_enabled: "false" - com.dockstarter.appvars.organizr_environment_branch: "v2-master" - com.dockstarter.appvars.organizr_environment_fpm: "false" - com.dockstarter.appvars.organizr_network_mode: "" - com.dockstarter.appvars.organizr_port_80: "8006" - com.dockstarter.appvars.organizr_restart: "unless-stopped" - com.dockstarter.appvars.organizr_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_branch: "v2-master" + com.dockstarter.appvars.${_appname_}_environment_fpm: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_80: "8006" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/organizr/organizr.netmode.yml b/compose/.apps/organizr/organizr.netmode.yml index 3655fdc65f..f36884ffb9 100644 --- a/compose/.apps/organizr/organizr.netmode.yml +++ b/compose/.apps/organizr/organizr.netmode.yml @@ -1,3 +1,3 @@ services: - organizr: - network_mode: ${ORGANIZR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/organizr/organizr.ports.yml b/compose/.apps/organizr/organizr.ports.yml index bd2264fed3..c37afbebb5 100644 --- a/compose/.apps/organizr/organizr.ports.yml +++ b/compose/.apps/organizr/organizr.ports.yml @@ -1,4 +1,4 @@ services: - organizr: + ${_appname_}: ports: - - ${ORGANIZR_PORT_80}:80 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/organizr/organizr.x86_64.yml b/compose/.apps/organizr/organizr.x86_64.yml index 7524cafced..5ff5cf7973 100644 --- a/compose/.apps/organizr/organizr.x86_64.yml +++ b/compose/.apps/organizr/organizr.x86_64.yml @@ -1,3 +1,3 @@ services: - organizr: - image: ghcr.io/organizr/organizr:${ORGANIZR_TAG} + ${_appname_}: + image: ghcr.io/organizr/organizr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/organizr/organizr.yml b/compose/.apps/organizr/organizr.yml index 0d34210766..bb62495d24 100644 --- a/compose/.apps/organizr/organizr.yml +++ b/compose/.apps/organizr/organizr.yml @@ -1,14 +1,14 @@ services: - organizr: - container_name: ${ORGANIZR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - branch=${ORGANIZR_ENVIRONMENT_BRANCH} - - fpm=${ORGANIZR_ENVIRONMENT_FPM} + - branch=${${_APPNAME_}_ENVIRONMENT_BRANCH} + - fpm=${${_APPNAME_}_ENVIRONMENT_FPM} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${ORGANIZR_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/organizr:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/ouroboros/ouroboros.aarch64.yml b/compose/.apps/ouroboros/ouroboros.aarch64.yml index c5e87a27fe..efffc6dbf3 100644 --- a/compose/.apps/ouroboros/ouroboros.aarch64.yml +++ b/compose/.apps/ouroboros/ouroboros.aarch64.yml @@ -1,3 +1,3 @@ services: - ouroboros: - image: pyouroboros/ouroboros:${OUROBOROS_TAG} + ${_appname_}: + image: pyouroboros/ouroboros:${${_APPNAME_}_TAG} diff --git a/compose/.apps/ouroboros/ouroboros.hostname.yml b/compose/.apps/ouroboros/ouroboros.hostname.yml index 2098c24e5e..4dc53c3782 100644 --- a/compose/.apps/ouroboros/ouroboros.hostname.yml +++ b/compose/.apps/ouroboros/ouroboros.hostname.yml @@ -1,3 +1,3 @@ services: - ouroboros: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/ouroboros/ouroboros.labels.yml b/compose/.apps/ouroboros/ouroboros.labels.yml index f9b7e5c490..32bee7e29d 100644 --- a/compose/.apps/ouroboros/ouroboros.labels.yml +++ b/compose/.apps/ouroboros/ouroboros.labels.yml @@ -1,21 +1,21 @@ services: - ouroboros: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) Use Watchtower" com.dockstarter.appinfo.nicename: "Ouroboros" - com.dockstarter.appvars.ouroboros_container_name: "ouroboros" - com.dockstarter.appvars.ouroboros_enabled: "false" - com.dockstarter.appvars.ouroboros_environment_cleanup: "true" - com.dockstarter.appvars.ouroboros_environment_cron: "0 4 * * *" - com.dockstarter.appvars.ouroboros_environment_ignore: "" - com.dockstarter.appvars.ouroboros_environment_log_level: "info" - com.dockstarter.appvars.ouroboros_environment_monitor: "" - com.dockstarter.appvars.ouroboros_environment_notifiers: "" - com.dockstarter.appvars.ouroboros_environment_repo_pass: "" - com.dockstarter.appvars.ouroboros_environment_repo_user: "" - com.dockstarter.appvars.ouroboros_environment_self_update: "true" - com.dockstarter.appvars.ouroboros_network_mode: "" - com.dockstarter.appvars.ouroboros_restart: "unless-stopped" - com.dockstarter.appvars.ouroboros_tag: "latest" - com.dockstarter.appvars.ouroboros_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_cleanup: "true" + com.dockstarter.appvars.${_appname_}_environment_cron: "0 4 * * *" + com.dockstarter.appvars.${_appname_}_environment_ignore: "" + com.dockstarter.appvars.${_appname_}_environment_log_level: "info" + com.dockstarter.appvars.${_appname_}_environment_monitor: "" + com.dockstarter.appvars.${_appname_}_environment_notifiers: "" + com.dockstarter.appvars.${_appname_}_environment_repo_pass: "" + com.dockstarter.appvars.${_appname_}_environment_repo_user: "" + com.dockstarter.appvars.${_appname_}_environment_self_update: "true" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/ouroboros/ouroboros.netmode.yml b/compose/.apps/ouroboros/ouroboros.netmode.yml index 97c671a014..f36884ffb9 100644 --- a/compose/.apps/ouroboros/ouroboros.netmode.yml +++ b/compose/.apps/ouroboros/ouroboros.netmode.yml @@ -1,3 +1,3 @@ services: - ouroboros: - network_mode: ${OUROBOROS_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/ouroboros/ouroboros.x86_64.yml b/compose/.apps/ouroboros/ouroboros.x86_64.yml index c5e87a27fe..efffc6dbf3 100644 --- a/compose/.apps/ouroboros/ouroboros.x86_64.yml +++ b/compose/.apps/ouroboros/ouroboros.x86_64.yml @@ -1,3 +1,3 @@ services: - ouroboros: - image: pyouroboros/ouroboros:${OUROBOROS_TAG} + ${_appname_}: + image: pyouroboros/ouroboros:${${_APPNAME_}_TAG} diff --git a/compose/.apps/ouroboros/ouroboros.yml b/compose/.apps/ouroboros/ouroboros.yml index f4ccb32f48..a083caa020 100644 --- a/compose/.apps/ouroboros/ouroboros.yml +++ b/compose/.apps/ouroboros/ouroboros.yml @@ -1,19 +1,19 @@ services: - ouroboros: - container_name: ${OUROBOROS_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - CLEANUP=${OUROBOROS_ENVIRONMENT_CLEANUP} - - CRON=${OUROBOROS_ENVIRONMENT_CRON} - - IGNORE=${OUROBOROS_ENVIRONMENT_IGNORE} - - LOG_LEVEL=${OUROBOROS_ENVIRONMENT_LOG_LEVEL} - - MONITOR=${OUROBOROS_ENVIRONMENT_MONITOR} - - NOTIFIERS=${OUROBOROS_ENVIRONMENT_NOTIFIERS} - - REPO_PASS=${OUROBOROS_ENVIRONMENT_REPO_PASS} - - REPO_USER=${OUROBOROS_ENVIRONMENT_REPO_USER} - - SELF_UPDATE=${OUROBOROS_ENVIRONMENT_SELF_UPDATE} + - CLEANUP=${${_APPNAME_}_ENVIRONMENT_CLEANUP} + - CRON=${${_APPNAME_}_ENVIRONMENT_CRON} + - IGNORE=${${_APPNAME_}_ENVIRONMENT_IGNORE} + - LOG_LEVEL=${${_APPNAME_}_ENVIRONMENT_LOG_LEVEL} + - MONITOR=${${_APPNAME_}_ENVIRONMENT_MONITOR} + - NOTIFIERS=${${_APPNAME_}_ENVIRONMENT_NOTIFIERS} + - REPO_PASS=${${_APPNAME_}_ENVIRONMENT_REPO_PASS} + - REPO_USER=${${_APPNAME_}_ENVIRONMENT_REPO_USER} + - SELF_UPDATE=${${_APPNAME_}_ENVIRONMENT_SELF_UPDATE} - TZ=${TZ} - restart: ${OUROBOROS_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage - - ${OUROBOROS_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock + - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock diff --git a/compose/.apps/overseerr/overseerr.aarch64.yml b/compose/.apps/overseerr/overseerr.aarch64.yml index 1672cf814b..4441e3dac4 100644 --- a/compose/.apps/overseerr/overseerr.aarch64.yml +++ b/compose/.apps/overseerr/overseerr.aarch64.yml @@ -1,3 +1,3 @@ services: - overseerr: - image: lscr.io/linuxserver/overseerr:${OVERSEERR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/overseerr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/overseerr/overseerr.hostname.yml b/compose/.apps/overseerr/overseerr.hostname.yml index 942f4825c6..4dc53c3782 100644 --- a/compose/.apps/overseerr/overseerr.hostname.yml +++ b/compose/.apps/overseerr/overseerr.hostname.yml @@ -1,3 +1,3 @@ services: - overseerr: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/overseerr/overseerr.labels.yml b/compose/.apps/overseerr/overseerr.labels.yml index a0f694d75a..2e9c5deff5 100644 --- a/compose/.apps/overseerr/overseerr.labels.yml +++ b/compose/.apps/overseerr/overseerr.labels.yml @@ -1,12 +1,12 @@ services: - overseerr: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A request management and media discovery tool" com.dockstarter.appinfo.nicename: "Overseerr" - com.dockstarter.appvars.overseerr_container_name: "overseerr" - com.dockstarter.appvars.overseerr_enabled: "false" - com.dockstarter.appvars.overseerr_network_mode: "" - com.dockstarter.appvars.overseerr_port_5055: "5055" - com.dockstarter.appvars.overseerr_restart: "unless-stopped" - com.dockstarter.appvars.overseerr_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_5055: "5055" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/overseerr/overseerr.netmode.yml b/compose/.apps/overseerr/overseerr.netmode.yml index 3d59e600f3..f36884ffb9 100644 --- a/compose/.apps/overseerr/overseerr.netmode.yml +++ b/compose/.apps/overseerr/overseerr.netmode.yml @@ -1,3 +1,3 @@ services: - overseerr: - network_mode: ${OVERSEERR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/overseerr/overseerr.ports.yml b/compose/.apps/overseerr/overseerr.ports.yml index ddbc93a41f..5712ba707f 100644 --- a/compose/.apps/overseerr/overseerr.ports.yml +++ b/compose/.apps/overseerr/overseerr.ports.yml @@ -1,4 +1,4 @@ services: - overseerr: + ${_appname_}: ports: - - ${OVERSEERR_PORT_5055}:5055 + - ${${_APPNAME_}_PORT_5055}:5055 diff --git a/compose/.apps/overseerr/overseerr.x86_64.yml b/compose/.apps/overseerr/overseerr.x86_64.yml index 1672cf814b..4441e3dac4 100644 --- a/compose/.apps/overseerr/overseerr.x86_64.yml +++ b/compose/.apps/overseerr/overseerr.x86_64.yml @@ -1,3 +1,3 @@ services: - overseerr: - image: lscr.io/linuxserver/overseerr:${OVERSEERR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/overseerr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/overseerr/overseerr.yml b/compose/.apps/overseerr/overseerr.yml index 7cd54f8a22..ace6d5d0ab 100644 --- a/compose/.apps/overseerr/overseerr.yml +++ b/compose/.apps/overseerr/overseerr.yml @@ -1,12 +1,12 @@ services: - overseerr: - container_name: ${OVERSEERR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${OVERSEERR_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/overseerr:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/petio/petio.aarch64.yml b/compose/.apps/petio/petio.aarch64.yml index f9bddc7685..c817e6268c 100644 --- a/compose/.apps/petio/petio.aarch64.yml +++ b/compose/.apps/petio/petio.aarch64.yml @@ -1,3 +1,3 @@ services: - petio: - image: ghcr.io/petio-team/petio:${PETIO_TAG} + ${_appname_}: + image: ghcr.io/petio-team/petio:${${_APPNAME_}_TAG} diff --git a/compose/.apps/petio/petio.hostname.yml b/compose/.apps/petio/petio.hostname.yml index 3b020d6338..4dc53c3782 100644 --- a/compose/.apps/petio/petio.hostname.yml +++ b/compose/.apps/petio/petio.hostname.yml @@ -1,3 +1,3 @@ services: - petio: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/petio/petio.labels.yml b/compose/.apps/petio/petio.labels.yml index f67fd26ee5..8edee8a46d 100644 --- a/compose/.apps/petio/petio.labels.yml +++ b/compose/.apps/petio/petio.labels.yml @@ -1,12 +1,12 @@ services: - petio: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A request companion app" com.dockstarter.appinfo.nicename: "Petio" - com.dockstarter.appvars.petio_container_name: "petio" - com.dockstarter.appvars.petio_enabled: "false" - com.dockstarter.appvars.petio_network_mode: "" - com.dockstarter.appvars.petio_port_7777: "7777" - com.dockstarter.appvars.petio_restart: "unless-stopped" - com.dockstarter.appvars.petio_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_7777: "7777" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/petio/petio.netmode.yml b/compose/.apps/petio/petio.netmode.yml index d7f74a18d1..f36884ffb9 100644 --- a/compose/.apps/petio/petio.netmode.yml +++ b/compose/.apps/petio/petio.netmode.yml @@ -1,3 +1,3 @@ services: - petio: - network_mode: ${PETIO_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/petio/petio.ports.yml b/compose/.apps/petio/petio.ports.yml index f34b364730..51c11dd53e 100644 --- a/compose/.apps/petio/petio.ports.yml +++ b/compose/.apps/petio/petio.ports.yml @@ -1,4 +1,4 @@ services: - petio: + ${_appname_}: ports: - - ${PETIO_PORT_7777}:7777 + - ${${_APPNAME_}_PORT_7777}:7777 diff --git a/compose/.apps/petio/petio.x86_64.yml b/compose/.apps/petio/petio.x86_64.yml index f9bddc7685..c817e6268c 100644 --- a/compose/.apps/petio/petio.x86_64.yml +++ b/compose/.apps/petio/petio.x86_64.yml @@ -1,3 +1,3 @@ services: - petio: - image: ghcr.io/petio-team/petio:${PETIO_TAG} + ${_appname_}: + image: ghcr.io/petio-team/petio:${${_APPNAME_}_TAG} diff --git a/compose/.apps/petio/petio.yml b/compose/.apps/petio/petio.yml index 8d51de98a1..adbb612add 100644 --- a/compose/.apps/petio/petio.yml +++ b/compose/.apps/petio/petio.yml @@ -1,11 +1,11 @@ services: - petio: - container_name: ${PETIO_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${PETIO_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/petio/config:/app/api/config - - ${DOCKER_VOLUME_CONFIG}/petio/logs:/app/logs + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/config:/app/api/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/logs:/app/logs - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/pgadmin/pgadmin.aarch64.yml b/compose/.apps/pgadmin/pgadmin.aarch64.yml index 451bd9308e..80d7b25391 100644 --- a/compose/.apps/pgadmin/pgadmin.aarch64.yml +++ b/compose/.apps/pgadmin/pgadmin.aarch64.yml @@ -1,3 +1,3 @@ services: - pgadmin: - image: dpage/pgadmin4:${PGADMIN_TAG} + ${_appname_}: + image: dpage/pgadmin4:${${_APPNAME_}_TAG} diff --git a/compose/.apps/pgadmin/pgadmin.hostname.yml b/compose/.apps/pgadmin/pgadmin.hostname.yml index 8e4534e655..4dc53c3782 100644 --- a/compose/.apps/pgadmin/pgadmin.hostname.yml +++ b/compose/.apps/pgadmin/pgadmin.hostname.yml @@ -1,3 +1,3 @@ services: - pgadmin: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/pgadmin/pgadmin.labels.yml b/compose/.apps/pgadmin/pgadmin.labels.yml index 38c48a43a4..61cb45d4ea 100644 --- a/compose/.apps/pgadmin/pgadmin.labels.yml +++ b/compose/.apps/pgadmin/pgadmin.labels.yml @@ -1,15 +1,15 @@ services: - pgadmin: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: pgAdmin 4 is a web based administration tool for the PostgreSQL database. com.dockstarter.appinfo.nicename: pgAdmin - com.dockstarter.appvars.pgadmin_container_name: "pgadmin" - com.dockstarter.appvars.pgadmin_enabled: "false" - com.dockstarter.appvars.pgadmin_environment_default_email: "" - com.dockstarter.appvars.pgadmin_environment_default_password: "" - com.dockstarter.appvars.pgadmin_environment_disable_postfix: "True" - com.dockstarter.appvars.pgadmin_network_mode: "" - com.dockstarter.appvars.pgadmin_port_80: "5050" - com.dockstarter.appvars.pgadmin_restart: unless-stopped - com.dockstarter.appvars.pgadmin_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_default_email: "" + com.dockstarter.appvars.${_appname_}_environment_default_password: "" + com.dockstarter.appvars.${_appname_}_environment_disable_postfix: "True" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_80: "5050" + com.dockstarter.appvars.${_appname_}_restart: unless-stopped + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/pgadmin/pgadmin.netmode.yml b/compose/.apps/pgadmin/pgadmin.netmode.yml index 75f1cd8fed..f36884ffb9 100644 --- a/compose/.apps/pgadmin/pgadmin.netmode.yml +++ b/compose/.apps/pgadmin/pgadmin.netmode.yml @@ -1,3 +1,3 @@ services: - pgadmin: - network_mode: ${PGADMIN_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/pgadmin/pgadmin.ports.yml b/compose/.apps/pgadmin/pgadmin.ports.yml index 81e4781ca6..c37afbebb5 100644 --- a/compose/.apps/pgadmin/pgadmin.ports.yml +++ b/compose/.apps/pgadmin/pgadmin.ports.yml @@ -1,4 +1,4 @@ services: - pgadmin: + ${_appname_}: ports: - - ${PGADMIN_PORT_80}:80 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/pgadmin/pgadmin.x86_64.yml b/compose/.apps/pgadmin/pgadmin.x86_64.yml index 451bd9308e..80d7b25391 100644 --- a/compose/.apps/pgadmin/pgadmin.x86_64.yml +++ b/compose/.apps/pgadmin/pgadmin.x86_64.yml @@ -1,3 +1,3 @@ services: - pgadmin: - image: dpage/pgadmin4:${PGADMIN_TAG} + ${_appname_}: + image: dpage/pgadmin4:${${_APPNAME_}_TAG} diff --git a/compose/.apps/pgadmin/pgadmin.yml b/compose/.apps/pgadmin/pgadmin.yml index a5e9ddeec3..54997b8d0e 100644 --- a/compose/.apps/pgadmin/pgadmin.yml +++ b/compose/.apps/pgadmin/pgadmin.yml @@ -1,13 +1,13 @@ services: - pgadmin: - container_name: ${PGADMIN_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - PGADMIN_DEFAULT_EMAIL=${PGADMIN_ENVIRONMENT_DEFAULT_EMAIL} - - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_ENVIRONMENT_DEFAULT_PASSWORD} - - PGADMIN_DISABLE_POSTFIX=${PGADMIN_ENVIRONMENT_DISABLE_POSTFIX} + - PGADMIN_DEFAULT_EMAIL=${${_APPNAME_}_ENVIRONMENT_DEFAULT_EMAIL} + - PGADMIN_DEFAULT_PASSWORD=${${_APPNAME_}_ENVIRONMENT_DEFAULT_PASSWORD} + - PGADMIN_DISABLE_POSTFIX=${${_APPNAME_}_ENVIRONMENT_DISABLE_POSTFIX} - TZ=${TZ} - restart: ${PGADMIN_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/pgadmin:/var/lib/pgadmin + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/var/lib/pgadmin - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/pgbackup/pgbackup.aarch64.yml b/compose/.apps/pgbackup/pgbackup.aarch64.yml index 51f99b1fad..93fd4ffac2 100644 --- a/compose/.apps/pgbackup/pgbackup.aarch64.yml +++ b/compose/.apps/pgbackup/pgbackup.aarch64.yml @@ -1,3 +1,3 @@ services: - pgbackup: - image: prodrigestivill/postgres-backup-local:${PGBACKUP_TAG} + ${_appname_}: + image: prodrigestivill/postgres-backup-local:${${_APPNAME_}_TAG} diff --git a/compose/.apps/pgbackup/pgbackup.hostname.yml b/compose/.apps/pgbackup/pgbackup.hostname.yml index 6742869b66..4dc53c3782 100644 --- a/compose/.apps/pgbackup/pgbackup.hostname.yml +++ b/compose/.apps/pgbackup/pgbackup.hostname.yml @@ -1,3 +1,3 @@ services: - pgbackup: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/pgbackup/pgbackup.labels.yml b/compose/.apps/pgbackup/pgbackup.labels.yml index d8e098fbdd..9b655f6b96 100644 --- a/compose/.apps/pgbackup/pgbackup.labels.yml +++ b/compose/.apps/pgbackup/pgbackup.labels.yml @@ -1,20 +1,20 @@ services: - pgbackup: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: Backup PostgresSQL to the local filesystem with periodic rotating backups. com.dockstarter.appinfo.nicename: pgBackup - com.dockstarter.appvars.pgbackup_container_name: "pgbackup" - com.dockstarter.appvars.pgbackup_enabled: "false" - com.dockstarter.appvars.pgbackup_environment_keep_days: "8" - com.dockstarter.appvars.pgbackup_environment_keep_months: "12" - com.dockstarter.appvars.pgbackup_environment_keep_weeks: "4" - com.dockstarter.appvars.pgbackup_environment_postgres_db: "" - com.dockstarter.appvars.pgbackup_environment_postgres_extra_opts: "Z6 --schema=public --blobs" - com.dockstarter.appvars.pgbackup_environment_postgres_host: "postgres" - com.dockstarter.appvars.pgbackup_environment_postgres_password: "" - com.dockstarter.appvars.pgbackup_environment_postgres_user: "" - com.dockstarter.appvars.pgbackup_environment_schedule: "@daily" - com.dockstarter.appvars.pgbackup_network_mode: "" - com.dockstarter.appvars.pgbackup_restart: unless-stopped - com.dockstarter.appvars.pgbackup_tag: "16" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_keep_days: "8" + com.dockstarter.appvars.${_appname_}_environment_keep_months: "12" + com.dockstarter.appvars.${_appname_}_environment_keep_weeks: "4" + com.dockstarter.appvars.${_appname_}_environment_postgres_db: "" + com.dockstarter.appvars.${_appname_}_environment_postgres_extra_opts: "Z6 --schema=public --blobs" + com.dockstarter.appvars.${_appname_}_environment_postgres_host: "postgres" + com.dockstarter.appvars.${_appname_}_environment_postgres_password: "" + com.dockstarter.appvars.${_appname_}_environment_postgres_user: "" + com.dockstarter.appvars.${_appname_}_environment_schedule: "@daily" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_restart: unless-stopped + com.dockstarter.appvars.${_appname_}_tag: "16" diff --git a/compose/.apps/pgbackup/pgbackup.netmode.yml b/compose/.apps/pgbackup/pgbackup.netmode.yml index 9def0983fb..f36884ffb9 100644 --- a/compose/.apps/pgbackup/pgbackup.netmode.yml +++ b/compose/.apps/pgbackup/pgbackup.netmode.yml @@ -1,3 +1,3 @@ services: - pgbackup: - network_mode: ${PGBACKUP_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/pgbackup/pgbackup.x86_64.yml b/compose/.apps/pgbackup/pgbackup.x86_64.yml index 51f99b1fad..93fd4ffac2 100644 --- a/compose/.apps/pgbackup/pgbackup.x86_64.yml +++ b/compose/.apps/pgbackup/pgbackup.x86_64.yml @@ -1,3 +1,3 @@ services: - pgbackup: - image: prodrigestivill/postgres-backup-local:${PGBACKUP_TAG} + ${_appname_}: + image: prodrigestivill/postgres-backup-local:${${_APPNAME_}_TAG} diff --git a/compose/.apps/pgbackup/pgbackup.yml b/compose/.apps/pgbackup/pgbackup.yml index 196919a1b2..453fa54e77 100644 --- a/compose/.apps/pgbackup/pgbackup.yml +++ b/compose/.apps/pgbackup/pgbackup.yml @@ -1,18 +1,18 @@ services: - pgbackup: - container_name: ${PGBACKUP_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - BACKUP_KEEP_DAYS=${PGBACKUP_ENVIRONMENT_KEEP_DAYS} - - BACKUP_KEEP_MONTHS=${PGBACKUP_ENVIRONMENT_KEEP_MONTHS} - - BACKUP_KEEP_WEEKS=${PGBACKUP_ENVIRONMENT_KEEP_WEEKS} - - POSTGRES_DB=${PGBACKUP_ENVIRONMENT_POSTGRES_DB} - - POSTGRES_EXTRA_OPTS=${PGBACKUP_ENVIRONMENT_POSTGRES_EXTRA_OPTS} - - POSTGRES_HOST=${PGBACKUP_ENVIRONMENT_POSTGRES_HOST} - - POSTGRES_PASSWORD=${PGBACKUP_ENVIRONMENT_POSTGRES_PASSWORD} - - POSTGRES_USER=${PGBACKUP_ENVIRONMENT_POSTGRES_USER} - - SCHEDULE=${PGBACKUP_ENVIRONMENT_SCHEDULE} + - BACKUP_KEEP_DAYS=${${_APPNAME_}_ENVIRONMENT_KEEP_DAYS} + - BACKUP_KEEP_MONTHS=${${_APPNAME_}_ENVIRONMENT_KEEP_MONTHS} + - BACKUP_KEEP_WEEKS=${${_APPNAME_}_ENVIRONMENT_KEEP_WEEKS} + - POSTGRES_DB=${${_APPNAME_}_ENVIRONMENT_POSTGRES_DB} + - POSTGRES_EXTRA_OPTS=${${_APPNAME_}_ENVIRONMENT_POSTGRES_EXTRA_OPTS} + - POSTGRES_HOST=${${_APPNAME_}_ENVIRONMENT_POSTGRES_HOST} + - POSTGRES_PASSWORD=${${_APPNAME_}_ENVIRONMENT_POSTGRES_PASSWORD} + - POSTGRES_USER=${${_APPNAME_}_ENVIRONMENT_POSTGRES_USER} + - SCHEDULE=${${_APPNAME_}_ENVIRONMENT_SCHEDULE} - TZ=${TZ} - restart: ${PGBACKUP_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}/backups/postgres:/backups diff --git a/compose/.apps/photoshow/photoshow.aarch64.yml b/compose/.apps/photoshow/photoshow.aarch64.yml index ddb5bed437..fed91e84d3 100644 --- a/compose/.apps/photoshow/photoshow.aarch64.yml +++ b/compose/.apps/photoshow/photoshow.aarch64.yml @@ -1,3 +1,3 @@ services: - photoshow: - image: lscr.io/linuxserver/photoshow:${PHOTOSHOW_TAG} + ${_appname_}: + image: lscr.io/linuxserver/photoshow:${${_APPNAME_}_TAG} diff --git a/compose/.apps/photoshow/photoshow.hostname.yml b/compose/.apps/photoshow/photoshow.hostname.yml index 07fe54401b..4dc53c3782 100644 --- a/compose/.apps/photoshow/photoshow.hostname.yml +++ b/compose/.apps/photoshow/photoshow.hostname.yml @@ -1,3 +1,3 @@ services: - photoshow: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/photoshow/photoshow.labels.yml b/compose/.apps/photoshow/photoshow.labels.yml index bba8df43c6..0c4770ce3f 100644 --- a/compose/.apps/photoshow/photoshow.labels.yml +++ b/compose/.apps/photoshow/photoshow.labels.yml @@ -1,14 +1,14 @@ services: - photoshow: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) No replacement" com.dockstarter.appinfo.nicename: "PhotoShow" - com.dockstarter.appvars.photoshow_container_name: "photoshow" - com.dockstarter.appvars.photoshow_enabled: "false" - com.dockstarter.appvars.photoshow_network_mode: "" - com.dockstarter.appvars.photoshow_port_80: "80" - com.dockstarter.appvars.photoshow_restart: "unless-stopped" - com.dockstarter.appvars.photoshow_tag: "latest" - com.dockstarter.appvars.photoshow_volume_images_dir: "/mnt/photoshow/pictures" - com.dockstarter.appvars.photoshow_volume_thumbs_dir: "/mnt/photoshow/thumbs" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_80: "80" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_images_dir: "/mnt/photoshow/pictures" + com.dockstarter.appvars.${_appname_}_volume_thumbs_dir: "/mnt/photoshow/thumbs" diff --git a/compose/.apps/photoshow/photoshow.netmode.yml b/compose/.apps/photoshow/photoshow.netmode.yml index 4f0b0c951d..f36884ffb9 100644 --- a/compose/.apps/photoshow/photoshow.netmode.yml +++ b/compose/.apps/photoshow/photoshow.netmode.yml @@ -1,3 +1,3 @@ services: - photoshow: - network_mode: ${PHOTOSHOW_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/photoshow/photoshow.ports.yml b/compose/.apps/photoshow/photoshow.ports.yml index 161e95f9f0..c37afbebb5 100644 --- a/compose/.apps/photoshow/photoshow.ports.yml +++ b/compose/.apps/photoshow/photoshow.ports.yml @@ -1,4 +1,4 @@ services: - photoshow: + ${_appname_}: ports: - - ${PHOTOSHOW_PORT_80}:80 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/photoshow/photoshow.x86_64.yml b/compose/.apps/photoshow/photoshow.x86_64.yml index ddb5bed437..fed91e84d3 100644 --- a/compose/.apps/photoshow/photoshow.x86_64.yml +++ b/compose/.apps/photoshow/photoshow.x86_64.yml @@ -1,3 +1,3 @@ services: - photoshow: - image: lscr.io/linuxserver/photoshow:${PHOTOSHOW_TAG} + ${_appname_}: + image: lscr.io/linuxserver/photoshow:${${_APPNAME_}_TAG} diff --git a/compose/.apps/photoshow/photoshow.yml b/compose/.apps/photoshow/photoshow.yml index 16670f0e72..59b1f631f2 100644 --- a/compose/.apps/photoshow/photoshow.yml +++ b/compose/.apps/photoshow/photoshow.yml @@ -1,14 +1,14 @@ services: - photoshow: - container_name: ${PHOTOSHOW_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${PHOTOSHOW_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/photoshow:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${PHOTOSHOW_VOLUME_IMAGES_DIR}:/Pictures:ro - - ${PHOTOSHOW_VOLUME_THUMBS_DIR}:/Thumbs + - ${${_APPNAME_}_VOLUME_IMAGES_DIR}:/Pictures:ro + - ${${_APPNAME_}_VOLUME_THUMBS_DIR}:/Thumbs diff --git a/compose/.apps/photostructure/photostructure.hostname.yml b/compose/.apps/photostructure/photostructure.hostname.yml index 3da708fce0..4dc53c3782 100644 --- a/compose/.apps/photostructure/photostructure.hostname.yml +++ b/compose/.apps/photostructure/photostructure.hostname.yml @@ -1,3 +1,3 @@ services: - photostructure: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/photostructure/photostructure.labels.yml b/compose/.apps/photostructure/photostructure.labels.yml index e57c50d4ad..9cbfb09843 100644 --- a/compose/.apps/photostructure/photostructure.labels.yml +++ b/compose/.apps/photostructure/photostructure.labels.yml @@ -1,16 +1,16 @@ services: - photostructure: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "PhotoStructure is your new home for all your photos & videos." com.dockstarter.appinfo.nicename: "PhotoStructure" - com.dockstarter.appvars.photostructure_container_name: "photostructure" - com.dockstarter.appvars.photostructure_enabled: "false" - com.dockstarter.appvars.photostructure_environment_expose_network_without_auth: "true" - com.dockstarter.appvars.photostructure_environment_force_local_db_replica: "0" - com.dockstarter.appvars.photostructure_network_mode: "" - com.dockstarter.appvars.photostructure_port_1787: "1787" - com.dockstarter.appvars.photostructure_restart: "unless-stopped" - com.dockstarter.appvars.photostructure_tag: "latest" - com.dockstarter.appvars.photostructure_volume_cache_directory: "/tmp/photostructure_cache" - com.dockstarter.appvars.photostructure_volume_library: "/mnt/photostructure" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_expose_network_without_auth: "true" + com.dockstarter.appvars.${_appname_}_environment_force_local_db_replica: "0" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_1787: "1787" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_cache_directory: "/tmp/photostructure_cache" + com.dockstarter.appvars.${_appname_}_volume_library: "/mnt/photostructure" diff --git a/compose/.apps/photostructure/photostructure.netmode.yml b/compose/.apps/photostructure/photostructure.netmode.yml index eb643d2dbb..f36884ffb9 100644 --- a/compose/.apps/photostructure/photostructure.netmode.yml +++ b/compose/.apps/photostructure/photostructure.netmode.yml @@ -1,3 +1,3 @@ services: - photostructure: - network_mode: ${PHOTOSTRUCTURE_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/photostructure/photostructure.ports.yml b/compose/.apps/photostructure/photostructure.ports.yml index 964a319edd..8c2a0b7b5e 100644 --- a/compose/.apps/photostructure/photostructure.ports.yml +++ b/compose/.apps/photostructure/photostructure.ports.yml @@ -1,4 +1,4 @@ services: - photostructure: + ${_appname_}: ports: - - ${PHOTOSTRUCTURE_PORT_1787}:1787 + - ${${_APPNAME_}_PORT_1787}:1787 diff --git a/compose/.apps/photostructure/photostructure.x86_64.yml b/compose/.apps/photostructure/photostructure.x86_64.yml index 3aa4a9509a..959f38be36 100644 --- a/compose/.apps/photostructure/photostructure.x86_64.yml +++ b/compose/.apps/photostructure/photostructure.x86_64.yml @@ -1,3 +1,3 @@ services: - photostructure: - image: photostructure/server:${PHOTOSTRUCTURE_TAG} + ${_appname_}: + image: photostructure/server:${${_APPNAME_}_TAG} diff --git a/compose/.apps/photostructure/photostructure.yml b/compose/.apps/photostructure/photostructure.yml index 6ef5c60ee8..bccf4138e6 100644 --- a/compose/.apps/photostructure/photostructure.yml +++ b/compose/.apps/photostructure/photostructure.yml @@ -1,17 +1,17 @@ services: - photostructure: - container_name: ${PHOTOSTRUCTURE_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - - PS_EXPOSE_NETWORK_WITHOUT_AUTH=${PHOTOSTRUCTURE_ENVIRONMENT_EXPOSE_NETWORK_WITHOUT_AUTH} - - PS_FORCE_LOCAL_DB_REPLICA=${PHOTOSTRUCTURE_ENVIRONMENT_FORCE_LOCAL_DB_REPLICA} + - PS_EXPOSE_NETWORK_WITHOUT_AUTH=${${_APPNAME_}_ENVIRONMENT_EXPOSE_NETWORK_WITHOUT_AUTH} + - PS_FORCE_LOCAL_DB_REPLICA=${${_APPNAME_}_ENVIRONMENT_FORCE_LOCAL_DB_REPLICA} - PUID=${PUID} - TZ=${TZ} - restart: ${PHOTOSTRUCTURE_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/photostructure:/ps/config - - ${DOCKER_VOLUME_CONFIG}/photostructure/logs:/ps/logs + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/ps/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/logs:/ps/logs - ${DOCKER_VOLUME_STORAGE}:/storage - - ${PHOTOSTRUCTURE_VOLUME_CACHE_DIRECTORY}:/ps/tmp - - ${PHOTOSTRUCTURE_VOLUME_LIBRARY}:/ps/library + - ${${_APPNAME_}_VOLUME_CACHE_DIRECTORY}:/ps/tmp + - ${${_APPNAME_}_VOLUME_LIBRARY}:/ps/library diff --git a/compose/.apps/phpmyadmin/phpmyadmin.aarch64.yml b/compose/.apps/phpmyadmin/phpmyadmin.aarch64.yml index 8249b955a3..01bfb0d2dc 100644 --- a/compose/.apps/phpmyadmin/phpmyadmin.aarch64.yml +++ b/compose/.apps/phpmyadmin/phpmyadmin.aarch64.yml @@ -1,3 +1,3 @@ services: - phpmyadmin: - image: phpmyadmin:${PHPMYADMIN_TAG} + ${_appname_}: + image: phpmyadmin:${${_APPNAME_}_TAG} diff --git a/compose/.apps/phpmyadmin/phpmyadmin.hostname.yml b/compose/.apps/phpmyadmin/phpmyadmin.hostname.yml index 00521184a2..4dc53c3782 100644 --- a/compose/.apps/phpmyadmin/phpmyadmin.hostname.yml +++ b/compose/.apps/phpmyadmin/phpmyadmin.hostname.yml @@ -1,3 +1,3 @@ services: - phpmyadmin: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/phpmyadmin/phpmyadmin.labels.yml b/compose/.apps/phpmyadmin/phpmyadmin.labels.yml index 14defc33c7..ad8a6a3f38 100644 --- a/compose/.apps/phpmyadmin/phpmyadmin.labels.yml +++ b/compose/.apps/phpmyadmin/phpmyadmin.labels.yml @@ -1,15 +1,15 @@ services: - phpmyadmin: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A web interface for MySQL and MariaDB" com.dockstarter.appinfo.nicename: "phpMyAdmin" - com.dockstarter.appvars.phpmyadmin_container_name: "phpmyadmin" - com.dockstarter.appvars.phpmyadmin_enabled: "false" - com.dockstarter.appvars.phpmyadmin_environment_pma_host: "mariadb" - com.dockstarter.appvars.phpmyadmin_environment_pma_password: "" - com.dockstarter.appvars.phpmyadmin_environment_pma_user: "root" - com.dockstarter.appvars.phpmyadmin_network_mode: "" - com.dockstarter.appvars.phpmyadmin_port_80: "8007" - com.dockstarter.appvars.phpmyadmin_restart: "unless-stopped" - com.dockstarter.appvars.phpmyadmin_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_pma_host: "mariadb" + com.dockstarter.appvars.${_appname_}_environment_pma_password: "" + com.dockstarter.appvars.${_appname_}_environment_pma_user: "root" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_80: "8007" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/phpmyadmin/phpmyadmin.netmode.yml b/compose/.apps/phpmyadmin/phpmyadmin.netmode.yml index 7418584e3a..f36884ffb9 100644 --- a/compose/.apps/phpmyadmin/phpmyadmin.netmode.yml +++ b/compose/.apps/phpmyadmin/phpmyadmin.netmode.yml @@ -1,3 +1,3 @@ services: - phpmyadmin: - network_mode: ${PHPMYADMIN_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/phpmyadmin/phpmyadmin.ports.yml b/compose/.apps/phpmyadmin/phpmyadmin.ports.yml index ced36acb40..c37afbebb5 100644 --- a/compose/.apps/phpmyadmin/phpmyadmin.ports.yml +++ b/compose/.apps/phpmyadmin/phpmyadmin.ports.yml @@ -1,4 +1,4 @@ services: - phpmyadmin: + ${_appname_}: ports: - - ${PHPMYADMIN_PORT_80}:80 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/phpmyadmin/phpmyadmin.x86_64.yml b/compose/.apps/phpmyadmin/phpmyadmin.x86_64.yml index 8249b955a3..01bfb0d2dc 100644 --- a/compose/.apps/phpmyadmin/phpmyadmin.x86_64.yml +++ b/compose/.apps/phpmyadmin/phpmyadmin.x86_64.yml @@ -1,3 +1,3 @@ services: - phpmyadmin: - image: phpmyadmin:${PHPMYADMIN_TAG} + ${_appname_}: + image: phpmyadmin:${${_APPNAME_}_TAG} diff --git a/compose/.apps/phpmyadmin/phpmyadmin.yml b/compose/.apps/phpmyadmin/phpmyadmin.yml index fee28a3b01..771ceff9c9 100644 --- a/compose/.apps/phpmyadmin/phpmyadmin.yml +++ b/compose/.apps/phpmyadmin/phpmyadmin.yml @@ -1,13 +1,13 @@ services: - phpmyadmin: - container_name: ${PHPMYADMIN_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - PMA_HOST=${PHPMYADMIN_ENVIRONMENT_PMA_HOST} - - PMA_PASSWORD=${PHPMYADMIN_ENVIRONMENT_PMA_PASSWORD} - - PMA_USER=${PHPMYADMIN_ENVIRONMENT_PMA_USER} + - PMA_HOST=${${_APPNAME_}_ENVIRONMENT_PMA_HOST} + - PMA_PASSWORD=${${_APPNAME_}_ENVIRONMENT_PMA_PASSWORD} + - PMA_USER=${${_APPNAME_}_ENVIRONMENT_PMA_USER} - TZ=${TZ} - restart: ${PHPMYADMIN_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/phpmyadmin:/sessions + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/sessions - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/picard/picard.hostname.yml b/compose/.apps/picard/picard.hostname.yml index de3ad47c87..4dc53c3782 100644 --- a/compose/.apps/picard/picard.hostname.yml +++ b/compose/.apps/picard/picard.hostname.yml @@ -1,3 +1,3 @@ services: - picard: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/picard/picard.labels.yml b/compose/.apps/picard/picard.labels.yml index a59061157d..d3447d2e78 100644 --- a/compose/.apps/picard/picard.labels.yml +++ b/compose/.apps/picard/picard.labels.yml @@ -1,12 +1,12 @@ services: - picard: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Tool for organizing your music" com.dockstarter.appinfo.nicename: "Picard" - com.dockstarter.appvars.picard_container_name: "picard" - com.dockstarter.appvars.picard_enabled: "false" - com.dockstarter.appvars.picard_network_mode: "" - com.dockstarter.appvars.picard_port_5800: "5800" - com.dockstarter.appvars.picard_restart: "unless-stopped" - com.dockstarter.appvars.picard_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_5800: "5800" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/picard/picard.netmode.yml b/compose/.apps/picard/picard.netmode.yml index a280876146..f36884ffb9 100644 --- a/compose/.apps/picard/picard.netmode.yml +++ b/compose/.apps/picard/picard.netmode.yml @@ -1,3 +1,3 @@ services: - picard: - network_mode: ${PICARD_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/picard/picard.ports.yml b/compose/.apps/picard/picard.ports.yml index 6f1d62b148..e628931935 100644 --- a/compose/.apps/picard/picard.ports.yml +++ b/compose/.apps/picard/picard.ports.yml @@ -1,4 +1,4 @@ services: - picard: + ${_appname_}: ports: - - ${PICARD_PORT_5800}:5800 + - ${${_APPNAME_}_PORT_5800}:5800 diff --git a/compose/.apps/picard/picard.x86_64.yml b/compose/.apps/picard/picard.x86_64.yml index bb5d728c57..b68dfc802d 100644 --- a/compose/.apps/picard/picard.x86_64.yml +++ b/compose/.apps/picard/picard.x86_64.yml @@ -1,3 +1,3 @@ services: - picard: - image: mikenye/picard:${PICARD_TAG} + ${_appname_}: + image: mikenye/picard:${${_APPNAME_}_TAG} diff --git a/compose/.apps/picard/picard.yml b/compose/.apps/picard/picard.yml index f4a78d3516..6c9e7bc9b9 100644 --- a/compose/.apps/picard/picard.yml +++ b/compose/.apps/picard/picard.yml @@ -1,12 +1,12 @@ services: - picard: - container_name: ${PICARD_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - GROUP_ID=${PGID} - TZ=${TZ} - USER_ID=${PUID} - restart: ${PICARD_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/picard:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/pihole/pihole.aarch64.yml b/compose/.apps/pihole/pihole.aarch64.yml index 1123666273..57f95056f0 100644 --- a/compose/.apps/pihole/pihole.aarch64.yml +++ b/compose/.apps/pihole/pihole.aarch64.yml @@ -1,3 +1,3 @@ services: - pihole: - image: pihole/pihole:${PIHOLE_TAG} + ${_appname_}: + image: pihole/pihole:${${_APPNAME_}_TAG} diff --git a/compose/.apps/pihole/pihole.hostname.yml b/compose/.apps/pihole/pihole.hostname.yml index 5919c610cd..4dc53c3782 100644 --- a/compose/.apps/pihole/pihole.hostname.yml +++ b/compose/.apps/pihole/pihole.hostname.yml @@ -1,3 +1,3 @@ services: - pihole: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/pihole/pihole.labels.yml b/compose/.apps/pihole/pihole.labels.yml index e1d873b0d4..ef0d69d267 100644 --- a/compose/.apps/pihole/pihole.labels.yml +++ b/compose/.apps/pihole/pihole.labels.yml @@ -1,19 +1,19 @@ services: - pihole: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A black hole for internet advertisements" com.dockstarter.appinfo.nicename: "PiHole" - com.dockstarter.appvars.pihole_container_name: "pihole" - com.dockstarter.appvars.pihole_enabled: "false" - com.dockstarter.appvars.pihole_environment_dns1: "1.1.1.1" - com.dockstarter.appvars.pihole_environment_dns2: "8.8.8.8" - com.dockstarter.appvars.pihole_environment_serverip: "0.0.0.0" - com.dockstarter.appvars.pihole_environment_webpassword: "" - com.dockstarter.appvars.pihole_network_mode: "" - com.dockstarter.appvars.pihole_port_443: "446" - com.dockstarter.appvars.pihole_port_53: "53" - com.dockstarter.appvars.pihole_port_67: "67" - com.dockstarter.appvars.pihole_port_80: "8008" - com.dockstarter.appvars.pihole_restart: "unless-stopped" - com.dockstarter.appvars.pihole_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_dns1: "1.1.1.1" + com.dockstarter.appvars.${_appname_}_environment_dns2: "8.8.8.8" + com.dockstarter.appvars.${_appname_}_environment_serverip: "0.0.0.0" + com.dockstarter.appvars.${_appname_}_environment_webpassword: "" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_443: "446" + com.dockstarter.appvars.${_appname_}_port_53: "53" + com.dockstarter.appvars.${_appname_}_port_67: "67" + com.dockstarter.appvars.${_appname_}_port_80: "8008" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/pihole/pihole.netmode.yml b/compose/.apps/pihole/pihole.netmode.yml index 7dfd4d44b4..f36884ffb9 100644 --- a/compose/.apps/pihole/pihole.netmode.yml +++ b/compose/.apps/pihole/pihole.netmode.yml @@ -1,3 +1,3 @@ services: - pihole: - network_mode: ${PIHOLE_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/pihole/pihole.ports.yml b/compose/.apps/pihole/pihole.ports.yml index b672ffa3c3..368dc6e022 100644 --- a/compose/.apps/pihole/pihole.ports.yml +++ b/compose/.apps/pihole/pihole.ports.yml @@ -1,8 +1,8 @@ services: - pihole: + ${_appname_}: ports: - - ${PIHOLE_PORT_443}:443 - - ${PIHOLE_PORT_80}:80 - - ${PIHOLE_ENVIRONMENT_SERVERIP}:${PIHOLE_PORT_53}:53 - - ${PIHOLE_ENVIRONMENT_SERVERIP}:${PIHOLE_PORT_53}:53/udp - - ${PIHOLE_ENVIRONMENT_SERVERIP}:${PIHOLE_PORT_67}:67/udp + - ${${_APPNAME_}_PORT_443}:443 + - ${${_APPNAME_}_PORT_80}:80 + - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${${_APPNAME_}_PORT_53}:53 + - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${${_APPNAME_}_PORT_53}:53/udp + - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${${_APPNAME_}_PORT_67}:67/udp diff --git a/compose/.apps/pihole/pihole.x86_64.yml b/compose/.apps/pihole/pihole.x86_64.yml index 1123666273..57f95056f0 100644 --- a/compose/.apps/pihole/pihole.x86_64.yml +++ b/compose/.apps/pihole/pihole.x86_64.yml @@ -1,3 +1,3 @@ services: - pihole: - image: pihole/pihole:${PIHOLE_TAG} + ${_appname_}: + image: pihole/pihole:${${_APPNAME_}_TAG} diff --git a/compose/.apps/pihole/pihole.yml b/compose/.apps/pihole/pihole.yml index 71bd28687b..2f180a6ff2 100644 --- a/compose/.apps/pihole/pihole.yml +++ b/compose/.apps/pihole/pihole.yml @@ -1,21 +1,21 @@ services: - pihole: + ${_appname_}: cap_add: - NET_ADMIN - container_name: ${PIHOLE_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} dns: - 127.0.0.1 - - ${PIHOLE_ENVIRONMENT_DNS1} - - ${PIHOLE_ENVIRONMENT_DNS2} + - ${${_APPNAME_}_ENVIRONMENT_DNS1} + - ${${_APPNAME_}_ENVIRONMENT_DNS2} environment: - - DNS1=${PIHOLE_ENVIRONMENT_DNS1} - - DNS2=${PIHOLE_ENVIRONMENT_DNS2} - - ServerIP=${PIHOLE_ENVIRONMENT_SERVERIP} + - DNS1=${${_APPNAME_}_ENVIRONMENT_DNS1} + - DNS2=${${_APPNAME_}_ENVIRONMENT_DNS2} + - ServerIP=${${_APPNAME_}_ENVIRONMENT_SERVERIP} - TZ=${TZ} - - WEBPASSWORD=${PIHOLE_ENVIRONMENT_WEBPASSWORD} - restart: ${PIHOLE_RESTART} + - WEBPASSWORD=${${_APPNAME_}_ENVIRONMENT_WEBPASSWORD} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/pihole/dnsmasq.d:/etc/dnsmasq.d - - ${DOCKER_VOLUME_CONFIG}/pihole/pihole:/etc/pihole + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/dnsmasq.d:/etc/dnsmasq.d + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/pihole:/etc/pihole - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/piwigo/piwigo.aarch64.yml b/compose/.apps/piwigo/piwigo.aarch64.yml index 1d3e58b062..8b7cc902f8 100644 --- a/compose/.apps/piwigo/piwigo.aarch64.yml +++ b/compose/.apps/piwigo/piwigo.aarch64.yml @@ -1,3 +1,3 @@ services: - piwigo: - image: lscr.io/linuxserver/piwigo:${PIWIGO_TAG} + ${_appname_}: + image: lscr.io/linuxserver/piwigo:${${_APPNAME_}_TAG} diff --git a/compose/.apps/piwigo/piwigo.hostname.yml b/compose/.apps/piwigo/piwigo.hostname.yml index 6f01519725..4dc53c3782 100644 --- a/compose/.apps/piwigo/piwigo.hostname.yml +++ b/compose/.apps/piwigo/piwigo.hostname.yml @@ -1,3 +1,3 @@ services: - piwigo: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/piwigo/piwigo.labels.yml b/compose/.apps/piwigo/piwigo.labels.yml index 38df985401..321673f264 100644 --- a/compose/.apps/piwigo/piwigo.labels.yml +++ b/compose/.apps/piwigo/piwigo.labels.yml @@ -1,12 +1,12 @@ services: - piwigo: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Photo gallery software for the web" com.dockstarter.appinfo.nicename: "Piwigo" - com.dockstarter.appvars.piwigo_container_name: "piwigo" - com.dockstarter.appvars.piwigo_enabled: "false" - com.dockstarter.appvars.piwigo_network_mode: "" - com.dockstarter.appvars.piwigo_port_80: "80" - com.dockstarter.appvars.piwigo_restart: "unless-stopped" - com.dockstarter.appvars.piwigo_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_80: "80" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/piwigo/piwigo.netmode.yml b/compose/.apps/piwigo/piwigo.netmode.yml index 5ce0830ffb..f36884ffb9 100644 --- a/compose/.apps/piwigo/piwigo.netmode.yml +++ b/compose/.apps/piwigo/piwigo.netmode.yml @@ -1,3 +1,3 @@ services: - piwigo: - network_mode: ${PIWIGO_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/piwigo/piwigo.ports.yml b/compose/.apps/piwigo/piwigo.ports.yml index a0c4553113..c37afbebb5 100644 --- a/compose/.apps/piwigo/piwigo.ports.yml +++ b/compose/.apps/piwigo/piwigo.ports.yml @@ -1,4 +1,4 @@ services: - piwigo: + ${_appname_}: ports: - - ${PIWIGO_PORT_80}:80 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/piwigo/piwigo.x86_64.yml b/compose/.apps/piwigo/piwigo.x86_64.yml index 1d3e58b062..8b7cc902f8 100644 --- a/compose/.apps/piwigo/piwigo.x86_64.yml +++ b/compose/.apps/piwigo/piwigo.x86_64.yml @@ -1,3 +1,3 @@ services: - piwigo: - image: lscr.io/linuxserver/piwigo:${PIWIGO_TAG} + ${_appname_}: + image: lscr.io/linuxserver/piwigo:${${_APPNAME_}_TAG} diff --git a/compose/.apps/piwigo/piwigo.yml b/compose/.apps/piwigo/piwigo.yml index ab811965a5..ace6d5d0ab 100644 --- a/compose/.apps/piwigo/piwigo.yml +++ b/compose/.apps/piwigo/piwigo.yml @@ -1,12 +1,12 @@ services: - piwigo: - container_name: ${PIWIGO_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${PIWIGO_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/piwigo:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/plex/plex.aarch64.yml b/compose/.apps/plex/plex.aarch64.yml index 34d76ef90e..e387757f1d 100644 --- a/compose/.apps/plex/plex.aarch64.yml +++ b/compose/.apps/plex/plex.aarch64.yml @@ -1,3 +1,3 @@ services: - plex: - image: lscr.io/linuxserver/plex:${PLEX_TAG} + ${_appname_}: + image: lscr.io/linuxserver/plex:${${_APPNAME_}_TAG} diff --git a/compose/.apps/plex/plex.hostname.yml b/compose/.apps/plex/plex.hostname.yml index cfac9eedec..4dc53c3782 100644 --- a/compose/.apps/plex/plex.hostname.yml +++ b/compose/.apps/plex/plex.hostname.yml @@ -1,3 +1,3 @@ services: - plex: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/plex/plex.labels.yml b/compose/.apps/plex/plex.labels.yml index 509878fbb5..083beee3b4 100644 --- a/compose/.apps/plex/plex.labels.yml +++ b/compose/.apps/plex/plex.labels.yml @@ -1,23 +1,23 @@ services: - plex: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Organizes all of your video, music and photo collections" com.dockstarter.appinfo.nicename: "Plex" - com.dockstarter.appvars.plex_container_name: "plex" - com.dockstarter.appvars.plex_enabled: "false" - com.dockstarter.appvars.plex_environment_plex_claim: "https://plex.tv/claim" - com.dockstarter.appvars.plex_environment_version: "docker" - com.dockstarter.appvars.plex_network_mode: "" - com.dockstarter.appvars.plex_port_1900: "1900" - com.dockstarter.appvars.plex_port_3005: "3005" - com.dockstarter.appvars.plex_port_32400: "32400" - com.dockstarter.appvars.plex_port_32410: "32410" - com.dockstarter.appvars.plex_port_32412: "32412" - com.dockstarter.appvars.plex_port_32413: "32413" - com.dockstarter.appvars.plex_port_32414: "32414" - com.dockstarter.appvars.plex_port_32469: "32469" - com.dockstarter.appvars.plex_port_33400: "33400" - com.dockstarter.appvars.plex_port_8324: "8324" - com.dockstarter.appvars.plex_restart: "unless-stopped" - com.dockstarter.appvars.plex_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_plex_claim: "https://plex.tv/claim" + com.dockstarter.appvars.${_appname_}_environment_version: "docker" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_1900: "1900" + com.dockstarter.appvars.${_appname_}_port_3005: "3005" + com.dockstarter.appvars.${_appname_}_port_32400: "32400" + com.dockstarter.appvars.${_appname_}_port_32410: "32410" + com.dockstarter.appvars.${_appname_}_port_32412: "32412" + com.dockstarter.appvars.${_appname_}_port_32413: "32413" + com.dockstarter.appvars.${_appname_}_port_32414: "32414" + com.dockstarter.appvars.${_appname_}_port_32469: "32469" + com.dockstarter.appvars.${_appname_}_port_33400: "33400" + com.dockstarter.appvars.${_appname_}_port_8324: "8324" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/plex/plex.netmode.yml b/compose/.apps/plex/plex.netmode.yml index 65fbefbca4..f36884ffb9 100644 --- a/compose/.apps/plex/plex.netmode.yml +++ b/compose/.apps/plex/plex.netmode.yml @@ -1,3 +1,3 @@ services: - plex: - network_mode: ${PLEX_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/plex/plex.ports.yml b/compose/.apps/plex/plex.ports.yml index 2ba90985f3..e14288e6bc 100644 --- a/compose/.apps/plex/plex.ports.yml +++ b/compose/.apps/plex/plex.ports.yml @@ -1,13 +1,13 @@ services: - plex: + ${_appname_}: ports: - - ${PLEX_PORT_1900}:1900/udp - - ${PLEX_PORT_3005}:3005 - - ${PLEX_PORT_32400}:32400 - - ${PLEX_PORT_32410}:32410/udp - - ${PLEX_PORT_32412}:32412/udp - - ${PLEX_PORT_32413}:32413/udp - - ${PLEX_PORT_32414}:32414/udp - - ${PLEX_PORT_32469}:32469 - - ${PLEX_PORT_33400}:33400 - - ${PLEX_PORT_8324}:8324 + - ${${_APPNAME_}_PORT_1900}:1900/udp + - ${${_APPNAME_}_PORT_3005}:3005 + - ${${_APPNAME_}_PORT_32400}:32400 + - ${${_APPNAME_}_PORT_32410}:32410/udp + - ${${_APPNAME_}_PORT_32412}:32412/udp + - ${${_APPNAME_}_PORT_32413}:32413/udp + - ${${_APPNAME_}_PORT_32414}:32414/udp + - ${${_APPNAME_}_PORT_32469}:32469 + - ${${_APPNAME_}_PORT_33400}:33400 + - ${${_APPNAME_}_PORT_8324}:8324 diff --git a/compose/.apps/plex/plex.x86_64.yml b/compose/.apps/plex/plex.x86_64.yml index 34d76ef90e..e387757f1d 100644 --- a/compose/.apps/plex/plex.x86_64.yml +++ b/compose/.apps/plex/plex.x86_64.yml @@ -1,3 +1,3 @@ services: - plex: - image: lscr.io/linuxserver/plex:${PLEX_TAG} + ${_appname_}: + image: lscr.io/linuxserver/plex:${${_APPNAME_}_TAG} diff --git a/compose/.apps/plex/plex.yml b/compose/.apps/plex/plex.yml index 104d91e8c9..9f884e2788 100644 --- a/compose/.apps/plex/plex.yml +++ b/compose/.apps/plex/plex.yml @@ -1,14 +1,14 @@ services: - plex: - container_name: ${PLEX_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - - PLEX_CLAIM=${PLEX_ENVIRONMENT_PLEX_CLAIM} + - PLEX_CLAIM=${${_APPNAME_}_ENVIRONMENT_PLEX_CLAIM} - PUID=${PUID} - TZ=${TZ} - - VERSION=${PLEX_ENVIRONMENT_VERSION} - restart: ${PLEX_RESTART} + - VERSION=${${_APPNAME_}_ENVIRONMENT_VERSION} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/plex:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/plexanisync/plexanisync.aarch64.yml b/compose/.apps/plexanisync/plexanisync.aarch64.yml index 181c712786..81419faeb1 100644 --- a/compose/.apps/plexanisync/plexanisync.aarch64.yml +++ b/compose/.apps/plexanisync/plexanisync.aarch64.yml @@ -1,3 +1,3 @@ services: - plexanisync: - image: rickdb/plexanisync:${PLEXANISYNC_TAG} + ${_appname_}: + image: rickdb/plexanisync:${${_APPNAME_}_TAG} diff --git a/compose/.apps/plexanisync/plexanisync.hostname.yml b/compose/.apps/plexanisync/plexanisync.hostname.yml index c33aead265..4dc53c3782 100644 --- a/compose/.apps/plexanisync/plexanisync.hostname.yml +++ b/compose/.apps/plexanisync/plexanisync.hostname.yml @@ -1,3 +1,3 @@ services: - plexanisync: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/plexanisync/plexanisync.labels.yml b/compose/.apps/plexanisync/plexanisync.labels.yml index bba7e4c063..4e01f1ff6a 100644 --- a/compose/.apps/plexanisync/plexanisync.labels.yml +++ b/compose/.apps/plexanisync/plexanisync.labels.yml @@ -1,17 +1,17 @@ services: - plexanisync: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Sync anime watched status from Plex to AniList" com.dockstarter.appinfo.nicename: "Plexanisync" - com.dockstarter.appvars.plexanisync_container_name: "plexanisync" - com.dockstarter.appvars.plexanisync_enabled: "false" - com.dockstarter.appvars.plexanisync_environment_ani_token: "" - com.dockstarter.appvars.plexanisync_environment_ani_username: "" - com.dockstarter.appvars.plexanisync_environment_interval: "3600" - com.dockstarter.appvars.plexanisync_environment_plex_section: "Anime" - com.dockstarter.appvars.plexanisync_environment_plex_token: "" - com.dockstarter.appvars.plexanisync_environment_plex_url: "http://plex:32400" - com.dockstarter.appvars.plexanisync_network_mode: "" - com.dockstarter.appvars.plexanisync_restart: "unless-stopped" - com.dockstarter.appvars.plexanisync_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_ani_token: "" + com.dockstarter.appvars.${_appname_}_environment_ani_username: "" + com.dockstarter.appvars.${_appname_}_environment_interval: "3600" + com.dockstarter.appvars.${_appname_}_environment_plex_section: "Anime" + com.dockstarter.appvars.${_appname_}_environment_plex_token: "" + com.dockstarter.appvars.${_appname_}_environment_plex_url: "http://plex:32400" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/plexanisync/plexanisync.netmode.yml b/compose/.apps/plexanisync/plexanisync.netmode.yml index 3f94464fba..f36884ffb9 100644 --- a/compose/.apps/plexanisync/plexanisync.netmode.yml +++ b/compose/.apps/plexanisync/plexanisync.netmode.yml @@ -1,3 +1,3 @@ services: - plexanisync: - network_mode: ${PLEXANISYNC_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/plexanisync/plexanisync.x86_64.yml b/compose/.apps/plexanisync/plexanisync.x86_64.yml index 181c712786..81419faeb1 100644 --- a/compose/.apps/plexanisync/plexanisync.x86_64.yml +++ b/compose/.apps/plexanisync/plexanisync.x86_64.yml @@ -1,3 +1,3 @@ services: - plexanisync: - image: rickdb/plexanisync:${PLEXANISYNC_TAG} + ${_appname_}: + image: rickdb/plexanisync:${${_APPNAME_}_TAG} diff --git a/compose/.apps/plexanisync/plexanisync.yml b/compose/.apps/plexanisync/plexanisync.yml index 431231d22e..16bef094c4 100644 --- a/compose/.apps/plexanisync/plexanisync.yml +++ b/compose/.apps/plexanisync/plexanisync.yml @@ -1,17 +1,17 @@ services: - plexanisync: - container_name: ${PLEXANISYNC_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - ANI_TOKEN=${PLEXANISYNC_ENVIRONMENT_ANI_TOKEN} - - ANI_USERNAME=${PLEXANISYNC_ENVIRONMENT_ANI_USERNAME} - - INTERVAL=${PLEXANISYNC_ENVIRONMENT_INTERVAL} + - ANI_TOKEN=${${_APPNAME_}_ENVIRONMENT_ANI_TOKEN} + - ANI_USERNAME=${${_APPNAME_}_ENVIRONMENT_ANI_USERNAME} + - INTERVAL=${${_APPNAME_}_ENVIRONMENT_INTERVAL} - PGID=${PGID} - - PLEX_SECTION=${PLEXANISYNC_ENVIRONMENT_PLEX_SECTION} - - PLEX_TOKEN=${PLEXANISYNC_ENVIRONMENT_PLEX_TOKEN} - - PLEX_URL=${PLEXANISYNC_ENVIRONMENT_PLEX_URL} + - PLEX_SECTION=${${_APPNAME_}_ENVIRONMENT_PLEX_SECTION} + - PLEX_TOKEN=${${_APPNAME_}_ENVIRONMENT_PLEX_TOKEN} + - PLEX_URL=${${_APPNAME_}_ENVIRONMENT_PLEX_URL} - PUID=${PUID} - TZ=${TZ} - restart: ${PLEXANISYNC_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/plexrequests/plexrequests.hostname.yml b/compose/.apps/plexrequests/plexrequests.hostname.yml index 9b252af919..4dc53c3782 100644 --- a/compose/.apps/plexrequests/plexrequests.hostname.yml +++ b/compose/.apps/plexrequests/plexrequests.hostname.yml @@ -1,3 +1,3 @@ services: - plexrequests: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/plexrequests/plexrequests.labels.yml b/compose/.apps/plexrequests/plexrequests.labels.yml index abfef0845b..d65c42f38a 100644 --- a/compose/.apps/plexrequests/plexrequests.labels.yml +++ b/compose/.apps/plexrequests/plexrequests.labels.yml @@ -1,5 +1,5 @@ services: - plexrequests: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) Use Ombi" diff --git a/compose/.apps/plexrequests/plexrequests.netmode.yml b/compose/.apps/plexrequests/plexrequests.netmode.yml index e55d0c1b10..f36884ffb9 100644 --- a/compose/.apps/plexrequests/plexrequests.netmode.yml +++ b/compose/.apps/plexrequests/plexrequests.netmode.yml @@ -1,3 +1,3 @@ services: - plexrequests: - network_mode: ${PLEXREQUESTS_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/plexrequests/plexrequests.ports.yml b/compose/.apps/plexrequests/plexrequests.ports.yml index 39d7f7673a..40e1a7dee8 100644 --- a/compose/.apps/plexrequests/plexrequests.ports.yml +++ b/compose/.apps/plexrequests/plexrequests.ports.yml @@ -1,4 +1,4 @@ services: - plexrequests: + ${_appname_}: ports: - - ${PLEXREQUESTS_PORT_3000}:3000 + - ${${_APPNAME_}_PORT_3000}:3000 diff --git a/compose/.apps/plexrequests/plexrequests.x86_64.yml b/compose/.apps/plexrequests/plexrequests.x86_64.yml index 2681ccbac8..4ea976a51e 100644 --- a/compose/.apps/plexrequests/plexrequests.x86_64.yml +++ b/compose/.apps/plexrequests/plexrequests.x86_64.yml @@ -1,3 +1,3 @@ services: - plexrequests: - image: lscr.io/linuxserver/plexrequests:${PLEXREQUESTS_TAG} + ${_appname_}: + image: lscr.io/linuxserver/plexrequests:${${_APPNAME_}_TAG} diff --git a/compose/.apps/plexrequests/plexrequests.yml b/compose/.apps/plexrequests/plexrequests.yml index 716274b64d..ef87fc3975 100644 --- a/compose/.apps/plexrequests/plexrequests.yml +++ b/compose/.apps/plexrequests/plexrequests.yml @@ -1,13 +1,13 @@ services: - plexrequests: - container_name: ${PLEXREQUESTS_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - URL_BASE=/plexrequests - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${PLEXREQUESTS_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/plexrequests:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/portainer/portainer.aarch64.yml b/compose/.apps/portainer/portainer.aarch64.yml index 3d27407f92..4c148773d3 100644 --- a/compose/.apps/portainer/portainer.aarch64.yml +++ b/compose/.apps/portainer/portainer.aarch64.yml @@ -1,3 +1,3 @@ services: - portainer: - image: portainer/portainer-ce:${PORTAINER_TAG} + ${_appname_}: + image: portainer/portainer-ce:${${_APPNAME_}_TAG} diff --git a/compose/.apps/portainer/portainer.hostname.yml b/compose/.apps/portainer/portainer.hostname.yml index 5ea1535a3b..4dc53c3782 100644 --- a/compose/.apps/portainer/portainer.hostname.yml +++ b/compose/.apps/portainer/portainer.hostname.yml @@ -1,3 +1,3 @@ services: - portainer: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/portainer/portainer.labels.yml b/compose/.apps/portainer/portainer.labels.yml index 7153386c30..b5ac6cc1f8 100644 --- a/compose/.apps/portainer/portainer.labels.yml +++ b/compose/.apps/portainer/portainer.labels.yml @@ -1,13 +1,13 @@ services: - portainer: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Simple management UI for Docker" com.dockstarter.appinfo.nicename: "Portainer" - com.dockstarter.appvars.portainer_container_name: "portainer" - com.dockstarter.appvars.portainer_enabled: "false" - com.dockstarter.appvars.portainer_network_mode: "" - com.dockstarter.appvars.portainer_port_9000: "9000" - com.dockstarter.appvars.portainer_restart: "unless-stopped" - com.dockstarter.appvars.portainer_tag: "latest" - com.dockstarter.appvars.portainer_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_9000: "9000" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/portainer/portainer.netmode.yml b/compose/.apps/portainer/portainer.netmode.yml index 580e531e75..f36884ffb9 100644 --- a/compose/.apps/portainer/portainer.netmode.yml +++ b/compose/.apps/portainer/portainer.netmode.yml @@ -1,3 +1,3 @@ services: - portainer: - network_mode: ${PORTAINER_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/portainer/portainer.ports.yml b/compose/.apps/portainer/portainer.ports.yml index d234c9bf27..f725dec1dd 100644 --- a/compose/.apps/portainer/portainer.ports.yml +++ b/compose/.apps/portainer/portainer.ports.yml @@ -1,4 +1,4 @@ services: - portainer: + ${_appname_}: ports: - - ${PORTAINER_PORT_9000}:9000 + - ${${_APPNAME_}_PORT_9000}:9000 diff --git a/compose/.apps/portainer/portainer.x86_64.yml b/compose/.apps/portainer/portainer.x86_64.yml index 3d27407f92..4c148773d3 100644 --- a/compose/.apps/portainer/portainer.x86_64.yml +++ b/compose/.apps/portainer/portainer.x86_64.yml @@ -1,3 +1,3 @@ services: - portainer: - image: portainer/portainer-ce:${PORTAINER_TAG} + ${_appname_}: + image: portainer/portainer-ce:${${_APPNAME_}_TAG} diff --git a/compose/.apps/portainer/portainer.yml b/compose/.apps/portainer/portainer.yml index 201a66fd95..e0a0592a82 100644 --- a/compose/.apps/portainer/portainer.yml +++ b/compose/.apps/portainer/portainer.yml @@ -1,12 +1,12 @@ services: - portainer: + ${_appname_}: command: "-H unix:///var/run/docker.sock" - container_name: ${PORTAINER_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${PORTAINER_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/portainer:/data + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/data - ${DOCKER_VOLUME_STORAGE}:/storage - - ${PORTAINER_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock + - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock diff --git a/compose/.apps/portaineragent/portaineragent.aarch64.yml b/compose/.apps/portaineragent/portaineragent.aarch64.yml index 562dcbbe0c..c2cc8e703b 100644 --- a/compose/.apps/portaineragent/portaineragent.aarch64.yml +++ b/compose/.apps/portaineragent/portaineragent.aarch64.yml @@ -1,3 +1,3 @@ services: - portaineragent: - image: portainer/agent:${PORTAINERAGENT_TAG} + ${_appname_}: + image: portainer/agent:${${_APPNAME_}_TAG} diff --git a/compose/.apps/portaineragent/portaineragent.hostname.yml b/compose/.apps/portaineragent/portaineragent.hostname.yml index a8b209486a..b8e5ba9b02 100644 --- a/compose/.apps/portaineragent/portaineragent.hostname.yml +++ b/compose/.apps/portaineragent/portaineragent.hostname.yml @@ -1,3 +1,3 @@ services: - portaineragent: + ${_appname_}: hostname: portaineragent diff --git a/compose/.apps/portaineragent/portaineragent.labels.yml b/compose/.apps/portaineragent/portaineragent.labels.yml index e6c51d4334..67a5444a0f 100644 --- a/compose/.apps/portaineragent/portaineragent.labels.yml +++ b/compose/.apps/portaineragent/portaineragent.labels.yml @@ -1,14 +1,14 @@ services: - portaineragent: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "An agent used to manage all the resources in a Swarm cluster" com.dockstarter.appinfo.nicename: "PortainerAgent" - com.dockstarter.appvars.portaineragent_container_name: "portaineragent" - com.dockstarter.appvars.portaineragent_enabled: "false" - com.dockstarter.appvars.portaineragent_network_mode: "" - com.dockstarter.appvars.portaineragent_port_9001: "9001" - com.dockstarter.appvars.portaineragent_environment_cap_host_management: "1" - com.dockstarter.appvars.portaineragent_restart: "unless-stopped" - com.dockstarter.appvars.portaineragent_tag: "latest" - com.dockstarter.appvars.portaineragent_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_9001: "9001" + com.dockstarter.appvars.${_appname_}_environment_cap_host_management: "1" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/portaineragent/portaineragent.netmode.yml b/compose/.apps/portaineragent/portaineragent.netmode.yml index d33e4684a7..f36884ffb9 100644 --- a/compose/.apps/portaineragent/portaineragent.netmode.yml +++ b/compose/.apps/portaineragent/portaineragent.netmode.yml @@ -1,3 +1,3 @@ services: - portaineragent: - network_mode: ${PORTAINERAGENT_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/portaineragent/portaineragent.ports.yml b/compose/.apps/portaineragent/portaineragent.ports.yml index 79609c72a3..2c69ddbd75 100644 --- a/compose/.apps/portaineragent/portaineragent.ports.yml +++ b/compose/.apps/portaineragent/portaineragent.ports.yml @@ -1,4 +1,4 @@ services: - portaineragent: + ${_appname_}: ports: - - ${PORTAINERAGENT_PORT_9001}:9001 + - ${${_APPNAME_}_PORT_9001}:9001 diff --git a/compose/.apps/portaineragent/portaineragent.x86_64.yml b/compose/.apps/portaineragent/portaineragent.x86_64.yml index 562dcbbe0c..c2cc8e703b 100644 --- a/compose/.apps/portaineragent/portaineragent.x86_64.yml +++ b/compose/.apps/portaineragent/portaineragent.x86_64.yml @@ -1,3 +1,3 @@ services: - portaineragent: - image: portainer/agent:${PORTAINERAGENT_TAG} + ${_appname_}: + image: portainer/agent:${${_APPNAME_}_TAG} diff --git a/compose/.apps/portaineragent/portaineragent.yml b/compose/.apps/portaineragent/portaineragent.yml index 45497c87e1..8a4e9ac6b2 100644 --- a/compose/.apps/portaineragent/portaineragent.yml +++ b/compose/.apps/portaineragent/portaineragent.yml @@ -1,13 +1,13 @@ services: - portaineragent: - container_name: ${PORTAINERAGENT_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - CAP_HOST_MANAGEMENT=${PORTAINERAGENT_ENVIRONMENT_CAP_HOST_MANAGEMENT} + - CAP_HOST_MANAGEMENT=${${_APPNAME_}_ENVIRONMENT_CAP_HOST_MANAGEMENT} - TZ=${TZ} - restart: ${PORTAINERAGENT_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /:/host - /etc/localtime:/etc/localtime:ro - /var/lib/docker/volumes:/var/lib/docker/volumes - ${DOCKER_VOLUME_STORAGE}:/storage - - ${PORTAINERAGENT_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock + - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock diff --git a/compose/.apps/postgres/postgres.aarch64.yml b/compose/.apps/postgres/postgres.aarch64.yml index 616deef665..30dc4e32bf 100644 --- a/compose/.apps/postgres/postgres.aarch64.yml +++ b/compose/.apps/postgres/postgres.aarch64.yml @@ -1,3 +1,3 @@ services: - postgres: - image: postgres:${POSTGRES_TAG} + ${_appname_}: + image: postgres:${${_APPNAME_}_TAG} diff --git a/compose/.apps/postgres/postgres.hostname.yml b/compose/.apps/postgres/postgres.hostname.yml index 39f7e4cac6..4dc53c3782 100644 --- a/compose/.apps/postgres/postgres.hostname.yml +++ b/compose/.apps/postgres/postgres.hostname.yml @@ -1,3 +1,3 @@ services: - postgres: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/postgres/postgres.labels.yml b/compose/.apps/postgres/postgres.labels.yml index 887e4ac4df..65ef9a928a 100644 --- a/compose/.apps/postgres/postgres.labels.yml +++ b/compose/.apps/postgres/postgres.labels.yml @@ -1,14 +1,14 @@ services: - postgres: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: The PostgreSQL object-relational database system provides reliability and data integrity. com.dockstarter.appinfo.nicename: Postgres - com.dockstarter.appvars.postgres_container_name: "postgres" - com.dockstarter.appvars.postgres_enabled: "false" - com.dockstarter.appvars.postgres_environment_password: "" - com.dockstarter.appvars.postgres_environment_user: "postgres" - com.dockstarter.appvars.postgres_network_mode: "" - com.dockstarter.appvars.postgres_port_5432: "5432" - com.dockstarter.appvars.postgres_restart: unless-stopped - com.dockstarter.appvars.postgres_tag: "16" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_password: "" + com.dockstarter.appvars.${_appname_}_environment_user: "postgres" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_5432: "5432" + com.dockstarter.appvars.${_appname_}_restart: unless-stopped + com.dockstarter.appvars.${_appname_}_tag: "16" diff --git a/compose/.apps/postgres/postgres.netmode.yml b/compose/.apps/postgres/postgres.netmode.yml index 9f2b82215a..f36884ffb9 100644 --- a/compose/.apps/postgres/postgres.netmode.yml +++ b/compose/.apps/postgres/postgres.netmode.yml @@ -1,3 +1,3 @@ services: - postgres: - network_mode: ${POSTGRES_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/postgres/postgres.ports.yml b/compose/.apps/postgres/postgres.ports.yml index 2640b36e79..11a1ec6cc6 100644 --- a/compose/.apps/postgres/postgres.ports.yml +++ b/compose/.apps/postgres/postgres.ports.yml @@ -1,4 +1,4 @@ services: - postgres: + ${_appname_}: ports: - - ${POSTGRES_PORT_5432}:5432 + - ${${_APPNAME_}_PORT_5432}:5432 diff --git a/compose/.apps/postgres/postgres.x86_64.yml b/compose/.apps/postgres/postgres.x86_64.yml index 616deef665..30dc4e32bf 100644 --- a/compose/.apps/postgres/postgres.x86_64.yml +++ b/compose/.apps/postgres/postgres.x86_64.yml @@ -1,3 +1,3 @@ services: - postgres: - image: postgres:${POSTGRES_TAG} + ${_appname_}: + image: postgres:${${_APPNAME_}_TAG} diff --git a/compose/.apps/postgres/postgres.yml b/compose/.apps/postgres/postgres.yml index 9d8d29e0c7..db3e5df14d 100644 --- a/compose/.apps/postgres/postgres.yml +++ b/compose/.apps/postgres/postgres.yml @@ -1,12 +1,12 @@ services: - postgres: - container_name: ${POSTGRES_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - POSTGRES_PASSWORD=${POSTGRES_ENVIRONMENT_PASSWORD} - - POSTGRES_USER=${POSTGRES_ENVIRONMENT_USER} + - POSTGRES_PASSWORD=${${_APPNAME_}_ENVIRONMENT_PASSWORD} + - POSTGRES_USER=${${_APPNAME_}_ENVIRONMENT_USER} - TZ=${TZ} - restart: ${POSTGRES_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/postgres:/var/lib/postgresql/data + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/var/lib/postgresql/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/privoxyvpn/privoxyvpn.aarch64.yml b/compose/.apps/privoxyvpn/privoxyvpn.aarch64.yml index 6d42522c00..19736f8c8c 100644 --- a/compose/.apps/privoxyvpn/privoxyvpn.aarch64.yml +++ b/compose/.apps/privoxyvpn/privoxyvpn.aarch64.yml @@ -1,3 +1,3 @@ services: - privoxyvpn: - image: ghcr.io/binhex/arch-privoxyvpn:${PRIVOXYVPN_TAG} + ${_appname_}: + image: ghcr.io/binhex/arch-privoxyvpn:${${_APPNAME_}_TAG} diff --git a/compose/.apps/privoxyvpn/privoxyvpn.hostname.yml b/compose/.apps/privoxyvpn/privoxyvpn.hostname.yml index 6a23c066f6..4dc53c3782 100644 --- a/compose/.apps/privoxyvpn/privoxyvpn.hostname.yml +++ b/compose/.apps/privoxyvpn/privoxyvpn.hostname.yml @@ -1,3 +1,3 @@ services: - privoxyvpn: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/privoxyvpn/privoxyvpn.labels.yml b/compose/.apps/privoxyvpn/privoxyvpn.labels.yml index f454e48d83..da22f35fe6 100644 --- a/compose/.apps/privoxyvpn/privoxyvpn.labels.yml +++ b/compose/.apps/privoxyvpn/privoxyvpn.labels.yml @@ -1,28 +1,28 @@ services: - privoxyvpn: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Privoxy, microsocks, OpenVPN, WireGuard" com.dockstarter.appinfo.nicename: "PrivoxyVPN" - com.dockstarter.appvars.privoxyvpn_container_name: "privoxyvpn" - com.dockstarter.appvars.privoxyvpn_enabled: "false" - com.dockstarter.appvars.privoxyvpn_environment_enable_privoxy: "no" - com.dockstarter.appvars.privoxyvpn_environment_enable_socks: "no" - com.dockstarter.appvars.privoxyvpn_environment_enable_startup_scripts: "" - com.dockstarter.appvars.privoxyvpn_environment_lan_network: "192.168.x.x/24" - com.dockstarter.appvars.privoxyvpn_environment_name_servers: "1.1.1.1,8.8.8.8" - com.dockstarter.appvars.privoxyvpn_environment_socks_pass: "your-socks-pass" - com.dockstarter.appvars.privoxyvpn_environment_socks_user: "your-socks-user" - com.dockstarter.appvars.privoxyvpn_environment_vpn_client: "openvpn" - com.dockstarter.appvars.privoxyvpn_environment_vpn_enable: "no" - com.dockstarter.appvars.privoxyvpn_environment_vpn_input_ports: "" - com.dockstarter.appvars.privoxyvpn_environment_vpn_options: "" - com.dockstarter.appvars.privoxyvpn_environment_vpn_output_ports: "" - com.dockstarter.appvars.privoxyvpn_environment_vpn_pass: "your-vpn-pass" - com.dockstarter.appvars.privoxyvpn_environment_vpn_prov: "custom" - com.dockstarter.appvars.privoxyvpn_environment_vpn_user: "your-vpn-user" - com.dockstarter.appvars.privoxyvpn_network_mode: "" - com.dockstarter.appvars.privoxyvpn_port_8118: "8118" - com.dockstarter.appvars.privoxyvpn_port_9118: "9118" - com.dockstarter.appvars.privoxyvpn_restart: "unless-stopped" - com.dockstarter.appvars.privoxyvpn_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_enable_privoxy: "no" + com.dockstarter.appvars.${_appname_}_environment_enable_socks: "no" + com.dockstarter.appvars.${_appname_}_environment_enable_startup_scripts: "" + com.dockstarter.appvars.${_appname_}_environment_lan_network: "192.168.x.x/24" + com.dockstarter.appvars.${_appname_}_environment_name_servers: "1.1.1.1,8.8.8.8" + com.dockstarter.appvars.${_appname_}_environment_socks_pass: "your-socks-pass" + com.dockstarter.appvars.${_appname_}_environment_socks_user: "your-socks-user" + com.dockstarter.appvars.${_appname_}_environment_vpn_client: "openvpn" + com.dockstarter.appvars.${_appname_}_environment_vpn_enable: "no" + com.dockstarter.appvars.${_appname_}_environment_vpn_input_ports: "" + com.dockstarter.appvars.${_appname_}_environment_vpn_options: "" + com.dockstarter.appvars.${_appname_}_environment_vpn_output_ports: "" + com.dockstarter.appvars.${_appname_}_environment_vpn_pass: "your-vpn-pass" + com.dockstarter.appvars.${_appname_}_environment_vpn_prov: "custom" + com.dockstarter.appvars.${_appname_}_environment_vpn_user: "your-vpn-user" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8118: "8118" + com.dockstarter.appvars.${_appname_}_port_9118: "9118" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/privoxyvpn/privoxyvpn.netmode.yml b/compose/.apps/privoxyvpn/privoxyvpn.netmode.yml index 428aeb86c7..f36884ffb9 100644 --- a/compose/.apps/privoxyvpn/privoxyvpn.netmode.yml +++ b/compose/.apps/privoxyvpn/privoxyvpn.netmode.yml @@ -1,3 +1,3 @@ services: - privoxyvpn: - network_mode: ${PRIVOXYVPN_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/privoxyvpn/privoxyvpn.ports.yml b/compose/.apps/privoxyvpn/privoxyvpn.ports.yml index aaaee0023f..22c6114395 100644 --- a/compose/.apps/privoxyvpn/privoxyvpn.ports.yml +++ b/compose/.apps/privoxyvpn/privoxyvpn.ports.yml @@ -1,5 +1,5 @@ services: - privoxyvpn: + ${_appname_}: ports: - - ${PRIVOXYVPN_PORT_8118}:8118 - - ${PRIVOXYVPN_PORT_9118}:9118 + - ${${_APPNAME_}_PORT_8118}:8118 + - ${${_APPNAME_}_PORT_9118}:9118 diff --git a/compose/.apps/privoxyvpn/privoxyvpn.x86_64.yml b/compose/.apps/privoxyvpn/privoxyvpn.x86_64.yml index 6d42522c00..19736f8c8c 100644 --- a/compose/.apps/privoxyvpn/privoxyvpn.x86_64.yml +++ b/compose/.apps/privoxyvpn/privoxyvpn.x86_64.yml @@ -1,3 +1,3 @@ services: - privoxyvpn: - image: ghcr.io/binhex/arch-privoxyvpn:${PRIVOXYVPN_TAG} + ${_appname_}: + image: ghcr.io/binhex/arch-privoxyvpn:${${_APPNAME_}_TAG} diff --git a/compose/.apps/privoxyvpn/privoxyvpn.yml b/compose/.apps/privoxyvpn/privoxyvpn.yml index e1833cbe7a..f435830ac0 100644 --- a/compose/.apps/privoxyvpn/privoxyvpn.yml +++ b/compose/.apps/privoxyvpn/privoxyvpn.yml @@ -1,35 +1,35 @@ services: - privoxyvpn: + ${_appname_}: cap_add: - NET_ADMIN - SYS_MODULE - container_name: ${PRIVOXYVPN_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} devices: - /dev/net/tun environment: - - ENABLE_PRIVOXY=${PRIVOXYVPN_ENVIRONMENT_ENABLE_PRIVOXY} - - ENABLE_SOCKS=${PRIVOXYVPN_ENVIRONMENT_ENABLE_SOCKS} - - ENABLE_STARTUP_SCRIPTS=${PRIVOXYVPN_ENVIRONMENT_ENABLE_STARTUP_SCRIPTS} - - LAN_NETWORK=${PRIVOXYVPN_ENVIRONMENT_LAN_NETWORK} - - NAME_SERVERS=${PRIVOXYVPN_ENVIRONMENT_NAME_SERVERS} + - ENABLE_PRIVOXY=${${_APPNAME_}_ENVIRONMENT_ENABLE_PRIVOXY} + - ENABLE_SOCKS=${${_APPNAME_}_ENVIRONMENT_ENABLE_SOCKS} + - ENABLE_STARTUP_SCRIPTS=${${_APPNAME_}_ENVIRONMENT_ENABLE_STARTUP_SCRIPTS} + - LAN_NETWORK=${${_APPNAME_}_ENVIRONMENT_LAN_NETWORK} + - NAME_SERVERS=${${_APPNAME_}_ENVIRONMENT_NAME_SERVERS} - PGID=${PGID} - PUID=${PUID} - - SOCKS_PASS=${PRIVOXYVPN_ENVIRONMENT_SOCKS_PASS} - - SOCKS_USER=${PRIVOXYVPN_ENVIRONMENT_SOCKS_USER} + - SOCKS_PASS=${${_APPNAME_}_ENVIRONMENT_SOCKS_PASS} + - SOCKS_USER=${${_APPNAME_}_ENVIRONMENT_SOCKS_USER} - TZ=${TZ} - - VPN_CLIENT=${PRIVOXYVPN_ENVIRONMENT_VPN_CLIENT} - - VPN_ENABLED=${PRIVOXYVPN_ENVIRONMENT_VPN_ENABLE} - - VPN_INPUT_PORTS=${PRIVOXYVPN_ENVIRONMENT_VPN_INPUT_PORTS} - - VPN_OPTIONS=${PRIVOXYVPN_ENVIRONMENT_VPN_OPTIONS} - - VPN_OUTPUT_PORTS=${PRIVOXYVPN_ENVIRONMENT_VPN_OUTPUT_PORTS} - - VPN_PASS=${PRIVOXYVPN_ENVIRONMENT_VPN_PASS} - - VPN_PROV=${PRIVOXYVPN_ENVIRONMENT_VPN_PROV} - - VPN_USER=${PRIVOXYVPN_ENVIRONMENT_VPN_USER} + - VPN_CLIENT=${${_APPNAME_}_ENVIRONMENT_VPN_CLIENT} + - VPN_ENABLED=${${_APPNAME_}_ENVIRONMENT_VPN_ENABLE} + - VPN_INPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_VPN_INPUT_PORTS} + - VPN_OPTIONS=${${_APPNAME_}_ENVIRONMENT_VPN_OPTIONS} + - VPN_OUTPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_VPN_OUTPUT_PORTS} + - VPN_PASS=${${_APPNAME_}_ENVIRONMENT_VPN_PASS} + - VPN_PROV=${${_APPNAME_}_ENVIRONMENT_VPN_PROV} + - VPN_USER=${${_APPNAME_}_ENVIRONMENT_VPN_USER} privileged: true - restart: ${PRIVOXYVPN_RESTART} + restart: ${${_APPNAME_}_RESTART} sysctls: - net.ipv4.conf.all.src_valid_mark=1 volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/privoxyvpn:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/prometheus/prometheus.hostname.yml b/compose/.apps/prometheus/prometheus.hostname.yml index 96af782de0..4dc53c3782 100644 --- a/compose/.apps/prometheus/prometheus.hostname.yml +++ b/compose/.apps/prometheus/prometheus.hostname.yml @@ -1,3 +1,3 @@ services: - prometheus: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/prometheus/prometheus.labels.yml b/compose/.apps/prometheus/prometheus.labels.yml index c1e47088f6..250e150cd8 100644 --- a/compose/.apps/prometheus/prometheus.labels.yml +++ b/compose/.apps/prometheus/prometheus.labels.yml @@ -1,12 +1,12 @@ services: - prometheus: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Prometheus is a systems and service monitoring system." com.dockstarter.appinfo.nicename: "Prometheus" - com.dockstarter.appvars.prometheus_container_name: "prometheus" - com.dockstarter.appvars.prometheus_enabled: "false" - com.dockstarter.appvars.prometheus_network_mode: "" - com.dockstarter.appvars.prometheus_port_9090: "9090" - com.dockstarter.appvars.prometheus_restart: "unless-stopped" - com.dockstarter.appvars.prometheus_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_9090: "9090" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/prometheus/prometheus.netmode.yml b/compose/.apps/prometheus/prometheus.netmode.yml index 21e187932f..f36884ffb9 100644 --- a/compose/.apps/prometheus/prometheus.netmode.yml +++ b/compose/.apps/prometheus/prometheus.netmode.yml @@ -1,3 +1,3 @@ services: - prometheus: - network_mode: ${PROMETHEUS_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/prometheus/prometheus.ports.yml b/compose/.apps/prometheus/prometheus.ports.yml index 8cbbdb6709..2b79952fa8 100644 --- a/compose/.apps/prometheus/prometheus.ports.yml +++ b/compose/.apps/prometheus/prometheus.ports.yml @@ -1,4 +1,4 @@ services: - prometheus: + ${_appname_}: ports: - - ${PROMETHEUS_PORT_9090}:9090 + - ${${_APPNAME_}_PORT_9090}:9090 diff --git a/compose/.apps/prometheus/prometheus.x86_64.yml b/compose/.apps/prometheus/prometheus.x86_64.yml index 2e6c0b5bd0..c52aabd8d0 100644 --- a/compose/.apps/prometheus/prometheus.x86_64.yml +++ b/compose/.apps/prometheus/prometheus.x86_64.yml @@ -1,3 +1,3 @@ services: - prometheus: - image: prom/prometheus:${PROMETHEUS_TAG} + ${_appname_}: + image: prom/prometheus:${${_APPNAME_}_TAG} diff --git a/compose/.apps/prometheus/prometheus.yml b/compose/.apps/prometheus/prometheus.yml index 0e5c896631..62f0e7509f 100644 --- a/compose/.apps/prometheus/prometheus.yml +++ b/compose/.apps/prometheus/prometheus.yml @@ -1,13 +1,13 @@ services: - prometheus: - container_name: ${PROMETHEUS_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${PROMETHEUS_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/prometheus/etc:/etc/prometheus - - ${DOCKER_VOLUME_CONFIG}/prometheus/data:/prometheus + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/etc:/etc/prometheus + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/data:/prometheus - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/prowlarr/prowlarr.aarch64.yml b/compose/.apps/prowlarr/prowlarr.aarch64.yml index 6e32735ee4..4e462e3b2f 100644 --- a/compose/.apps/prowlarr/prowlarr.aarch64.yml +++ b/compose/.apps/prowlarr/prowlarr.aarch64.yml @@ -1,3 +1,3 @@ services: - prowlarr: - image: lscr.io/linuxserver/prowlarr:${PROWLARR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/prowlarr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/prowlarr/prowlarr.hostname.yml b/compose/.apps/prowlarr/prowlarr.hostname.yml index 0547f75dca..4dc53c3782 100644 --- a/compose/.apps/prowlarr/prowlarr.hostname.yml +++ b/compose/.apps/prowlarr/prowlarr.hostname.yml @@ -1,3 +1,3 @@ services: - prowlarr: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/prowlarr/prowlarr.labels.yml b/compose/.apps/prowlarr/prowlarr.labels.yml index 2398147f39..5b0b3d3982 100644 --- a/compose/.apps/prowlarr/prowlarr.labels.yml +++ b/compose/.apps/prowlarr/prowlarr.labels.yml @@ -1,12 +1,12 @@ services: - prowlarr: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Indexer manager/proxy to integrate with your various PVR apps." com.dockstarter.appinfo.nicename: "Prowlarr" - com.dockstarter.appvars.prowlarr_container_name: "prowlarr" - com.dockstarter.appvars.prowlarr_enabled: "false" - com.dockstarter.appvars.prowlarr_network_mode: "" - com.dockstarter.appvars.prowlarr_port_9696: "9696" - com.dockstarter.appvars.prowlarr_restart: "unless-stopped" - com.dockstarter.appvars.prowlarr_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_9696: "9696" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/prowlarr/prowlarr.netmode.yml b/compose/.apps/prowlarr/prowlarr.netmode.yml index 4c0686bb78..f36884ffb9 100644 --- a/compose/.apps/prowlarr/prowlarr.netmode.yml +++ b/compose/.apps/prowlarr/prowlarr.netmode.yml @@ -1,3 +1,3 @@ services: - prowlarr: - network_mode: ${PROWLARR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/prowlarr/prowlarr.ports.yml b/compose/.apps/prowlarr/prowlarr.ports.yml index 87f0fcc2ed..cfab586339 100644 --- a/compose/.apps/prowlarr/prowlarr.ports.yml +++ b/compose/.apps/prowlarr/prowlarr.ports.yml @@ -1,4 +1,4 @@ services: - prowlarr: + ${_appname_}: ports: - - ${PROWLARR_PORT_9696}:9696 + - ${${_APPNAME_}_PORT_9696}:9696 diff --git a/compose/.apps/prowlarr/prowlarr.x86_64.yml b/compose/.apps/prowlarr/prowlarr.x86_64.yml index 6e32735ee4..4e462e3b2f 100644 --- a/compose/.apps/prowlarr/prowlarr.x86_64.yml +++ b/compose/.apps/prowlarr/prowlarr.x86_64.yml @@ -1,3 +1,3 @@ services: - prowlarr: - image: lscr.io/linuxserver/prowlarr:${PROWLARR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/prowlarr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/prowlarr/prowlarr.yml b/compose/.apps/prowlarr/prowlarr.yml index c74ceac4a3..ace6d5d0ab 100644 --- a/compose/.apps/prowlarr/prowlarr.yml +++ b/compose/.apps/prowlarr/prowlarr.yml @@ -1,12 +1,12 @@ services: - prowlarr: - container_name: ${PROWLARR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${PROWLARR_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/prowlarr:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/pyload/pyload.aarch64.yml b/compose/.apps/pyload/pyload.aarch64.yml index 20d844e150..d7732838fb 100644 --- a/compose/.apps/pyload/pyload.aarch64.yml +++ b/compose/.apps/pyload/pyload.aarch64.yml @@ -1,3 +1,3 @@ services: - pyload: - image: lscr.io/linuxserver/pyload-ng:${PYLOAD_TAG} + ${_appname_}: + image: lscr.io/linuxserver/pyload-ng:${${_APPNAME_}_TAG} diff --git a/compose/.apps/pyload/pyload.hostname.yml b/compose/.apps/pyload/pyload.hostname.yml index 6f540b17a8..4dc53c3782 100644 --- a/compose/.apps/pyload/pyload.hostname.yml +++ b/compose/.apps/pyload/pyload.hostname.yml @@ -1,3 +1,3 @@ services: - pyload: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/pyload/pyload.labels.yml b/compose/.apps/pyload/pyload.labels.yml index 120a4c88d6..43046a18a8 100644 --- a/compose/.apps/pyload/pyload.labels.yml +++ b/compose/.apps/pyload/pyload.labels.yml @@ -1,12 +1,12 @@ services: - pyload: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Python Download Manager" com.dockstarter.appinfo.nicename: "pyLoad" - com.dockstarter.appvars.pyload_container_name: "pyload" - com.dockstarter.appvars.pyload_enabled: "false" - com.dockstarter.appvars.pyload_network_mode: "" - com.dockstarter.appvars.pyload_port_8000: "8000" - com.dockstarter.appvars.pyload_restart: "unless-stopped" - com.dockstarter.appvars.pyload_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8000: "8000" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/pyload/pyload.netmode.yml b/compose/.apps/pyload/pyload.netmode.yml index 048e6f8dfa..f36884ffb9 100644 --- a/compose/.apps/pyload/pyload.netmode.yml +++ b/compose/.apps/pyload/pyload.netmode.yml @@ -1,3 +1,3 @@ services: - pyload: - network_mode: ${PYLOAD_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/pyload/pyload.ports.yml b/compose/.apps/pyload/pyload.ports.yml index 3e2297adbd..33070f8cee 100644 --- a/compose/.apps/pyload/pyload.ports.yml +++ b/compose/.apps/pyload/pyload.ports.yml @@ -1,4 +1,4 @@ services: - pyload: + ${_appname_}: ports: - - ${PYLOAD_PORT_8000}:8000 + - ${${_APPNAME_}_PORT_8000}:8000 diff --git a/compose/.apps/pyload/pyload.x86_64.yml b/compose/.apps/pyload/pyload.x86_64.yml index 20d844e150..d7732838fb 100644 --- a/compose/.apps/pyload/pyload.x86_64.yml +++ b/compose/.apps/pyload/pyload.x86_64.yml @@ -1,3 +1,3 @@ services: - pyload: - image: lscr.io/linuxserver/pyload-ng:${PYLOAD_TAG} + ${_appname_}: + image: lscr.io/linuxserver/pyload-ng:${${_APPNAME_}_TAG} diff --git a/compose/.apps/pyload/pyload.yml b/compose/.apps/pyload/pyload.yml index ffed42b972..ace6d5d0ab 100644 --- a/compose/.apps/pyload/pyload.yml +++ b/compose/.apps/pyload/pyload.yml @@ -1,12 +1,12 @@ services: - pyload: - container_name: ${PYLOAD_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${PYLOAD_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/pyload:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/qbittorrent/qbittorrent.aarch64.yml b/compose/.apps/qbittorrent/qbittorrent.aarch64.yml index 82a9f611e9..a18697ae34 100644 --- a/compose/.apps/qbittorrent/qbittorrent.aarch64.yml +++ b/compose/.apps/qbittorrent/qbittorrent.aarch64.yml @@ -1,3 +1,3 @@ services: - qbittorrent: - image: lscr.io/linuxserver/qbittorrent:${QBITTORRENT_TAG} + ${_appname_}: + image: lscr.io/linuxserver/qbittorrent:${${_APPNAME_}_TAG} diff --git a/compose/.apps/qbittorrent/qbittorrent.hostname.yml b/compose/.apps/qbittorrent/qbittorrent.hostname.yml index 8f3b64f0b4..4dc53c3782 100644 --- a/compose/.apps/qbittorrent/qbittorrent.hostname.yml +++ b/compose/.apps/qbittorrent/qbittorrent.hostname.yml @@ -1,3 +1,3 @@ services: - qbittorrent: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/qbittorrent/qbittorrent.labels.yml b/compose/.apps/qbittorrent/qbittorrent.labels.yml index 5a84e1cfcc..ad92bb545e 100644 --- a/compose/.apps/qbittorrent/qbittorrent.labels.yml +++ b/compose/.apps/qbittorrent/qbittorrent.labels.yml @@ -1,14 +1,14 @@ services: - qbittorrent: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Cross-platform free and open-source BitTorrent client" com.dockstarter.appinfo.nicename: "qBittorrent" - com.dockstarter.appvars.qbittorrent_container_name: "qbittorrent" - com.dockstarter.appvars.qbittorrent_enabled: "false" - com.dockstarter.appvars.qbittorrent_network_mode: "" - com.dockstarter.appvars.qbittorrent_port_51413: "51413" - com.dockstarter.appvars.qbittorrent_port_6881: "6881" - com.dockstarter.appvars.qbittorrent_port_8080: "8080" - com.dockstarter.appvars.qbittorrent_restart: "unless-stopped" - com.dockstarter.appvars.qbittorrent_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_51413: "51413" + com.dockstarter.appvars.${_appname_}_port_6881: "6881" + com.dockstarter.appvars.${_appname_}_port_8080: "8080" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/qbittorrent/qbittorrent.netmode.yml b/compose/.apps/qbittorrent/qbittorrent.netmode.yml index 3515de033b..f36884ffb9 100644 --- a/compose/.apps/qbittorrent/qbittorrent.netmode.yml +++ b/compose/.apps/qbittorrent/qbittorrent.netmode.yml @@ -1,3 +1,3 @@ services: - qbittorrent: - network_mode: ${QBITTORRENT_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/qbittorrent/qbittorrent.ports.yml b/compose/.apps/qbittorrent/qbittorrent.ports.yml index e71d7f9a06..aebc2b1f31 100644 --- a/compose/.apps/qbittorrent/qbittorrent.ports.yml +++ b/compose/.apps/qbittorrent/qbittorrent.ports.yml @@ -1,8 +1,8 @@ services: - qbittorrent: + ${_appname_}: ports: - - ${QBITTORRENT_PORT_51413}:51413 - - ${QBITTORRENT_PORT_51413}:51413/udp - - ${QBITTORRENT_PORT_6881}:6881 - - ${QBITTORRENT_PORT_6881}:6881/udp - - ${QBITTORRENT_PORT_8080}:${QBITTORRENT_PORT_8080} + - ${${_APPNAME_}_PORT_51413}:51413 + - ${${_APPNAME_}_PORT_51413}:51413/udp + - ${${_APPNAME_}_PORT_6881}:6881 + - ${${_APPNAME_}_PORT_6881}:6881/udp + - ${${_APPNAME_}_PORT_8080}:${${_APPNAME_}_PORT_8080} diff --git a/compose/.apps/qbittorrent/qbittorrent.x86_64.yml b/compose/.apps/qbittorrent/qbittorrent.x86_64.yml index 82a9f611e9..a18697ae34 100644 --- a/compose/.apps/qbittorrent/qbittorrent.x86_64.yml +++ b/compose/.apps/qbittorrent/qbittorrent.x86_64.yml @@ -1,3 +1,3 @@ services: - qbittorrent: - image: lscr.io/linuxserver/qbittorrent:${QBITTORRENT_TAG} + ${_appname_}: + image: lscr.io/linuxserver/qbittorrent:${${_APPNAME_}_TAG} diff --git a/compose/.apps/qbittorrent/qbittorrent.yml b/compose/.apps/qbittorrent/qbittorrent.yml index e6d3d7922c..fb26c15768 100644 --- a/compose/.apps/qbittorrent/qbittorrent.yml +++ b/compose/.apps/qbittorrent/qbittorrent.yml @@ -1,13 +1,13 @@ services: - qbittorrent: - container_name: ${QBITTORRENT_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - WEBUI_PORT=${QBITTORRENT_PORT_8080} - restart: ${QBITTORRENT_RESTART} + - WEBUI_PORT=${${_APPNAME_}_PORT_8080} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/qbittorrent:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/qbittorrentvpn/qbittorrentvpn.aarch64.yml b/compose/.apps/qbittorrentvpn/qbittorrentvpn.aarch64.yml index 7abdc385e4..273e4467df 100644 --- a/compose/.apps/qbittorrentvpn/qbittorrentvpn.aarch64.yml +++ b/compose/.apps/qbittorrentvpn/qbittorrentvpn.aarch64.yml @@ -1,3 +1,3 @@ services: - qbittorrentvpn: - image: ghcr.io/binhex/arch-qbittorrentvpn:${QBITTORRENTVPN_TAG} + ${_appname_}: + image: ghcr.io/binhex/arch-qbittorrentvpn:${${_APPNAME_}_TAG} diff --git a/compose/.apps/qbittorrentvpn/qbittorrentvpn.hostname.yml b/compose/.apps/qbittorrentvpn/qbittorrentvpn.hostname.yml index 75aa27bef3..4dc53c3782 100644 --- a/compose/.apps/qbittorrentvpn/qbittorrentvpn.hostname.yml +++ b/compose/.apps/qbittorrentvpn/qbittorrentvpn.hostname.yml @@ -1,3 +1,3 @@ services: - qbittorrentvpn: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/qbittorrentvpn/qbittorrentvpn.labels.yml b/compose/.apps/qbittorrentvpn/qbittorrentvpn.labels.yml index 23776f7efc..847fa296f0 100644 --- a/compose/.apps/qbittorrentvpn/qbittorrentvpn.labels.yml +++ b/compose/.apps/qbittorrentvpn/qbittorrentvpn.labels.yml @@ -1,25 +1,25 @@ services: - qbittorrentvpn: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "qBittorrent PrivoxyVPN" com.dockstarter.appinfo.nicename: "qBittorrentVPN" - com.dockstarter.appvars.qbittorrentvpn_container_name: "qbittorrentvpn" - com.dockstarter.appvars.qbittorrentvpn_enabled: "false" - com.dockstarter.appvars.qbittorrentvpn_environment_enable_privoxy: "no" - com.dockstarter.appvars.qbittorrentvpn_environment_lan_network: "192.168.x.x/24" - com.dockstarter.appvars.qbittorrentvpn_environment_name_servers: "1.1.1.1,8.8.8.8" - com.dockstarter.appvars.qbittorrentvpn_environment_vpn_client: "openvpn" - com.dockstarter.appvars.qbittorrentvpn_environment_vpn_enable: "no" - com.dockstarter.appvars.qbittorrentvpn_environment_vpn_input_ports: "" - com.dockstarter.appvars.qbittorrentvpn_environment_vpn_options: "" - com.dockstarter.appvars.qbittorrentvpn_environment_vpn_output_ports: "" - com.dockstarter.appvars.qbittorrentvpn_environment_vpn_pass: "your-vpn-pass" - com.dockstarter.appvars.qbittorrentvpn_environment_vpn_prov: "custom" - com.dockstarter.appvars.qbittorrentvpn_environment_vpn_user: "your-vpn-user" - com.dockstarter.appvars.qbittorrentvpn_network_mode: "" - com.dockstarter.appvars.qbittorrentvpn_port_6881: "6881" - com.dockstarter.appvars.qbittorrentvpn_port_8080: "8080" - com.dockstarter.appvars.qbittorrentvpn_port_8118: "8118" - com.dockstarter.appvars.qbittorrentvpn_restart: "unless-stopped" - com.dockstarter.appvars.qbittorrentvpn_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_enable_privoxy: "no" + com.dockstarter.appvars.${_appname_}_environment_lan_network: "192.168.x.x/24" + com.dockstarter.appvars.${_appname_}_environment_name_servers: "1.1.1.1,8.8.8.8" + com.dockstarter.appvars.${_appname_}_environment_vpn_client: "openvpn" + com.dockstarter.appvars.${_appname_}_environment_vpn_enable: "no" + com.dockstarter.appvars.${_appname_}_environment_vpn_input_ports: "" + com.dockstarter.appvars.${_appname_}_environment_vpn_options: "" + com.dockstarter.appvars.${_appname_}_environment_vpn_output_ports: "" + com.dockstarter.appvars.${_appname_}_environment_vpn_pass: "your-vpn-pass" + com.dockstarter.appvars.${_appname_}_environment_vpn_prov: "custom" + com.dockstarter.appvars.${_appname_}_environment_vpn_user: "your-vpn-user" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_6881: "6881" + com.dockstarter.appvars.${_appname_}_port_8080: "8080" + com.dockstarter.appvars.${_appname_}_port_8118: "8118" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/qbittorrentvpn/qbittorrentvpn.netmode.yml b/compose/.apps/qbittorrentvpn/qbittorrentvpn.netmode.yml index 8de0d491dd..f36884ffb9 100644 --- a/compose/.apps/qbittorrentvpn/qbittorrentvpn.netmode.yml +++ b/compose/.apps/qbittorrentvpn/qbittorrentvpn.netmode.yml @@ -1,3 +1,3 @@ services: - qbittorrentvpn: - network_mode: ${QBITTORRENTVPN_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/qbittorrentvpn/qbittorrentvpn.ports.yml b/compose/.apps/qbittorrentvpn/qbittorrentvpn.ports.yml index 7f8876087a..ed71a27543 100644 --- a/compose/.apps/qbittorrentvpn/qbittorrentvpn.ports.yml +++ b/compose/.apps/qbittorrentvpn/qbittorrentvpn.ports.yml @@ -1,7 +1,7 @@ services: - qbittorrentvpn: + ${_appname_}: ports: - - ${QBITTORRENTVPN_PORT_6881}:6881 - - ${QBITTORRENTVPN_PORT_6881}:6881/udp - - ${QBITTORRENTVPN_PORT_8080}:${QBITTORRENTVPN_PORT_8080} - - ${QBITTORRENTVPN_PORT_8118}:8118 + - ${${_APPNAME_}_PORT_6881}:6881 + - ${${_APPNAME_}_PORT_6881}:6881/udp + - ${${_APPNAME_}_PORT_8080}:${${_APPNAME_}_PORT_8080} + - ${${_APPNAME_}_PORT_8118}:8118 diff --git a/compose/.apps/qbittorrentvpn/qbittorrentvpn.x86_64.yml b/compose/.apps/qbittorrentvpn/qbittorrentvpn.x86_64.yml index 7abdc385e4..273e4467df 100644 --- a/compose/.apps/qbittorrentvpn/qbittorrentvpn.x86_64.yml +++ b/compose/.apps/qbittorrentvpn/qbittorrentvpn.x86_64.yml @@ -1,3 +1,3 @@ services: - qbittorrentvpn: - image: ghcr.io/binhex/arch-qbittorrentvpn:${QBITTORRENTVPN_TAG} + ${_appname_}: + image: ghcr.io/binhex/arch-qbittorrentvpn:${${_APPNAME_}_TAG} diff --git a/compose/.apps/qbittorrentvpn/qbittorrentvpn.yml b/compose/.apps/qbittorrentvpn/qbittorrentvpn.yml index fc3cb81e57..30724c89db 100644 --- a/compose/.apps/qbittorrentvpn/qbittorrentvpn.yml +++ b/compose/.apps/qbittorrentvpn/qbittorrentvpn.yml @@ -1,30 +1,30 @@ services: - qbittorrentvpn: + ${_appname_}: cap_add: - NET_ADMIN - SYS_MODULE - container_name: ${QBITTORRENTVPN_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - ENABLE_PRIVOXY=${QBITTORRENTVPN_ENVIRONMENT_ENABLE_PRIVOXY} - - LAN_NETWORK=${QBITTORRENTVPN_ENVIRONMENT_LAN_NETWORK} - - NAME_SERVERS=${QBITTORRENTVPN_ENVIRONMENT_NAME_SERVERS} + - ENABLE_PRIVOXY=${${_APPNAME_}_ENVIRONMENT_ENABLE_PRIVOXY} + - LAN_NETWORK=${${_APPNAME_}_ENVIRONMENT_LAN_NETWORK} + - NAME_SERVERS=${${_APPNAME_}_ENVIRONMENT_NAME_SERVERS} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - VPN_CLIENT=${QBITTORRENTVPN_ENVIRONMENT_VPN_CLIENT} - - VPN_ENABLED=${QBITTORRENTVPN_ENVIRONMENT_VPN_ENABLE} - - VPN_INPUT_PORTS=${QBITTORRENTVPN_ENVIRONMENT_VPN_INPUT_PORTS} - - VPN_OPTIONS=${QBITTORRENTVPN_ENVIRONMENT_VPN_OPTIONS} - - VPN_OUTPUT_PORTS=${QBITTORRENTVPN_ENVIRONMENT_VPN_OUTPUT_PORTS} - - VPN_PASS=${QBITTORRENTVPN_ENVIRONMENT_VPN_PASS} - - VPN_PROV=${QBITTORRENTVPN_ENVIRONMENT_VPN_PROV} - - VPN_USER=${QBITTORRENTVPN_ENVIRONMENT_VPN_USER} - - WEBUI_PORT=${QBITTORRENTVPN_PORT_8080} + - VPN_CLIENT=${${_APPNAME_}_ENVIRONMENT_VPN_CLIENT} + - VPN_ENABLED=${${_APPNAME_}_ENVIRONMENT_VPN_ENABLE} + - VPN_INPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_VPN_INPUT_PORTS} + - VPN_OPTIONS=${${_APPNAME_}_ENVIRONMENT_VPN_OPTIONS} + - VPN_OUTPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_VPN_OUTPUT_PORTS} + - VPN_PASS=${${_APPNAME_}_ENVIRONMENT_VPN_PASS} + - VPN_PROV=${${_APPNAME_}_ENVIRONMENT_VPN_PROV} + - VPN_USER=${${_APPNAME_}_ENVIRONMENT_VPN_USER} + - WEBUI_PORT=${${_APPNAME_}_PORT_8080} privileged: true - restart: ${QBITTORRENTVPN_RESTART} + restart: ${${_APPNAME_}_RESTART} sysctls: - net.ipv4.conf.all.src_valid_mark=1 volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/qbittorrentvpn:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/quasselcore/quasselcore.aarch64.yml b/compose/.apps/quasselcore/quasselcore.aarch64.yml index a1fd821c79..f4aa36bc85 100644 --- a/compose/.apps/quasselcore/quasselcore.aarch64.yml +++ b/compose/.apps/quasselcore/quasselcore.aarch64.yml @@ -1,3 +1,3 @@ services: - quasselcore: - image: lscr.io/linuxserver/quassel-core:${QUASSELCORE_TAG} + ${_appname_}: + image: lscr.io/linuxserver/quassel-core:${${_APPNAME_}_TAG} diff --git a/compose/.apps/quasselcore/quasselcore.hostname.yml b/compose/.apps/quasselcore/quasselcore.hostname.yml index 6c1af2c968..4dc53c3782 100644 --- a/compose/.apps/quasselcore/quasselcore.hostname.yml +++ b/compose/.apps/quasselcore/quasselcore.hostname.yml @@ -1,3 +1,3 @@ services: - quasselcore: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/quasselcore/quasselcore.labels.yml b/compose/.apps/quasselcore/quasselcore.labels.yml index b2825a7e51..911457a841 100644 --- a/compose/.apps/quasselcore/quasselcore.labels.yml +++ b/compose/.apps/quasselcore/quasselcore.labels.yml @@ -1,13 +1,13 @@ services: - quasselcore: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Modern, cross-platform, distributed IRC client" com.dockstarter.appinfo.nicename: "QuasselCore" - com.dockstarter.appvars.quasselcore_container_name: "quasselcore" - com.dockstarter.appvars.quasselcore_enabled: "false" - com.dockstarter.appvars.quasselcore_network_mode: "" - com.dockstarter.appvars.quasselcore_port_10113: "10113" - com.dockstarter.appvars.quasselcore_port_4242: "4242" - com.dockstarter.appvars.quasselcore_restart: "unless-stopped" - com.dockstarter.appvars.quasselcore_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_10113: "10113" + com.dockstarter.appvars.${_appname_}_port_4242: "4242" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/quasselcore/quasselcore.netmode.yml b/compose/.apps/quasselcore/quasselcore.netmode.yml index 4f4fc1d4a5..f36884ffb9 100644 --- a/compose/.apps/quasselcore/quasselcore.netmode.yml +++ b/compose/.apps/quasselcore/quasselcore.netmode.yml @@ -1,3 +1,3 @@ services: - quasselcore: - network_mode: ${QUASSELCORE_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/quasselcore/quasselcore.ports.yml b/compose/.apps/quasselcore/quasselcore.ports.yml index d56593d6ca..8c2a81491a 100644 --- a/compose/.apps/quasselcore/quasselcore.ports.yml +++ b/compose/.apps/quasselcore/quasselcore.ports.yml @@ -1,5 +1,5 @@ services: - quasselcore: + ${_appname_}: ports: - - ${QUASSELCORE_PORT_10113}:10113 - - ${QUASSELCORE_PORT_4242}:4242 + - ${${_APPNAME_}_PORT_10113}:10113 + - ${${_APPNAME_}_PORT_4242}:4242 diff --git a/compose/.apps/quasselcore/quasselcore.x86_64.yml b/compose/.apps/quasselcore/quasselcore.x86_64.yml index a1fd821c79..f4aa36bc85 100644 --- a/compose/.apps/quasselcore/quasselcore.x86_64.yml +++ b/compose/.apps/quasselcore/quasselcore.x86_64.yml @@ -1,3 +1,3 @@ services: - quasselcore: - image: lscr.io/linuxserver/quassel-core:${QUASSELCORE_TAG} + ${_appname_}: + image: lscr.io/linuxserver/quassel-core:${${_APPNAME_}_TAG} diff --git a/compose/.apps/quasselcore/quasselcore.yml b/compose/.apps/quasselcore/quasselcore.yml index b6ab70beff..ace6d5d0ab 100644 --- a/compose/.apps/quasselcore/quasselcore.yml +++ b/compose/.apps/quasselcore/quasselcore.yml @@ -1,12 +1,12 @@ services: - quasselcore: - container_name: ${QUASSELCORE_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${QUASSELCORE_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/quasselcore:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/quasselweb/quasselweb.aarch64.yml b/compose/.apps/quasselweb/quasselweb.aarch64.yml index 5449acb5bf..b45507b6ce 100644 --- a/compose/.apps/quasselweb/quasselweb.aarch64.yml +++ b/compose/.apps/quasselweb/quasselweb.aarch64.yml @@ -1,3 +1,3 @@ services: - quasselweb: - image: lscr.io/linuxserver/quassel-web:${QUASSELWEB_TAG} + ${_appname_}: + image: lscr.io/linuxserver/quassel-web:${${_APPNAME_}_TAG} diff --git a/compose/.apps/quasselweb/quasselweb.hostname.yml b/compose/.apps/quasselweb/quasselweb.hostname.yml index 82865f7703..4dc53c3782 100644 --- a/compose/.apps/quasselweb/quasselweb.hostname.yml +++ b/compose/.apps/quasselweb/quasselweb.hostname.yml @@ -1,3 +1,3 @@ services: - quasselweb: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/quasselweb/quasselweb.labels.yml b/compose/.apps/quasselweb/quasselweb.labels.yml index 0947490d56..3365a3bab1 100644 --- a/compose/.apps/quasselweb/quasselweb.labels.yml +++ b/compose/.apps/quasselweb/quasselweb.labels.yml @@ -1,17 +1,17 @@ services: - quasselweb: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Web client for Quassel. A Quassel-Core instance is required" com.dockstarter.appinfo.nicename: "QuasselWeb" - com.dockstarter.appvars.quasselweb_container_name: "quasselweb" - com.dockstarter.appvars.quasselweb_enabled: "false" - com.dockstarter.appvars.quasselweb_environment_quassel_core: "quasselcore" - com.dockstarter.appvars.quasselweb_environment_quassel_https: "" - com.dockstarter.appvars.quasselweb_environment_quassel_port: "4242" - com.dockstarter.appvars.quasselweb_environment_url_base: "/quassel" - com.dockstarter.appvars.quasselweb_network_mode: "" - com.dockstarter.appvars.quasselweb_port_64080: "64080" - com.dockstarter.appvars.quasselweb_port_64443: "64443" - com.dockstarter.appvars.quasselweb_restart: "unless-stopped" - com.dockstarter.appvars.quasselweb_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_quassel_core: "quasselcore" + com.dockstarter.appvars.${_appname_}_environment_quassel_https: "" + com.dockstarter.appvars.${_appname_}_environment_quassel_port: "4242" + com.dockstarter.appvars.${_appname_}_environment_url_base: "/quassel" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_64080: "64080" + com.dockstarter.appvars.${_appname_}_port_64443: "64443" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/quasselweb/quasselweb.netmode.yml b/compose/.apps/quasselweb/quasselweb.netmode.yml index 367add0aec..f36884ffb9 100644 --- a/compose/.apps/quasselweb/quasselweb.netmode.yml +++ b/compose/.apps/quasselweb/quasselweb.netmode.yml @@ -1,3 +1,3 @@ services: - quasselweb: - network_mode: ${QUASSELWEB_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/quasselweb/quasselweb.ports.yml b/compose/.apps/quasselweb/quasselweb.ports.yml index 1216e0ba0e..323d3de899 100644 --- a/compose/.apps/quasselweb/quasselweb.ports.yml +++ b/compose/.apps/quasselweb/quasselweb.ports.yml @@ -1,5 +1,5 @@ services: - quasselweb: + ${_appname_}: ports: - - ${QUASSELWEB_PORT_64080}:64080 - - ${QUASSELWEB_PORT_64443}:64443 + - ${${_APPNAME_}_PORT_64080}:64080 + - ${${_APPNAME_}_PORT_64443}:64443 diff --git a/compose/.apps/quasselweb/quasselweb.x86_64.yml b/compose/.apps/quasselweb/quasselweb.x86_64.yml index 5449acb5bf..b45507b6ce 100644 --- a/compose/.apps/quasselweb/quasselweb.x86_64.yml +++ b/compose/.apps/quasselweb/quasselweb.x86_64.yml @@ -1,3 +1,3 @@ services: - quasselweb: - image: lscr.io/linuxserver/quassel-web:${QUASSELWEB_TAG} + ${_appname_}: + image: lscr.io/linuxserver/quassel-web:${${_APPNAME_}_TAG} diff --git a/compose/.apps/quasselweb/quasselweb.yml b/compose/.apps/quasselweb/quasselweb.yml index 36ca6f47a7..09cb5bb717 100644 --- a/compose/.apps/quasselweb/quasselweb.yml +++ b/compose/.apps/quasselweb/quasselweb.yml @@ -1,16 +1,16 @@ services: - quasselweb: - container_name: ${QUASSELWEB_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - - QUASSEL_CORE=${QUASSELWEB_ENVIRONMENT_QUASSEL_CORE} - - QUASSEL_HTTPS=${QUASSELWEB_ENVIRONMENT_QUASSEL_HTTPS} - - QUASSEL_PORT=${QUASSELWEB_ENVIRONMENT_QUASSEL_PORT} + - QUASSEL_CORE=${${_APPNAME_}_ENVIRONMENT_QUASSEL_CORE} + - QUASSEL_HTTPS=${${_APPNAME_}_ENVIRONMENT_QUASSEL_HTTPS} + - QUASSEL_PORT=${${_APPNAME_}_ENVIRONMENT_QUASSEL_PORT} - TZ=${TZ} - - URL_BASE=${QUASSELWEB_ENVIRONMENT_URL_BASE} - restart: ${QUASSELWEB_RESTART} + - URL_BASE=${${_APPNAME_}_ENVIRONMENT_URL_BASE} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/quasselweb:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/radarr/radarr.aarch64.yml b/compose/.apps/radarr/radarr.aarch64.yml index 1e5cc7175e..a7da28b768 100644 --- a/compose/.apps/radarr/radarr.aarch64.yml +++ b/compose/.apps/radarr/radarr.aarch64.yml @@ -1,3 +1,3 @@ services: - radarr: - image: lscr.io/linuxserver/radarr:${RADARR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/radarr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/radarr/radarr.hostname.yml b/compose/.apps/radarr/radarr.hostname.yml index d3c311f920..4dc53c3782 100644 --- a/compose/.apps/radarr/radarr.hostname.yml +++ b/compose/.apps/radarr/radarr.hostname.yml @@ -1,3 +1,3 @@ services: - radarr: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/radarr/radarr.labels.yml b/compose/.apps/radarr/radarr.labels.yml index 0bab641862..06e9299ea9 100644 --- a/compose/.apps/radarr/radarr.labels.yml +++ b/compose/.apps/radarr/radarr.labels.yml @@ -1,12 +1,12 @@ services: - radarr: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Automatically download movies via Usenet and BitTorrent" com.dockstarter.appinfo.nicename: "Radarr" - com.dockstarter.appvars.radarr_container_name: "radarr" - com.dockstarter.appvars.radarr_enabled: "false" - com.dockstarter.appvars.radarr_network_mode: "" - com.dockstarter.appvars.radarr_port_7878: "7878" - com.dockstarter.appvars.radarr_restart: "unless-stopped" - com.dockstarter.appvars.radarr_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_7878: "7878" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/radarr/radarr.netmode.yml b/compose/.apps/radarr/radarr.netmode.yml index 12ff7d4bde..f36884ffb9 100644 --- a/compose/.apps/radarr/radarr.netmode.yml +++ b/compose/.apps/radarr/radarr.netmode.yml @@ -1,3 +1,3 @@ services: - radarr: - network_mode: ${RADARR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/radarr/radarr.ports.yml b/compose/.apps/radarr/radarr.ports.yml index 1900eb2a4d..5530f94f09 100644 --- a/compose/.apps/radarr/radarr.ports.yml +++ b/compose/.apps/radarr/radarr.ports.yml @@ -1,4 +1,4 @@ services: - radarr: + ${_appname_}: ports: - - ${RADARR_PORT_7878}:7878 + - ${${_APPNAME_}_PORT_7878}:7878 diff --git a/compose/.apps/radarr/radarr.x86_64.yml b/compose/.apps/radarr/radarr.x86_64.yml index 1e5cc7175e..a7da28b768 100644 --- a/compose/.apps/radarr/radarr.x86_64.yml +++ b/compose/.apps/radarr/radarr.x86_64.yml @@ -1,3 +1,3 @@ services: - radarr: - image: lscr.io/linuxserver/radarr:${RADARR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/radarr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/radarr/radarr.yml b/compose/.apps/radarr/radarr.yml index f5b1409c68..ace6d5d0ab 100644 --- a/compose/.apps/radarr/radarr.yml +++ b/compose/.apps/radarr/radarr.yml @@ -1,12 +1,12 @@ services: - radarr: - container_name: ${RADARR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${RADARR_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/radarr:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/readarr/readarr.aarch64.yml b/compose/.apps/readarr/readarr.aarch64.yml index 7639a20ebd..82ec2fdd04 100644 --- a/compose/.apps/readarr/readarr.aarch64.yml +++ b/compose/.apps/readarr/readarr.aarch64.yml @@ -1,3 +1,3 @@ services: - readarr: - image: lscr.io/linuxserver/readarr:${READARR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/readarr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/readarr/readarr.hostname.yml b/compose/.apps/readarr/readarr.hostname.yml index bc518a7666..4dc53c3782 100644 --- a/compose/.apps/readarr/readarr.hostname.yml +++ b/compose/.apps/readarr/readarr.hostname.yml @@ -1,3 +1,3 @@ services: - readarr: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/readarr/readarr.labels.yml b/compose/.apps/readarr/readarr.labels.yml index ff1ee32977..ff45abc745 100644 --- a/compose/.apps/readarr/readarr.labels.yml +++ b/compose/.apps/readarr/readarr.labels.yml @@ -1,12 +1,12 @@ services: - readarr: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "eBook and audiobook collection manager for Usenet and BitTorrent users." com.dockstarter.appinfo.nicename: "Readarr" - com.dockstarter.appvars.readarr_container_name: "readarr" - com.dockstarter.appvars.readarr_enabled: "false" - com.dockstarter.appvars.readarr_network_mode: "" - com.dockstarter.appvars.readarr_port_8787: "8787" - com.dockstarter.appvars.readarr_restart: "unless-stopped" - com.dockstarter.appvars.readarr_tag: "develop" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8787: "8787" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "develop" diff --git a/compose/.apps/readarr/readarr.netmode.yml b/compose/.apps/readarr/readarr.netmode.yml index 36c52fb9d3..f36884ffb9 100644 --- a/compose/.apps/readarr/readarr.netmode.yml +++ b/compose/.apps/readarr/readarr.netmode.yml @@ -1,3 +1,3 @@ services: - readdarr: - network_mode: ${READARR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/readarr/readarr.ports.yml b/compose/.apps/readarr/readarr.ports.yml index d0697e9d0a..23c79b663a 100644 --- a/compose/.apps/readarr/readarr.ports.yml +++ b/compose/.apps/readarr/readarr.ports.yml @@ -1,4 +1,4 @@ services: - readarr: + ${_appname_}: ports: - - ${READARR_PORT_8787}:8787 + - ${${_APPNAME_}_PORT_8787}:8787 diff --git a/compose/.apps/readarr/readarr.x86_64.yml b/compose/.apps/readarr/readarr.x86_64.yml index 7639a20ebd..82ec2fdd04 100644 --- a/compose/.apps/readarr/readarr.x86_64.yml +++ b/compose/.apps/readarr/readarr.x86_64.yml @@ -1,3 +1,3 @@ services: - readarr: - image: lscr.io/linuxserver/readarr:${READARR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/readarr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/readarr/readarr.yml b/compose/.apps/readarr/readarr.yml index 818e65b921..ace6d5d0ab 100644 --- a/compose/.apps/readarr/readarr.yml +++ b/compose/.apps/readarr/readarr.yml @@ -1,12 +1,12 @@ services: - readarr: - container_name: ${READARR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${READARR_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/readarr:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/recyclarr/recyclarr.aarch64.yml b/compose/.apps/recyclarr/recyclarr.aarch64.yml index 3e770c47f2..66c9b3e716 100644 --- a/compose/.apps/recyclarr/recyclarr.aarch64.yml +++ b/compose/.apps/recyclarr/recyclarr.aarch64.yml @@ -1,3 +1,3 @@ services: - recyclarr: - image: ghcr.io/recyclarr/recyclarr:${RECYCLARR_TAG} + ${_appname_}: + image: ghcr.io/recyclarr/recyclarr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/recyclarr/recyclarr.hostname.yml b/compose/.apps/recyclarr/recyclarr.hostname.yml index aebcd4acb6..4dc53c3782 100644 --- a/compose/.apps/recyclarr/recyclarr.hostname.yml +++ b/compose/.apps/recyclarr/recyclarr.hostname.yml @@ -1,3 +1,3 @@ services: - recyclarr: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/recyclarr/recyclarr.labels.yml b/compose/.apps/recyclarr/recyclarr.labels.yml index 53bee5a32b..101ff41e8e 100644 --- a/compose/.apps/recyclarr/recyclarr.labels.yml +++ b/compose/.apps/recyclarr/recyclarr.labels.yml @@ -1,12 +1,12 @@ services: - recyclarr: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Application to synchronize settings from the TRaSH guides to your Sonarr/Radarr instances" com.dockstarter.appinfo.nicename: "Recyclarr" - com.dockstarter.appvars.recyclarr_container_name: "recyclarr" - com.dockstarter.appvars.recyclarr_enabled: "false" - com.dockstarter.appvars.recyclarr_environment_create_config: "true" - com.dockstarter.appvars.recyclarr_network_mode: "" - com.dockstarter.appvars.recyclarr_restart: "unless-stopped" - com.dockstarter.appvars.recyclarr_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_create_config: "true" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/recyclarr/recyclarr.netmode.yml b/compose/.apps/recyclarr/recyclarr.netmode.yml index 244b887f24..f36884ffb9 100644 --- a/compose/.apps/recyclarr/recyclarr.netmode.yml +++ b/compose/.apps/recyclarr/recyclarr.netmode.yml @@ -1,3 +1,3 @@ services: - recyclarr: - network_mode: ${RECYCLARR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/recyclarr/recyclarr.x86_64.yml b/compose/.apps/recyclarr/recyclarr.x86_64.yml index 3e770c47f2..66c9b3e716 100644 --- a/compose/.apps/recyclarr/recyclarr.x86_64.yml +++ b/compose/.apps/recyclarr/recyclarr.x86_64.yml @@ -1,3 +1,3 @@ services: - recyclarr: - image: ghcr.io/recyclarr/recyclarr:${RECYCLARR_TAG} + ${_appname_}: + image: ghcr.io/recyclarr/recyclarr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/recyclarr/recyclarr.yml b/compose/.apps/recyclarr/recyclarr.yml index cfca481bea..773de347d7 100644 --- a/compose/.apps/recyclarr/recyclarr.yml +++ b/compose/.apps/recyclarr/recyclarr.yml @@ -1,12 +1,12 @@ services: - recyclarr: - container_name: ${RECYCLARR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - RECYCLARR_CREATE_CONFIG=${RECYCLARR_ENVIRONMENT_CREATE_CONFIG} + - RECYCLARR_CREATE_CONFIG=${${_APPNAME_}_ENVIRONMENT_CREATE_CONFIG} - TZ=${TZ} - restart: ${RECYCLARR_RESTART} + restart: ${${_APPNAME_}_RESTART} user: ${PUID}:${PGID} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/recyclarr:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/requestrr/requestrr.aarch64.yml b/compose/.apps/requestrr/requestrr.aarch64.yml index 7dbbcb5e66..0ffd4dc926 100644 --- a/compose/.apps/requestrr/requestrr.aarch64.yml +++ b/compose/.apps/requestrr/requestrr.aarch64.yml @@ -1,3 +1,3 @@ services: - requestrr: - image: lscr.io/linuxserver/requestrr:${REQUESTRR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/requestrr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/requestrr/requestrr.hostname.yml b/compose/.apps/requestrr/requestrr.hostname.yml index 5eeb41d5eb..4dc53c3782 100644 --- a/compose/.apps/requestrr/requestrr.hostname.yml +++ b/compose/.apps/requestrr/requestrr.hostname.yml @@ -1,3 +1,3 @@ services: - requestrr: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/requestrr/requestrr.labels.yml b/compose/.apps/requestrr/requestrr.labels.yml index b25624364b..2f489019d0 100644 --- a/compose/.apps/requestrr/requestrr.labels.yml +++ b/compose/.apps/requestrr/requestrr.labels.yml @@ -1,12 +1,12 @@ services: - requestrr: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) Use Doplarr" com.dockstarter.appinfo.nicename: "Requestrr" - com.dockstarter.appvars.requestrr_container_name: "requestrr" - com.dockstarter.appvars.requestrr_enabled: "false" - com.dockstarter.appvars.requestrr_network_mode: "" - com.dockstarter.appvars.requestrr_port_4545: "4545" - com.dockstarter.appvars.requestrr_restart: "unless-stopped" - com.dockstarter.appvars.requestrr_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_4545: "4545" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/requestrr/requestrr.netmode.yml b/compose/.apps/requestrr/requestrr.netmode.yml index 9958dd317f..f36884ffb9 100644 --- a/compose/.apps/requestrr/requestrr.netmode.yml +++ b/compose/.apps/requestrr/requestrr.netmode.yml @@ -1,3 +1,3 @@ services: - requestrr: - network_mode: ${REQUESTRR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/requestrr/requestrr.ports.yml b/compose/.apps/requestrr/requestrr.ports.yml index f2e9afd2c0..dc7f6d9ea7 100644 --- a/compose/.apps/requestrr/requestrr.ports.yml +++ b/compose/.apps/requestrr/requestrr.ports.yml @@ -1,4 +1,4 @@ services: - requestrr: + ${_appname_}: ports: - - ${REQUESTRR_PORT_4545}:4545 + - ${${_APPNAME_}_PORT_4545}:4545 diff --git a/compose/.apps/requestrr/requestrr.x86_64.yml b/compose/.apps/requestrr/requestrr.x86_64.yml index 7dbbcb5e66..0ffd4dc926 100644 --- a/compose/.apps/requestrr/requestrr.x86_64.yml +++ b/compose/.apps/requestrr/requestrr.x86_64.yml @@ -1,3 +1,3 @@ services: - requestrr: - image: lscr.io/linuxserver/requestrr:${REQUESTRR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/requestrr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/requestrr/requestrr.yml b/compose/.apps/requestrr/requestrr.yml index bbb04965fb..ace6d5d0ab 100644 --- a/compose/.apps/requestrr/requestrr.yml +++ b/compose/.apps/requestrr/requestrr.yml @@ -1,12 +1,12 @@ services: - requestrr: - container_name: ${REQUESTRR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${REQUESTRR_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/requestrr:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/resiliosync/resiliosync.aarch64.yml b/compose/.apps/resiliosync/resiliosync.aarch64.yml index ccca377acb..2e7b123bc5 100644 --- a/compose/.apps/resiliosync/resiliosync.aarch64.yml +++ b/compose/.apps/resiliosync/resiliosync.aarch64.yml @@ -1,3 +1,3 @@ services: - resiliosync: - image: lscr.io/linuxserver/resilio-sync:${RESILIOSYNC_TAG} + ${_appname_}: + image: lscr.io/linuxserver/resilio-sync:${${_APPNAME_}_TAG} diff --git a/compose/.apps/resiliosync/resiliosync.hostname.yml b/compose/.apps/resiliosync/resiliosync.hostname.yml index 808f4b42e2..4dc53c3782 100644 --- a/compose/.apps/resiliosync/resiliosync.hostname.yml +++ b/compose/.apps/resiliosync/resiliosync.hostname.yml @@ -1,3 +1,3 @@ services: - resiliosync: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/resiliosync/resiliosync.labels.yml b/compose/.apps/resiliosync/resiliosync.labels.yml index 2cf965b671..918c1f1f79 100644 --- a/compose/.apps/resiliosync/resiliosync.labels.yml +++ b/compose/.apps/resiliosync/resiliosync.labels.yml @@ -1,14 +1,14 @@ services: - resiliosync: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A fast, reliable, and simple P2P file sync and share solution" com.dockstarter.appinfo.nicename: "ResilioSync" - com.dockstarter.appvars.resiliosync_container_name: "resiliosync" - com.dockstarter.appvars.resiliosync_enabled: "false" - com.dockstarter.appvars.resiliosync_network_mode: "" - com.dockstarter.appvars.resiliosync_port_55555: "55555" - com.dockstarter.appvars.resiliosync_port_8888: "8888" - com.dockstarter.appvars.resiliosync_restart: "unless-stopped" - com.dockstarter.appvars.resiliosync_tag: "latest" - com.dockstarter.appvars.resiliosync_volume_syncdir: "/mnt/resiliosync" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_55555: "55555" + com.dockstarter.appvars.${_appname_}_port_8888: "8888" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_syncdir: "/mnt/resiliosync" diff --git a/compose/.apps/resiliosync/resiliosync.netmode.yml b/compose/.apps/resiliosync/resiliosync.netmode.yml index 4294741f11..f36884ffb9 100644 --- a/compose/.apps/resiliosync/resiliosync.netmode.yml +++ b/compose/.apps/resiliosync/resiliosync.netmode.yml @@ -1,3 +1,3 @@ services: - resiliosync: - network_mode: ${RESILIO_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/resiliosync/resiliosync.ports.yml b/compose/.apps/resiliosync/resiliosync.ports.yml index e8a1b0a653..51dffad37a 100644 --- a/compose/.apps/resiliosync/resiliosync.ports.yml +++ b/compose/.apps/resiliosync/resiliosync.ports.yml @@ -1,5 +1,5 @@ services: - resiliosync: + ${_appname_}: ports: - - ${RESILIOSYNC_PORT_8888}:8888 - - ${RESILIOSYNC_PORT_55555}:55555 + - ${${_APPNAME_}_PORT_8888}:8888 + - ${${_APPNAME_}_PORT_55555}:55555 diff --git a/compose/.apps/resiliosync/resiliosync.x86_64.yml b/compose/.apps/resiliosync/resiliosync.x86_64.yml index ccca377acb..2e7b123bc5 100644 --- a/compose/.apps/resiliosync/resiliosync.x86_64.yml +++ b/compose/.apps/resiliosync/resiliosync.x86_64.yml @@ -1,3 +1,3 @@ services: - resiliosync: - image: lscr.io/linuxserver/resilio-sync:${RESILIOSYNC_TAG} + ${_appname_}: + image: lscr.io/linuxserver/resilio-sync:${${_APPNAME_}_TAG} diff --git a/compose/.apps/resiliosync/resiliosync.yml b/compose/.apps/resiliosync/resiliosync.yml index 5a9f766a98..5f32e97c3c 100644 --- a/compose/.apps/resiliosync/resiliosync.yml +++ b/compose/.apps/resiliosync/resiliosync.yml @@ -1,13 +1,13 @@ services: - resiliosync: - container_name: ${RESILIOSYNC_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${RESILIOSYNC_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/resiliosync:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${RESILIOSYNC_VOLUME_SYNCDIR}:/sync + - ${${_APPNAME_}_VOLUME_SYNCDIR}:/sync diff --git a/compose/.apps/rsnapshot/rsnapshot.aarch64.yml b/compose/.apps/rsnapshot/rsnapshot.aarch64.yml index 842c0ba8fd..f57e8b2765 100644 --- a/compose/.apps/rsnapshot/rsnapshot.aarch64.yml +++ b/compose/.apps/rsnapshot/rsnapshot.aarch64.yml @@ -1,3 +1,3 @@ services: - rsnapshot: - image: lscr.io/linuxserver/rsnapshot:${RSNAPSHOT_TAG} + ${_appname_}: + image: lscr.io/linuxserver/rsnapshot:${${_APPNAME_}_TAG} diff --git a/compose/.apps/rsnapshot/rsnapshot.hostname.yml b/compose/.apps/rsnapshot/rsnapshot.hostname.yml index 391fe4d3c2..4dc53c3782 100644 --- a/compose/.apps/rsnapshot/rsnapshot.hostname.yml +++ b/compose/.apps/rsnapshot/rsnapshot.hostname.yml @@ -1,3 +1,3 @@ services: - rsnapshot: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/rsnapshot/rsnapshot.labels.yml b/compose/.apps/rsnapshot/rsnapshot.labels.yml index 1a85611902..33d450c9cf 100644 --- a/compose/.apps/rsnapshot/rsnapshot.labels.yml +++ b/compose/.apps/rsnapshot/rsnapshot.labels.yml @@ -1,14 +1,14 @@ services: - rsnapshot: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Make periodic snapshots of local machines, and remote machines over ssh" com.dockstarter.appinfo.nicename: "Rsnapshot" - com.dockstarter.appvars.rsnapshot_container_name: "rsnapshot" - com.dockstarter.appvars.rsnapshot_enabled: "false" - com.dockstarter.appvars.rsnapshot_network_mode: "" - com.dockstarter.appvars.rsnapshot_restart: "unless-stopped" - com.dockstarter.appvars.rsnapshot_tag: "latest" - com.dockstarter.appvars.rsnapshot_volume_datadir: "~/.config/appdata" - com.dockstarter.appvars.rsnapshot_volume_root_ssh: "/root/.ssh" - com.dockstarter.appvars.rsnapshot_volume_snapshotsdir: "/mnt/rsnapshot/snapshots" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_datadir: "~/.config/appdata" + com.dockstarter.appvars.${_appname_}_volume_root_ssh: "/root/.ssh" + com.dockstarter.appvars.${_appname_}_volume_snapshotsdir: "/mnt/rsnapshot/snapshots" diff --git a/compose/.apps/rsnapshot/rsnapshot.netmode.yml b/compose/.apps/rsnapshot/rsnapshot.netmode.yml index 96a6e75478..f36884ffb9 100644 --- a/compose/.apps/rsnapshot/rsnapshot.netmode.yml +++ b/compose/.apps/rsnapshot/rsnapshot.netmode.yml @@ -1,3 +1,3 @@ services: - rsnapshot: - network_mode: ${RSNAPSHOT_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/rsnapshot/rsnapshot.x86_64.yml b/compose/.apps/rsnapshot/rsnapshot.x86_64.yml index 842c0ba8fd..f57e8b2765 100644 --- a/compose/.apps/rsnapshot/rsnapshot.x86_64.yml +++ b/compose/.apps/rsnapshot/rsnapshot.x86_64.yml @@ -1,3 +1,3 @@ services: - rsnapshot: - image: lscr.io/linuxserver/rsnapshot:${RSNAPSHOT_TAG} + ${_appname_}: + image: lscr.io/linuxserver/rsnapshot:${${_APPNAME_}_TAG} diff --git a/compose/.apps/rsnapshot/rsnapshot.yml b/compose/.apps/rsnapshot/rsnapshot.yml index b92390653a..7c6fe03981 100644 --- a/compose/.apps/rsnapshot/rsnapshot.yml +++ b/compose/.apps/rsnapshot/rsnapshot.yml @@ -1,15 +1,15 @@ services: - rsnapshot: - container_name: ${RSNAPSHOT_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${RSNAPSHOT_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/rsnapshot:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${RSNAPSHOT_VOLUME_DATADIR}:/data - - ${RSNAPSHOT_VOLUME_ROOT_SSH}:/root/.ssh:ro - - ${RSNAPSHOT_VOLUME_SNAPSHOTSDIR}:/.snapshots + - ${${_APPNAME_}_VOLUME_DATADIR}:/data + - ${${_APPNAME_}_VOLUME_ROOT_SSH}:/root/.ssh:ro + - ${${_APPNAME_}_VOLUME_SNAPSHOTSDIR}:/.snapshots diff --git a/compose/.apps/rtorrentvpn/rtorrentvpn.hostname.yml b/compose/.apps/rtorrentvpn/rtorrentvpn.hostname.yml index 84bd2dfd41..4dc53c3782 100644 --- a/compose/.apps/rtorrentvpn/rtorrentvpn.hostname.yml +++ b/compose/.apps/rtorrentvpn/rtorrentvpn.hostname.yml @@ -1,3 +1,3 @@ services: - rtorrentvpn: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/rtorrentvpn/rtorrentvpn.labels.yml b/compose/.apps/rtorrentvpn/rtorrentvpn.labels.yml index 380ff03cc8..e30fb3e892 100644 --- a/compose/.apps/rtorrentvpn/rtorrentvpn.labels.yml +++ b/compose/.apps/rtorrentvpn/rtorrentvpn.labels.yml @@ -1,25 +1,25 @@ services: - rtorrentvpn: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) rTorrent with PrivoxyVPN" com.dockstarter.appinfo.nicename: "rTorrentVPN" - com.dockstarter.appvars.rtorrentvpn_container_name: "rtorrentvpn" - com.dockstarter.appvars.rtorrentvpn_enabled: "false" - com.dockstarter.appvars.rtorrentvpn_environment_enable_autodl_irssi: "no" - com.dockstarter.appvars.rtorrentvpn_environment_enable_privoxy: "no" - com.dockstarter.appvars.rtorrentvpn_environment_enable_rpc2: "yes" - com.dockstarter.appvars.rtorrentvpn_environment_enable_rpc2_auth: "yes" - com.dockstarter.appvars.rtorrentvpn_environment_enable_webui_auth: "yes" - com.dockstarter.appvars.rtorrentvpn_environment_rpc2_pass: "rutorrent" - com.dockstarter.appvars.rtorrentvpn_environment_rpc2_user: "admin" - com.dockstarter.appvars.rtorrentvpn_environment_webui_pass: "rutorrent" - com.dockstarter.appvars.rtorrentvpn_environment_webui_user: "admin" - com.dockstarter.appvars.rtorrentvpn_network_mode: "" - com.dockstarter.appvars.rtorrentvpn_port_51413: "51413" - com.dockstarter.appvars.rtorrentvpn_port_6881: "6881" - com.dockstarter.appvars.rtorrentvpn_port_8118: "8118" - com.dockstarter.appvars.rtorrentvpn_port_9080: "9080" - com.dockstarter.appvars.rtorrentvpn_port_9443: "9443" - com.dockstarter.appvars.rtorrentvpn_restart: "unless-stopped" - com.dockstarter.appvars.rtorrentvpn_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_enable_autodl_irssi: "no" + com.dockstarter.appvars.${_appname_}_environment_enable_privoxy: "no" + com.dockstarter.appvars.${_appname_}_environment_enable_rpc2: "yes" + com.dockstarter.appvars.${_appname_}_environment_enable_rpc2_auth: "yes" + com.dockstarter.appvars.${_appname_}_environment_enable_webui_auth: "yes" + com.dockstarter.appvars.${_appname_}_environment_rpc2_pass: "rutorrent" + com.dockstarter.appvars.${_appname_}_environment_rpc2_user: "admin" + com.dockstarter.appvars.${_appname_}_environment_webui_pass: "rutorrent" + com.dockstarter.appvars.${_appname_}_environment_webui_user: "admin" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_51413: "51413" + com.dockstarter.appvars.${_appname_}_port_6881: "6881" + com.dockstarter.appvars.${_appname_}_port_8118: "8118" + com.dockstarter.appvars.${_appname_}_port_9080: "9080" + com.dockstarter.appvars.${_appname_}_port_9443: "9443" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/rtorrentvpn/rtorrentvpn.netmode.yml b/compose/.apps/rtorrentvpn/rtorrentvpn.netmode.yml index 2d03d17526..f36884ffb9 100644 --- a/compose/.apps/rtorrentvpn/rtorrentvpn.netmode.yml +++ b/compose/.apps/rtorrentvpn/rtorrentvpn.netmode.yml @@ -1,3 +1,3 @@ services: - rtorrentvpn: - network_mode: ${RTORRENTVPN_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/rtorrentvpn/rtorrentvpn.ports.yml b/compose/.apps/rtorrentvpn/rtorrentvpn.ports.yml index 41a7b1a035..c4595005d8 100644 --- a/compose/.apps/rtorrentvpn/rtorrentvpn.ports.yml +++ b/compose/.apps/rtorrentvpn/rtorrentvpn.ports.yml @@ -1,10 +1,10 @@ services: - rtorrentvpn: + ${_appname_}: ports: - - ${RTORRENTVPN_PORT_51413}:51413 - - ${RTORRENTVPN_PORT_51413}:51413/udp - - ${RTORRENTVPN_PORT_6881}:6881 - - ${RTORRENTVPN_PORT_6881}:6881/udp - - ${RTORRENTVPN_PORT_8118}:8118 - - ${RTORRENTVPN_PORT_9080}:9080 - - ${RTORRENTVPN_PORT_9443}:9443 + - ${${_APPNAME_}_PORT_51413}:51413 + - ${${_APPNAME_}_PORT_51413}:51413/udp + - ${${_APPNAME_}_PORT_6881}:6881 + - ${${_APPNAME_}_PORT_6881}:6881/udp + - ${${_APPNAME_}_PORT_8118}:8118 + - ${${_APPNAME_}_PORT_9080}:9080 + - ${${_APPNAME_}_PORT_9443}:9443 diff --git a/compose/.apps/rtorrentvpn/rtorrentvpn.x86_64.yml b/compose/.apps/rtorrentvpn/rtorrentvpn.x86_64.yml index 06f0ad0f03..89e7a34941 100644 --- a/compose/.apps/rtorrentvpn/rtorrentvpn.x86_64.yml +++ b/compose/.apps/rtorrentvpn/rtorrentvpn.x86_64.yml @@ -1,3 +1,3 @@ services: - rtorrentvpn: - image: ghcr.io/binhex/arch-rtorrentvpn:${RTORRENTVPN_TAG} + ${_appname_}: + image: ghcr.io/binhex/arch-rtorrentvpn:${${_APPNAME_}_TAG} diff --git a/compose/.apps/rtorrentvpn/rtorrentvpn.yml b/compose/.apps/rtorrentvpn/rtorrentvpn.yml index df4dc6be01..a072a4c7d7 100644 --- a/compose/.apps/rtorrentvpn/rtorrentvpn.yml +++ b/compose/.apps/rtorrentvpn/rtorrentvpn.yml @@ -1,22 +1,22 @@ services: - rtorrentvpn: + ${_appname_}: cap_add: - NET_ADMIN - SYS_MODULE - container_name: ${RTORRENTVPN_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - ENABLE_AUTODL_IRSSI=${RTORRENTVPN_ENVIRONMENT_ENABLE_AUTODL_IRSSI} - - ENABLE_PRIVOXY=${RTORRENTVPN_ENVIRONMENT_ENABLE_PRIVOXY} - - ENABLE_RPC2_AUTH=${RTORRENTVPN_ENVIRONMENT_ENABLE_RPC2_AUTH} - - ENABLE_RPC2=${RTORRENTVPN_ENVIRONMENT_ENABLE_RPC2} - - ENABLE_WEBUI_AUTH=${RTORRENTVPN_ENVIRONMENT_ENABLE_WEBUI_AUTH} + - ENABLE_AUTODL_IRSSI=${${_APPNAME_}_ENVIRONMENT_ENABLE_AUTODL_IRSSI} + - ENABLE_PRIVOXY=${${_APPNAME_}_ENVIRONMENT_ENABLE_PRIVOXY} + - ENABLE_RPC2_AUTH=${${_APPNAME_}_ENVIRONMENT_ENABLE_RPC2_AUTH} + - ENABLE_RPC2=${${_APPNAME_}_ENVIRONMENT_ENABLE_RPC2} + - ENABLE_WEBUI_AUTH=${${_APPNAME_}_ENVIRONMENT_ENABLE_WEBUI_AUTH} - LAN_NETWORK=${LAN_NETWORK} - NAME_SERVERS=${NS1},${NS2} - PGID=${PGID} - PHP_TZ=${TZ} - PUID=${PUID} - - RPC2_PASS=${RTORRENTVPN_ENVIRONMENT_RPC2_PASS} - - RPC2_USER=${RTORRENTVPN_ENVIRONMENT_RPC2_USER} + - RPC2_PASS=${${_APPNAME_}_ENVIRONMENT_RPC2_PASS} + - RPC2_USER=${${_APPNAME_}_ENVIRONMENT_RPC2_USER} - TZ=${TZ} - VPN_CLIENT=${VPN_CLIENT} - VPN_ENABLED=${VPN_ENABLE} @@ -24,15 +24,15 @@ services: - VPN_PASS=${VPN_PASS} - VPN_PROV=${VPN_PROV} - VPN_USER=${VPN_USER} - - WEBUI_PASS=${RTORRENTVPN_ENVIRONMENT_WEBUI_PASS} - - WEBUI_USER=${RTORRENTVPN_ENVIRONMENT_WEBUI_USER} + - WEBUI_PASS=${${_APPNAME_}_ENVIRONMENT_WEBUI_PASS} + - WEBUI_USER=${${_APPNAME_}_ENVIRONMENT_WEBUI_USER} privileged: true - restart: ${RTORRENTVPN_RESTART} + restart: ${${_APPNAME_}_RESTART} sysctls: - net.ipv4.conf.all.src_valid_mark=1 volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/rtorrentvpn:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage - ${VPN_VOLUME_OVPNDIR}:/config/openvpn - ${VPN_VOLUME_WGDIR}:/config/wireguard diff --git a/compose/.apps/rustdesk/rustdesk.aarch64.yml b/compose/.apps/rustdesk/rustdesk.aarch64.yml index e78e7fd65a..3443ac03c9 100644 --- a/compose/.apps/rustdesk/rustdesk.aarch64.yml +++ b/compose/.apps/rustdesk/rustdesk.aarch64.yml @@ -1,3 +1,3 @@ services: - rustdesk: - image: rustdesk/rustdesk-server-s6:${RUSTDESK_TAG} + ${_appname_}: + image: rustdesk/rustdesk-server-s6:${${_APPNAME_}_TAG} diff --git a/compose/.apps/rustdesk/rustdesk.hostname.yml b/compose/.apps/rustdesk/rustdesk.hostname.yml index ddde49c237..4dc53c3782 100644 --- a/compose/.apps/rustdesk/rustdesk.hostname.yml +++ b/compose/.apps/rustdesk/rustdesk.hostname.yml @@ -1,3 +1,3 @@ services: - rustdesk: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/rustdesk/rustdesk.labels.yml b/compose/.apps/rustdesk/rustdesk.labels.yml index ca77c3788c..247c0d0705 100644 --- a/compose/.apps/rustdesk/rustdesk.labels.yml +++ b/compose/.apps/rustdesk/rustdesk.labels.yml @@ -1,17 +1,17 @@ services: - rustdesk: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "RustDesk server software including hbbs (rendezvous server) and hbbr (relay server) program, an open-source self-hosted TeamViewer alternative" com.dockstarter.appinfo.nicename: "RustDesk" - com.dockstarter.appvars.rustdesk_container_name: "rustdesk" - com.dockstarter.appvars.rustdesk_enabled: "false" - com.dockstarter.appvars.rustdesk_environment_relay_server: "0.0.0.0" - com.dockstarter.appvars.rustdesk_network_mode: "" - com.dockstarter.appvars.rustdesk_port_21115: "21115" - com.dockstarter.appvars.rustdesk_port_21116: "21116" - com.dockstarter.appvars.rustdesk_port_21117: "21117" - com.dockstarter.appvars.rustdesk_port_21118: "21118" - com.dockstarter.appvars.rustdesk_port_21119: "21119" - com.dockstarter.appvars.rustdesk_restart: "unless-stopped" - com.dockstarter.appvars.rustdesk_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_relay_server: "0.0.0.0" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_21115: "21115" + com.dockstarter.appvars.${_appname_}_port_21116: "21116" + com.dockstarter.appvars.${_appname_}_port_21117: "21117" + com.dockstarter.appvars.${_appname_}_port_21118: "21118" + com.dockstarter.appvars.${_appname_}_port_21119: "21119" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/rustdesk/rustdesk.netmode.yml b/compose/.apps/rustdesk/rustdesk.netmode.yml index 5ae2a244d3..f36884ffb9 100644 --- a/compose/.apps/rustdesk/rustdesk.netmode.yml +++ b/compose/.apps/rustdesk/rustdesk.netmode.yml @@ -1,3 +1,3 @@ services: - rustdesk: - network_mode: ${RUSTDESK_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/rustdesk/rustdesk.ports.yml b/compose/.apps/rustdesk/rustdesk.ports.yml index 154350bce6..99146f4171 100644 --- a/compose/.apps/rustdesk/rustdesk.ports.yml +++ b/compose/.apps/rustdesk/rustdesk.ports.yml @@ -1,9 +1,9 @@ services: - rustdesk: + ${_appname_}: ports: - - ${RUSTDESK_PORT_21115}:21115 - - ${RUSTDESK_PORT_21116}:21116 - - ${RUSTDESK_PORT_21116}:21116/udp - - ${RUSTDESK_PORT_21117}:21117 - - ${RUSTDESK_PORT_21118}:21118 - - ${RUSTDESK_PORT_21119}:21119 + - ${${_APPNAME_}_PORT_21115}:21115 + - ${${_APPNAME_}_PORT_21116}:21116 + - ${${_APPNAME_}_PORT_21116}:21116/udp + - ${${_APPNAME_}_PORT_21117}:21117 + - ${${_APPNAME_}_PORT_21118}:21118 + - ${${_APPNAME_}_PORT_21119}:21119 diff --git a/compose/.apps/rustdesk/rustdesk.x86_64.yml b/compose/.apps/rustdesk/rustdesk.x86_64.yml index e78e7fd65a..3443ac03c9 100644 --- a/compose/.apps/rustdesk/rustdesk.x86_64.yml +++ b/compose/.apps/rustdesk/rustdesk.x86_64.yml @@ -1,3 +1,3 @@ services: - rustdesk: - image: rustdesk/rustdesk-server-s6:${RUSTDESK_TAG} + ${_appname_}: + image: rustdesk/rustdesk-server-s6:${${_APPNAME_}_TAG} diff --git a/compose/.apps/rustdesk/rustdesk.yml b/compose/.apps/rustdesk/rustdesk.yml index c59846ef2b..820b028237 100644 --- a/compose/.apps/rustdesk/rustdesk.yml +++ b/compose/.apps/rustdesk/rustdesk.yml @@ -1,13 +1,13 @@ services: - rustdesk: - container_name: ${RUSTDESK_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - - RELAY=${RUSTDESK_ENVIRONMENT_RELAY_SERVER} + - RELAY=${${_APPNAME_}_ENVIRONMENT_RELAY_SERVER} - TZ=${TZ} - restart: ${RUSTDESK_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/rustdesk:/data + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/rutorrent/rutorrent.aarch64.yml b/compose/.apps/rutorrent/rutorrent.aarch64.yml index 8c94254855..4855a95633 100644 --- a/compose/.apps/rutorrent/rutorrent.aarch64.yml +++ b/compose/.apps/rutorrent/rutorrent.aarch64.yml @@ -1,3 +1,3 @@ services: - rutorrent: - image: lscr.io/linuxserver/rutorrent:${RUTORRENT_TAG} + ${_appname_}: + image: lscr.io/linuxserver/rutorrent:${${_APPNAME_}_TAG} diff --git a/compose/.apps/rutorrent/rutorrent.hostname.yml b/compose/.apps/rutorrent/rutorrent.hostname.yml index e330d3ce35..4dc53c3782 100644 --- a/compose/.apps/rutorrent/rutorrent.hostname.yml +++ b/compose/.apps/rutorrent/rutorrent.hostname.yml @@ -1,3 +1,3 @@ services: - rutorrent: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/rutorrent/rutorrent.labels.yml b/compose/.apps/rutorrent/rutorrent.labels.yml index 203871be9b..86680e81ab 100644 --- a/compose/.apps/rutorrent/rutorrent.labels.yml +++ b/compose/.apps/rutorrent/rutorrent.labels.yml @@ -1,15 +1,15 @@ services: - rutorrent: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) Use Deluge/qBittorrent/Transmission" com.dockstarter.appinfo.nicename: "ruTorrent" - com.dockstarter.appvars.rutorrent_container_name: "rutorrent" - com.dockstarter.appvars.rutorrent_enabled: "false" - com.dockstarter.appvars.rutorrent_network_mode: "" - com.dockstarter.appvars.rutorrent_port_5000: "5000" - com.dockstarter.appvars.rutorrent_port_51413: "51413" - com.dockstarter.appvars.rutorrent_port_6881: "6881" - com.dockstarter.appvars.rutorrent_port_80: "8009" - com.dockstarter.appvars.rutorrent_restart: "unless-stopped" - com.dockstarter.appvars.rutorrent_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_5000: "5000" + com.dockstarter.appvars.${_appname_}_port_51413: "51413" + com.dockstarter.appvars.${_appname_}_port_6881: "6881" + com.dockstarter.appvars.${_appname_}_port_80: "8009" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/rutorrent/rutorrent.netmode.yml b/compose/.apps/rutorrent/rutorrent.netmode.yml index d046affaad..f36884ffb9 100644 --- a/compose/.apps/rutorrent/rutorrent.netmode.yml +++ b/compose/.apps/rutorrent/rutorrent.netmode.yml @@ -1,3 +1,3 @@ services: - rutorrent: - network_mode: ${RUTORRENT_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/rutorrent/rutorrent.ports.yml b/compose/.apps/rutorrent/rutorrent.ports.yml index 7d120789b1..e37edbcbf1 100644 --- a/compose/.apps/rutorrent/rutorrent.ports.yml +++ b/compose/.apps/rutorrent/rutorrent.ports.yml @@ -1,9 +1,9 @@ services: - rutorrent: + ${_appname_}: ports: - - ${RUTORRENT_PORT_5000}:5000 - - ${RUTORRENT_PORT_51413}:51413 - - ${RUTORRENT_PORT_51413}:51413/udp - - ${RUTORRENT_PORT_6881}:6881 - - ${RUTORRENT_PORT_6881}:6881/udp - - ${RUTORRENT_PORT_80}:80 + - ${${_APPNAME_}_PORT_5000}:5000 + - ${${_APPNAME_}_PORT_51413}:51413 + - ${${_APPNAME_}_PORT_51413}:51413/udp + - ${${_APPNAME_}_PORT_6881}:6881 + - ${${_APPNAME_}_PORT_6881}:6881/udp + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/rutorrent/rutorrent.x86_64.yml b/compose/.apps/rutorrent/rutorrent.x86_64.yml index 8c94254855..4855a95633 100644 --- a/compose/.apps/rutorrent/rutorrent.x86_64.yml +++ b/compose/.apps/rutorrent/rutorrent.x86_64.yml @@ -1,3 +1,3 @@ services: - rutorrent: - image: lscr.io/linuxserver/rutorrent:${RUTORRENT_TAG} + ${_appname_}: + image: lscr.io/linuxserver/rutorrent:${${_APPNAME_}_TAG} diff --git a/compose/.apps/rutorrent/rutorrent.yml b/compose/.apps/rutorrent/rutorrent.yml index 9f85aa7a08..ace6d5d0ab 100644 --- a/compose/.apps/rutorrent/rutorrent.yml +++ b/compose/.apps/rutorrent/rutorrent.yml @@ -1,12 +1,12 @@ services: - rutorrent: - container_name: ${RUTORRENT_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${RUTORRENT_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/rutorrent:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/sabnzbd/sabnzbd.aarch64.yml b/compose/.apps/sabnzbd/sabnzbd.aarch64.yml index 63f0f34447..204752bbc1 100644 --- a/compose/.apps/sabnzbd/sabnzbd.aarch64.yml +++ b/compose/.apps/sabnzbd/sabnzbd.aarch64.yml @@ -1,3 +1,3 @@ services: - sabnzbd: - image: lscr.io/linuxserver/sabnzbd:${SABNZBD_TAG} + ${_appname_}: + image: lscr.io/linuxserver/sabnzbd:${${_APPNAME_}_TAG} diff --git a/compose/.apps/sabnzbd/sabnzbd.hostname.yml b/compose/.apps/sabnzbd/sabnzbd.hostname.yml index d75335da48..4dc53c3782 100644 --- a/compose/.apps/sabnzbd/sabnzbd.hostname.yml +++ b/compose/.apps/sabnzbd/sabnzbd.hostname.yml @@ -1,3 +1,3 @@ services: - sabnzbd: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/sabnzbd/sabnzbd.labels.yml b/compose/.apps/sabnzbd/sabnzbd.labels.yml index 5cde3cb346..2e6642db4f 100644 --- a/compose/.apps/sabnzbd/sabnzbd.labels.yml +++ b/compose/.apps/sabnzbd/sabnzbd.labels.yml @@ -1,12 +1,12 @@ services: - sabnzbd: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "NZB Newsgrabber / Downloader" com.dockstarter.appinfo.nicename: "SABnzbd" - com.dockstarter.appvars.sabnzbd_container_name: "sabnzbd" - com.dockstarter.appvars.sabnzbd_enabled: "false" - com.dockstarter.appvars.sabnzbd_network_mode: "" - com.dockstarter.appvars.sabnzbd_port_8080: "8080" - com.dockstarter.appvars.sabnzbd_restart: "unless-stopped" - com.dockstarter.appvars.sabnzbd_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8080: "8080" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/sabnzbd/sabnzbd.netmode.yml b/compose/.apps/sabnzbd/sabnzbd.netmode.yml index e2e7e5735d..f36884ffb9 100644 --- a/compose/.apps/sabnzbd/sabnzbd.netmode.yml +++ b/compose/.apps/sabnzbd/sabnzbd.netmode.yml @@ -1,3 +1,3 @@ services: - sabnzbd: - network_mode: ${SABNZBD_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/sabnzbd/sabnzbd.ports.yml b/compose/.apps/sabnzbd/sabnzbd.ports.yml index 633bea3fd3..7d1c7e4455 100644 --- a/compose/.apps/sabnzbd/sabnzbd.ports.yml +++ b/compose/.apps/sabnzbd/sabnzbd.ports.yml @@ -1,4 +1,4 @@ services: - sabnzbd: + ${_appname_}: ports: - - ${SABNZBD_PORT_8080}:8080 + - ${${_APPNAME_}_PORT_8080}:8080 diff --git a/compose/.apps/sabnzbd/sabnzbd.x86_64.yml b/compose/.apps/sabnzbd/sabnzbd.x86_64.yml index 63f0f34447..204752bbc1 100644 --- a/compose/.apps/sabnzbd/sabnzbd.x86_64.yml +++ b/compose/.apps/sabnzbd/sabnzbd.x86_64.yml @@ -1,3 +1,3 @@ services: - sabnzbd: - image: lscr.io/linuxserver/sabnzbd:${SABNZBD_TAG} + ${_appname_}: + image: lscr.io/linuxserver/sabnzbd:${${_APPNAME_}_TAG} diff --git a/compose/.apps/sabnzbd/sabnzbd.yml b/compose/.apps/sabnzbd/sabnzbd.yml index 3238e57179..ace6d5d0ab 100644 --- a/compose/.apps/sabnzbd/sabnzbd.yml +++ b/compose/.apps/sabnzbd/sabnzbd.yml @@ -1,12 +1,12 @@ services: - sabnzbd: - container_name: ${SABNZBD_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${SABNZBD_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/sabnzbd:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/sabnzbdvpn/sabnzbdvpn.hostname.yml b/compose/.apps/sabnzbdvpn/sabnzbdvpn.hostname.yml index 9eb09b00c9..4dc53c3782 100644 --- a/compose/.apps/sabnzbdvpn/sabnzbdvpn.hostname.yml +++ b/compose/.apps/sabnzbdvpn/sabnzbdvpn.hostname.yml @@ -1,3 +1,3 @@ services: - sabnzbdvpn: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/sabnzbdvpn/sabnzbdvpn.labels.yml b/compose/.apps/sabnzbdvpn/sabnzbdvpn.labels.yml index a452addf05..c61087980c 100644 --- a/compose/.apps/sabnzbdvpn/sabnzbdvpn.labels.yml +++ b/compose/.apps/sabnzbdvpn/sabnzbdvpn.labels.yml @@ -1,25 +1,25 @@ services: - sabnzbdvpn: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "SABnzbd with PrivoxyVPN" com.dockstarter.appinfo.nicename: "SABnzbdVPN" - com.dockstarter.appvars.sabnzbdvpn_container_name: "sabnzbdvpn" - com.dockstarter.appvars.sabnzbdvpn_enabled: "false" - com.dockstarter.appvars.sabnzbdvpn_environment_enable_privoxy: "no" - com.dockstarter.appvars.sabnzbdvpn_environment_lan_network: "192.168.x.x/24" - com.dockstarter.appvars.sabnzbdvpn_environment_name_servers: "1.1.1.1,8.8.8.8" - com.dockstarter.appvars.sabnzbdvpn_environment_vpn_client: "openvpn" - com.dockstarter.appvars.sabnzbdvpn_environment_vpn_enable: "no" - com.dockstarter.appvars.sabnzbdvpn_environment_vpn_input_ports: "" - com.dockstarter.appvars.sabnzbdvpn_environment_vpn_options: "" - com.dockstarter.appvars.sabnzbdvpn_environment_vpn_output_ports: "" - com.dockstarter.appvars.sabnzbdvpn_environment_vpn_pass: "your-vpn-pass" - com.dockstarter.appvars.sabnzbdvpn_environment_vpn_prov: "custom" - com.dockstarter.appvars.sabnzbdvpn_environment_vpn_user: "your-vpn-user" - com.dockstarter.appvars.sabnzbdvpn_network_mode: "" - com.dockstarter.appvars.sabnzbdvpn_port_8080: "8080" - com.dockstarter.appvars.sabnzbdvpn_port_8090: "8090" - com.dockstarter.appvars.sabnzbdvpn_port_8118: "8118" - com.dockstarter.appvars.sabnzbdvpn_restart: "unless-stopped" - com.dockstarter.appvars.sabnzbdvpn_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_enable_privoxy: "no" + com.dockstarter.appvars.${_appname_}_environment_lan_network: "192.168.x.x/24" + com.dockstarter.appvars.${_appname_}_environment_name_servers: "1.1.1.1,8.8.8.8" + com.dockstarter.appvars.${_appname_}_environment_vpn_client: "openvpn" + com.dockstarter.appvars.${_appname_}_environment_vpn_enable: "no" + com.dockstarter.appvars.${_appname_}_environment_vpn_input_ports: "" + com.dockstarter.appvars.${_appname_}_environment_vpn_options: "" + com.dockstarter.appvars.${_appname_}_environment_vpn_output_ports: "" + com.dockstarter.appvars.${_appname_}_environment_vpn_pass: "your-vpn-pass" + com.dockstarter.appvars.${_appname_}_environment_vpn_prov: "custom" + com.dockstarter.appvars.${_appname_}_environment_vpn_user: "your-vpn-user" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8080: "8080" + com.dockstarter.appvars.${_appname_}_port_8090: "8090" + com.dockstarter.appvars.${_appname_}_port_8118: "8118" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/sabnzbdvpn/sabnzbdvpn.netmode.yml b/compose/.apps/sabnzbdvpn/sabnzbdvpn.netmode.yml index 3ae1a9fd46..f36884ffb9 100644 --- a/compose/.apps/sabnzbdvpn/sabnzbdvpn.netmode.yml +++ b/compose/.apps/sabnzbdvpn/sabnzbdvpn.netmode.yml @@ -1,3 +1,3 @@ services: - sabnzbdvpn: - network_mode: ${SABNZBDVPN_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/sabnzbdvpn/sabnzbdvpn.ports.yml b/compose/.apps/sabnzbdvpn/sabnzbdvpn.ports.yml index 6d78c54a21..cbd6b6e4ce 100644 --- a/compose/.apps/sabnzbdvpn/sabnzbdvpn.ports.yml +++ b/compose/.apps/sabnzbdvpn/sabnzbdvpn.ports.yml @@ -1,6 +1,6 @@ services: - sabnzbdvpn: + ${_appname_}: ports: - - ${SABNZBDVPN_PORT_8080}:8080 - - ${SABNZBDVPN_PORT_8090}:8090 - - ${SABNZBDVPN_PORT_8118}:8118 + - ${${_APPNAME_}_PORT_8080}:8080 + - ${${_APPNAME_}_PORT_8090}:8090 + - ${${_APPNAME_}_PORT_8118}:8118 diff --git a/compose/.apps/sabnzbdvpn/sabnzbdvpn.x86_64.yml b/compose/.apps/sabnzbdvpn/sabnzbdvpn.x86_64.yml index 9da11a482b..007ca5c5e5 100644 --- a/compose/.apps/sabnzbdvpn/sabnzbdvpn.x86_64.yml +++ b/compose/.apps/sabnzbdvpn/sabnzbdvpn.x86_64.yml @@ -1,3 +1,3 @@ services: - sabnzbdvpn: - image: ghcr.io/binhex/arch-sabnzbdvpn:${SABNZBDVPN_TAG} + ${_appname_}: + image: ghcr.io/binhex/arch-sabnzbdvpn:${${_APPNAME_}_TAG} diff --git a/compose/.apps/sabnzbdvpn/sabnzbdvpn.yml b/compose/.apps/sabnzbdvpn/sabnzbdvpn.yml index 10ed808960..7cc77e89ea 100644 --- a/compose/.apps/sabnzbdvpn/sabnzbdvpn.yml +++ b/compose/.apps/sabnzbdvpn/sabnzbdvpn.yml @@ -1,29 +1,29 @@ services: - sabnzbdvpn: + ${_appname_}: cap_add: - NET_ADMIN - SYS_MODULE - container_name: ${SABNZBDVPN_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - ENABLE_PRIVOXY=${SABNZBDVPN_ENVIRONMENT_ENABLE_PRIVOXY} - - LAN_NETWORK=${SABNZBDVPN_ENVIRONMENT_LAN_NETWORK} - - NAME_SERVERS=${SABNZBDVPN_ENVIRONMENT_NAME_SERVERS} + - ENABLE_PRIVOXY=${${_APPNAME_}_ENVIRONMENT_ENABLE_PRIVOXY} + - LAN_NETWORK=${${_APPNAME_}_ENVIRONMENT_LAN_NETWORK} + - NAME_SERVERS=${${_APPNAME_}_ENVIRONMENT_NAME_SERVERS} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - VPN_CLIENT=${SABNZBDVPN_ENVIRONMENT_VPN_CLIENT} - - VPN_ENABLED=${SABNZBDVPN_ENVIRONMENT_VPN_ENABLE} - - VPN_INPUT_PORTS=${SABNZBDVPN_ENVIRONMENT_VPN_INPUT_PORTS} - - VPN_OPTIONS=${SABNZBDVPN_ENVIRONMENT_VPN_OPTIONS} - - VPN_OUTPUT_PORTS=${SABNZBDVPN_ENVIRONMENT_VPN_OUTPUT_PORTS} - - VPN_PASS=${SABNZBDVPN_ENVIRONMENT_VPN_PASS} - - VPN_PROV=${SABNZBDVPN_ENVIRONMENT_VPN_PROV} - - VPN_USER=${SABNZBDVPN_ENVIRONMENT_VPN_USER} + - VPN_CLIENT=${${_APPNAME_}_ENVIRONMENT_VPN_CLIENT} + - VPN_ENABLED=${${_APPNAME_}_ENVIRONMENT_VPN_ENABLE} + - VPN_INPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_VPN_INPUT_PORTS} + - VPN_OPTIONS=${${_APPNAME_}_ENVIRONMENT_VPN_OPTIONS} + - VPN_OUTPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_VPN_OUTPUT_PORTS} + - VPN_PASS=${${_APPNAME_}_ENVIRONMENT_VPN_PASS} + - VPN_PROV=${${_APPNAME_}_ENVIRONMENT_VPN_PROV} + - VPN_USER=${${_APPNAME_}_ENVIRONMENT_VPN_USER} privileged: true - restart: ${SABNZBDVPN_RESTART} + restart: ${${_APPNAME_}_RESTART} sysctls: - net.ipv4.conf.all.src_valid_mark=1 volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/sabnzbdvpn:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/samba/samba.aarch64.yml b/compose/.apps/samba/samba.aarch64.yml index 72c0cafe6d..d731d2d06b 100644 --- a/compose/.apps/samba/samba.aarch64.yml +++ b/compose/.apps/samba/samba.aarch64.yml @@ -1,3 +1,3 @@ services: - samba: - image: dperson/samba:${SAMBA_TAG} + ${_appname_}: + image: dperson/samba:${${_APPNAME_}_TAG} diff --git a/compose/.apps/samba/samba.hostname.yml b/compose/.apps/samba/samba.hostname.yml index ea22c41eda..4dc53c3782 100644 --- a/compose/.apps/samba/samba.hostname.yml +++ b/compose/.apps/samba/samba.hostname.yml @@ -1,3 +1,3 @@ services: - samba: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/samba/samba.labels.yml b/compose/.apps/samba/samba.labels.yml index eec9decc7c..9eb131613b 100644 --- a/compose/.apps/samba/samba.labels.yml +++ b/compose/.apps/samba/samba.labels.yml @@ -1,20 +1,20 @@ services: - samba: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) No replacement" com.dockstarter.appinfo.nicename: "Samba" - com.dockstarter.appvars.samba_container_name: "samba" - com.dockstarter.appvars.samba_enabled: "false" - com.dockstarter.appvars.samba_environment_nmbd: "true" - com.dockstarter.appvars.samba_environment_password: "ds" - com.dockstarter.appvars.samba_environment_sharename: "DockSTARTer" - com.dockstarter.appvars.samba_environment_username: "ds" - com.dockstarter.appvars.samba_environment_workgroup: "WORKGROUP" - com.dockstarter.appvars.samba_network_mode: "" - com.dockstarter.appvars.samba_port_137: "137" - com.dockstarter.appvars.samba_port_138: "138" - com.dockstarter.appvars.samba_port_139: "139" - com.dockstarter.appvars.samba_port_445: "445" - com.dockstarter.appvars.samba_restart: "unless-stopped" - com.dockstarter.appvars.samba_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_nmbd: "true" + com.dockstarter.appvars.${_appname_}_environment_password: "ds" + com.dockstarter.appvars.${_appname_}_environment_sharename: "DockSTARTer" + com.dockstarter.appvars.${_appname_}_environment_username: "ds" + com.dockstarter.appvars.${_appname_}_environment_workgroup: "WORKGROUP" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_137: "137" + com.dockstarter.appvars.${_appname_}_port_138: "138" + com.dockstarter.appvars.${_appname_}_port_139: "139" + com.dockstarter.appvars.${_appname_}_port_445: "445" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/samba/samba.netmode.yml b/compose/.apps/samba/samba.netmode.yml index 019be2efac..f36884ffb9 100644 --- a/compose/.apps/samba/samba.netmode.yml +++ b/compose/.apps/samba/samba.netmode.yml @@ -1,3 +1,3 @@ services: - samba: - network_mode: ${SAMBA_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/samba/samba.ports.yml b/compose/.apps/samba/samba.ports.yml index b99ad4eb35..5545e23a22 100644 --- a/compose/.apps/samba/samba.ports.yml +++ b/compose/.apps/samba/samba.ports.yml @@ -1,7 +1,7 @@ services: - samba: + ${_appname_}: ports: - - ${SAMBA_PORT_137}:137/udp - - ${SAMBA_PORT_138}:138/udp - - ${SAMBA_PORT_139}:139 - - ${SAMBA_PORT_445}:445 + - ${${_APPNAME_}_PORT_137}:137/udp + - ${${_APPNAME_}_PORT_138}:138/udp + - ${${_APPNAME_}_PORT_139}:139 + - ${${_APPNAME_}_PORT_445}:445 diff --git a/compose/.apps/samba/samba.x86_64.yml b/compose/.apps/samba/samba.x86_64.yml index 72c0cafe6d..d731d2d06b 100644 --- a/compose/.apps/samba/samba.x86_64.yml +++ b/compose/.apps/samba/samba.x86_64.yml @@ -1,3 +1,3 @@ services: - samba: - image: dperson/samba:${SAMBA_TAG} + ${_appname_}: + image: dperson/samba:${${_APPNAME_}_TAG} diff --git a/compose/.apps/samba/samba.yml b/compose/.apps/samba/samba.yml index bd81517421..6c9667838d 100644 --- a/compose/.apps/samba/samba.yml +++ b/compose/.apps/samba/samba.yml @@ -1,17 +1,17 @@ services: - samba: - container_name: ${SAMBA_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - GROUPID=${PGID} - - NMBD=${SAMBA_ENVIRONMENT_NMBD} - - SHARE=${SAMBA_ENVIRONMENT_SHARENAME};/${SAMBA_ENVIRONMENT_SHARENAME};yes;no;no;all;${SAMBA_ENVIRONMENT_USERNAME} + - NMBD=${${_APPNAME_}_ENVIRONMENT_NMBD} + - SHARE=${${_APPNAME_}_ENVIRONMENT_SHARENAME};/${${_APPNAME_}_ENVIRONMENT_SHARENAME};yes;no;no;all;${${_APPNAME_}_ENVIRONMENT_USERNAME} - TZ=${TZ} - - USER=${SAMBA_ENVIRONMENT_USERNAME};${SAMBA_ENVIRONMENT_PASSWORD} + - USER=${${_APPNAME_}_ENVIRONMENT_USERNAME};${${_APPNAME_}_ENVIRONMENT_PASSWORD} - USERID=${PUID} - - WORKGROUP=${SAMBA_ENVIRONMENT_WORKGROUP} - restart: ${SAMBA_RESTART} + - WORKGROUP=${${_APPNAME_}_ENVIRONMENT_WORKGROUP} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}:/${SAMBA_ENVIRONMENT_SHARENAME}/config - - ${DOCKER_VOLUME_STORAGE}:/${SAMBA_ENVIRONMENT_SHARENAME}/storage + - ${DOCKER_VOLUME_CONFIG}:/${${_APPNAME_}_ENVIRONMENT_SHARENAME}/config + - ${DOCKER_VOLUME_STORAGE}:/${${_APPNAME_}_ENVIRONMENT_SHARENAME}/storage - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/sickchill/sickchill.aarch64.yml b/compose/.apps/sickchill/sickchill.aarch64.yml index f8692b2647..4c4eb4bc7b 100644 --- a/compose/.apps/sickchill/sickchill.aarch64.yml +++ b/compose/.apps/sickchill/sickchill.aarch64.yml @@ -1,3 +1,3 @@ services: - sickchill: - image: lscr.io/linuxserver/sickchill:${SICKCHILL_TAG} + ${_appname_}: + image: lscr.io/linuxserver/sickchill:${${_APPNAME_}_TAG} diff --git a/compose/.apps/sickchill/sickchill.hostname.yml b/compose/.apps/sickchill/sickchill.hostname.yml index 02e94e89cf..4dc53c3782 100644 --- a/compose/.apps/sickchill/sickchill.hostname.yml +++ b/compose/.apps/sickchill/sickchill.hostname.yml @@ -1,3 +1,3 @@ services: - sickchill: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/sickchill/sickchill.labels.yml b/compose/.apps/sickchill/sickchill.labels.yml index 796b7b9169..2d5f480d07 100644 --- a/compose/.apps/sickchill/sickchill.labels.yml +++ b/compose/.apps/sickchill/sickchill.labels.yml @@ -1,12 +1,12 @@ services: - sickchill: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Automatic Video Library Manager for TV Shows" com.dockstarter.appinfo.nicename: "SickChill" - com.dockstarter.appvars.sickchill_container_name: "sickchill" - com.dockstarter.appvars.sickchill_enabled: "false" - com.dockstarter.appvars.sickchill_network_mode: "" - com.dockstarter.appvars.sickchill_port_8081: "8081" - com.dockstarter.appvars.sickchill_restart: "unless-stopped" - com.dockstarter.appvars.sickchill_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8081: "8081" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/sickchill/sickchill.netmode.yml b/compose/.apps/sickchill/sickchill.netmode.yml index 063075d06b..f36884ffb9 100644 --- a/compose/.apps/sickchill/sickchill.netmode.yml +++ b/compose/.apps/sickchill/sickchill.netmode.yml @@ -1,3 +1,3 @@ services: - sickchill: - network_mode: ${SICKCHILL_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/sickchill/sickchill.ports.yml b/compose/.apps/sickchill/sickchill.ports.yml index 3c1cd85194..b70b0fc494 100644 --- a/compose/.apps/sickchill/sickchill.ports.yml +++ b/compose/.apps/sickchill/sickchill.ports.yml @@ -1,4 +1,4 @@ services: - sickchill: + ${_appname_}: ports: - - ${SICKCHILL_PORT_8081}:8081 + - ${${_APPNAME_}_PORT_8081}:8081 diff --git a/compose/.apps/sickchill/sickchill.x86_64.yml b/compose/.apps/sickchill/sickchill.x86_64.yml index f8692b2647..4c4eb4bc7b 100644 --- a/compose/.apps/sickchill/sickchill.x86_64.yml +++ b/compose/.apps/sickchill/sickchill.x86_64.yml @@ -1,3 +1,3 @@ services: - sickchill: - image: lscr.io/linuxserver/sickchill:${SICKCHILL_TAG} + ${_appname_}: + image: lscr.io/linuxserver/sickchill:${${_APPNAME_}_TAG} diff --git a/compose/.apps/sickchill/sickchill.yml b/compose/.apps/sickchill/sickchill.yml index efe94aab0d..ace6d5d0ab 100644 --- a/compose/.apps/sickchill/sickchill.yml +++ b/compose/.apps/sickchill/sickchill.yml @@ -1,12 +1,12 @@ services: - sickchill: - container_name: ${SICKCHILL_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${SICKCHILL_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/sickchill:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/smokeping/smokeping.aarch64.yml b/compose/.apps/smokeping/smokeping.aarch64.yml index ff1eaa69a6..6dca09c211 100644 --- a/compose/.apps/smokeping/smokeping.aarch64.yml +++ b/compose/.apps/smokeping/smokeping.aarch64.yml @@ -1,3 +1,3 @@ services: - smokeping: - image: lscr.io/linuxserver/smokeping:${SMOKEPING_TAG} + ${_appname_}: + image: lscr.io/linuxserver/smokeping:${${_APPNAME_}_TAG} diff --git a/compose/.apps/smokeping/smokeping.hostname.yml b/compose/.apps/smokeping/smokeping.hostname.yml index cb33ab1683..4dc53c3782 100644 --- a/compose/.apps/smokeping/smokeping.hostname.yml +++ b/compose/.apps/smokeping/smokeping.hostname.yml @@ -1,3 +1,3 @@ services: - smokeping: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/smokeping/smokeping.labels.yml b/compose/.apps/smokeping/smokeping.labels.yml index 1f7d918f4d..0e6dbe2619 100644 --- a/compose/.apps/smokeping/smokeping.labels.yml +++ b/compose/.apps/smokeping/smokeping.labels.yml @@ -1,15 +1,15 @@ services: - smokeping: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Latency logging, graphing, and alerting system" com.dockstarter.appinfo.nicename: "SmokePing" - com.dockstarter.appvars.smokeping_container_name: "smokeping" - com.dockstarter.appvars.smokeping_enabled: "false" - com.dockstarter.appvars.smokeping_environment_dns1: "1.1.1.1" - com.dockstarter.appvars.smokeping_environment_dns2: "8.8.8.8" - com.dockstarter.appvars.smokeping_network_mode: "" - com.dockstarter.appvars.smokeping_port_80: "8011" - com.dockstarter.appvars.smokeping_restart: "unless-stopped" - com.dockstarter.appvars.smokeping_tag: "latest" - com.dockstarter.appvars.smokeping_volume_datadir: "/mnt/smokeping" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_dns1: "1.1.1.1" + com.dockstarter.appvars.${_appname_}_environment_dns2: "8.8.8.8" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_80: "8011" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_datadir: "/mnt/smokeping" diff --git a/compose/.apps/smokeping/smokeping.netmode.yml b/compose/.apps/smokeping/smokeping.netmode.yml index 347cb1826f..f36884ffb9 100644 --- a/compose/.apps/smokeping/smokeping.netmode.yml +++ b/compose/.apps/smokeping/smokeping.netmode.yml @@ -1,3 +1,3 @@ services: - smokeping: - network_mode: ${SMOKEPING_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/smokeping/smokeping.ports.yml b/compose/.apps/smokeping/smokeping.ports.yml index 8c17a38bc4..c37afbebb5 100644 --- a/compose/.apps/smokeping/smokeping.ports.yml +++ b/compose/.apps/smokeping/smokeping.ports.yml @@ -1,4 +1,4 @@ services: - smokeping: + ${_appname_}: ports: - - ${SMOKEPING_PORT_80}:80 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/smokeping/smokeping.x86_64.yml b/compose/.apps/smokeping/smokeping.x86_64.yml index ff1eaa69a6..6dca09c211 100644 --- a/compose/.apps/smokeping/smokeping.x86_64.yml +++ b/compose/.apps/smokeping/smokeping.x86_64.yml @@ -1,3 +1,3 @@ services: - smokeping: - image: lscr.io/linuxserver/smokeping:${SMOKEPING_TAG} + ${_appname_}: + image: lscr.io/linuxserver/smokeping:${${_APPNAME_}_TAG} diff --git a/compose/.apps/smokeping/smokeping.yml b/compose/.apps/smokeping/smokeping.yml index 1a3937ee5b..9cad219eb9 100644 --- a/compose/.apps/smokeping/smokeping.yml +++ b/compose/.apps/smokeping/smokeping.yml @@ -1,16 +1,16 @@ services: - smokeping: - container_name: ${SMOKEPING_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} dns: - - ${SMOKEPING_ENVIRONMENT_DNS1} - - ${SMOKEPING_ENVIRONMENT_DNS2} + - ${${_APPNAME_}_ENVIRONMENT_DNS1} + - ${${_APPNAME_}_ENVIRONMENT_DNS2} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${SMOKEPING_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/smokeping:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${SMOKEPING_VOLUME_DATADIR}:/data + - ${${_APPNAME_}_VOLUME_DATADIR}:/data diff --git a/compose/.apps/sonarr/sonarr.aarch64.yml b/compose/.apps/sonarr/sonarr.aarch64.yml index 319fd91b1c..3b0115c1a6 100644 --- a/compose/.apps/sonarr/sonarr.aarch64.yml +++ b/compose/.apps/sonarr/sonarr.aarch64.yml @@ -1,3 +1,3 @@ services: - sonarr: - image: lscr.io/linuxserver/sonarr:${SONARR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/sonarr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/sonarr/sonarr.hostname.yml b/compose/.apps/sonarr/sonarr.hostname.yml index 5fc3d4c070..4dc53c3782 100644 --- a/compose/.apps/sonarr/sonarr.hostname.yml +++ b/compose/.apps/sonarr/sonarr.hostname.yml @@ -1,3 +1,3 @@ services: - sonarr: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/sonarr/sonarr.labels.yml b/compose/.apps/sonarr/sonarr.labels.yml index b4703cae8c..72a59477dc 100644 --- a/compose/.apps/sonarr/sonarr.labels.yml +++ b/compose/.apps/sonarr/sonarr.labels.yml @@ -1,12 +1,12 @@ services: - sonarr: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Smart TV show PVR via Usenet and BitTorrent" com.dockstarter.appinfo.nicename: "Sonarr" - com.dockstarter.appvars.sonarr_container_name: "sonarr" - com.dockstarter.appvars.sonarr_enabled: "false" - com.dockstarter.appvars.sonarr_network_mode: "" - com.dockstarter.appvars.sonarr_port_8989: "8989" - com.dockstarter.appvars.sonarr_restart: "unless-stopped" - com.dockstarter.appvars.sonarr_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8989: "8989" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/sonarr/sonarr.netmode.yml b/compose/.apps/sonarr/sonarr.netmode.yml index f9fbd46866..f36884ffb9 100644 --- a/compose/.apps/sonarr/sonarr.netmode.yml +++ b/compose/.apps/sonarr/sonarr.netmode.yml @@ -1,3 +1,3 @@ services: - sonarr: - network_mode: ${SONARR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/sonarr/sonarr.ports.yml b/compose/.apps/sonarr/sonarr.ports.yml index 25b6772ea1..e749e8dce4 100644 --- a/compose/.apps/sonarr/sonarr.ports.yml +++ b/compose/.apps/sonarr/sonarr.ports.yml @@ -1,4 +1,4 @@ services: - sonarr: + ${_appname_}: ports: - - ${SONARR_PORT_8989}:8989 + - ${${_APPNAME_}_PORT_8989}:8989 diff --git a/compose/.apps/sonarr/sonarr.x86_64.yml b/compose/.apps/sonarr/sonarr.x86_64.yml index 319fd91b1c..3b0115c1a6 100644 --- a/compose/.apps/sonarr/sonarr.x86_64.yml +++ b/compose/.apps/sonarr/sonarr.x86_64.yml @@ -1,3 +1,3 @@ services: - sonarr: - image: lscr.io/linuxserver/sonarr:${SONARR_TAG} + ${_appname_}: + image: lscr.io/linuxserver/sonarr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/sonarr/sonarr.yml b/compose/.apps/sonarr/sonarr.yml index b9c39c02e9..ace6d5d0ab 100644 --- a/compose/.apps/sonarr/sonarr.yml +++ b/compose/.apps/sonarr/sonarr.yml @@ -1,12 +1,12 @@ services: - sonarr: - container_name: ${SONARR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${SONARR_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/sonarr:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/speedtest/speedtest.aarch64.yml b/compose/.apps/speedtest/speedtest.aarch64.yml index 0ba66c1c4a..7487a618cf 100644 --- a/compose/.apps/speedtest/speedtest.aarch64.yml +++ b/compose/.apps/speedtest/speedtest.aarch64.yml @@ -1,3 +1,3 @@ services: - speedtest: - image: henrywhitaker3/speedtest-tracker:${SPEEDTEST_TAG}-arm + ${_appname_}: + image: henrywhitaker3/speedtest-tracker:${${_APPNAME_}_TAG}-arm diff --git a/compose/.apps/speedtest/speedtest.hostname.yml b/compose/.apps/speedtest/speedtest.hostname.yml index 395ee51094..4dc53c3782 100644 --- a/compose/.apps/speedtest/speedtest.hostname.yml +++ b/compose/.apps/speedtest/speedtest.hostname.yml @@ -1,3 +1,3 @@ services: - speedtest: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/speedtest/speedtest.labels.yml b/compose/.apps/speedtest/speedtest.labels.yml index 5a87a67429..47b0c2fa5e 100644 --- a/compose/.apps/speedtest/speedtest.labels.yml +++ b/compose/.apps/speedtest/speedtest.labels.yml @@ -1,14 +1,14 @@ services: - speedtest: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "This program runs a speedtest check every hour and graphs the results." com.dockstarter.appinfo.nicename: "speedtest" - com.dockstarter.appvars.speedtest_container_name: "speedtest" - com.dockstarter.appvars.speedtest_enabled: "false" - com.dockstarter.appvars.speedtest_environment_base_path: "/" - com.dockstarter.appvars.speedtest_environment_ookla_eula_gdpr: "true" - com.dockstarter.appvars.speedtest_network_mode: "" - com.dockstarter.appvars.speedtest_port_80: "80" - com.dockstarter.appvars.speedtest_restart: "unless-stopped" - com.dockstarter.appvars.speedtest_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_base_path: "/" + com.dockstarter.appvars.${_appname_}_environment_ookla_eula_gdpr: "true" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_80: "80" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/speedtest/speedtest.netmode.yml b/compose/.apps/speedtest/speedtest.netmode.yml index 7853745eb9..f36884ffb9 100644 --- a/compose/.apps/speedtest/speedtest.netmode.yml +++ b/compose/.apps/speedtest/speedtest.netmode.yml @@ -1,3 +1,3 @@ services: - speedtest: - network_mode: ${SPEEDTEST_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/speedtest/speedtest.ports.yml b/compose/.apps/speedtest/speedtest.ports.yml index 279a787d82..c37afbebb5 100644 --- a/compose/.apps/speedtest/speedtest.ports.yml +++ b/compose/.apps/speedtest/speedtest.ports.yml @@ -1,4 +1,4 @@ services: - speedtest: + ${_appname_}: ports: - - ${SPEEDTEST_PORT_80}:80 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/speedtest/speedtest.x86_64.yml b/compose/.apps/speedtest/speedtest.x86_64.yml index 63dfa60d4d..1ca11d61ff 100644 --- a/compose/.apps/speedtest/speedtest.x86_64.yml +++ b/compose/.apps/speedtest/speedtest.x86_64.yml @@ -1,3 +1,3 @@ services: - speedtest: - image: henrywhitaker3/speedtest-tracker:${SPEEDTEST_TAG} + ${_appname_}: + image: henrywhitaker3/speedtest-tracker:${${_APPNAME_}_TAG} diff --git a/compose/.apps/speedtest/speedtest.yml b/compose/.apps/speedtest/speedtest.yml index 56e8928201..e9ab37b6cd 100644 --- a/compose/.apps/speedtest/speedtest.yml +++ b/compose/.apps/speedtest/speedtest.yml @@ -1,14 +1,14 @@ services: - speedtest: - container_name: ${SPEEDTEST_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - OOKLA_EULA_GDPR=${SPEEDTEST_ENVIRONMENT_OOKLA_EULA_GDPR} + - OOKLA_EULA_GDPR=${${_APPNAME_}_ENVIRONMENT_OOKLA_EULA_GDPR} - PGID=${PGID} - PUID=${PUID} - - BASE_PATH=${SPEEDTEST_ENVIRONMENT_BASE_PATH} + - BASE_PATH=${${_APPNAME_}_ENVIRONMENT_BASE_PATH} - TZ=${TZ} - restart: ${SPEEDTEST_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/speedtest:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/swag/swag.aarch64.yml b/compose/.apps/swag/swag.aarch64.yml index 294fde429c..d952604507 100644 --- a/compose/.apps/swag/swag.aarch64.yml +++ b/compose/.apps/swag/swag.aarch64.yml @@ -1,3 +1,3 @@ services: - swag: - image: lscr.io/linuxserver/swag:${SWAG_TAG} + ${_appname_}: + image: lscr.io/linuxserver/swag:${${_APPNAME_}_TAG} diff --git a/compose/.apps/swag/swag.hostname.yml b/compose/.apps/swag/swag.hostname.yml index bcaa3dc5e9..4dc53c3782 100644 --- a/compose/.apps/swag/swag.hostname.yml +++ b/compose/.apps/swag/swag.hostname.yml @@ -1,3 +1,3 @@ services: - swag: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/swag/swag.labels.yml b/compose/.apps/swag/swag.labels.yml index 0d9049f26b..594259f282 100644 --- a/compose/.apps/swag/swag.labels.yml +++ b/compose/.apps/swag/swag.labels.yml @@ -1,20 +1,20 @@ services: - swag: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Secure Web-server And Gateway" com.dockstarter.appinfo.nicename: "SWAG" - com.dockstarter.appvars.swag_container_name: "swag" - com.dockstarter.appvars.swag_enabled: "false" - com.dockstarter.appvars.swag_environment_dnsplugin: "" - com.dockstarter.appvars.swag_environment_email: "" - com.dockstarter.appvars.swag_environment_extra_domains: "" - com.dockstarter.appvars.swag_environment_only_subdomains: "false" - com.dockstarter.appvars.swag_environment_subdomains: "www" - com.dockstarter.appvars.swag_environment_url: "" - com.dockstarter.appvars.swag_environment_validation: "http" - com.dockstarter.appvars.swag_network_mode: "" - com.dockstarter.appvars.swag_port_443: "443" - com.dockstarter.appvars.swag_port_80: "80" - com.dockstarter.appvars.swag_restart: "unless-stopped" - com.dockstarter.appvars.swag_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_dnsplugin: "" + com.dockstarter.appvars.${_appname_}_environment_email: "" + com.dockstarter.appvars.${_appname_}_environment_extra_domains: "" + com.dockstarter.appvars.${_appname_}_environment_only_subdomains: "false" + com.dockstarter.appvars.${_appname_}_environment_subdomains: "www" + com.dockstarter.appvars.${_appname_}_environment_url: "" + com.dockstarter.appvars.${_appname_}_environment_validation: "http" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_443: "443" + com.dockstarter.appvars.${_appname_}_port_80: "80" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/swag/swag.netmode.yml b/compose/.apps/swag/swag.netmode.yml index 658db51971..f36884ffb9 100644 --- a/compose/.apps/swag/swag.netmode.yml +++ b/compose/.apps/swag/swag.netmode.yml @@ -1,3 +1,3 @@ services: - swag: - network_mode: ${SWAG_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/swag/swag.ports.yml b/compose/.apps/swag/swag.ports.yml index baa99edb47..b90d412fbb 100644 --- a/compose/.apps/swag/swag.ports.yml +++ b/compose/.apps/swag/swag.ports.yml @@ -1,5 +1,5 @@ services: - swag: + ${_appname_}: ports: - - ${SWAG_PORT_443}:443 - - ${SWAG_PORT_80}:80 + - ${${_APPNAME_}_PORT_443}:443 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/swag/swag.x86_64.yml b/compose/.apps/swag/swag.x86_64.yml index 294fde429c..d952604507 100644 --- a/compose/.apps/swag/swag.x86_64.yml +++ b/compose/.apps/swag/swag.x86_64.yml @@ -1,3 +1,3 @@ services: - swag: - image: lscr.io/linuxserver/swag:${SWAG_TAG} + ${_appname_}: + image: lscr.io/linuxserver/swag:${${_APPNAME_}_TAG} diff --git a/compose/.apps/swag/swag.yml b/compose/.apps/swag/swag.yml index 7466a45521..eb75533f04 100644 --- a/compose/.apps/swag/swag.yml +++ b/compose/.apps/swag/swag.yml @@ -1,21 +1,21 @@ services: - swag: + ${_appname_}: cap_add: - NET_ADMIN - container_name: ${SWAG_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - DNSPLUGIN=${SWAG_ENVIRONMENT_DNSPLUGIN} - - EMAIL=${SWAG_ENVIRONMENT_EMAIL} - - EXTRA_DOMAINS=${SWAG_ENVIRONMENT_EXTRA_DOMAINS} - - ONLY_SUBDOMAINS=${SWAG_ENVIRONMENT_ONLY_SUBDOMAINS} + - DNSPLUGIN=${${_APPNAME_}_ENVIRONMENT_DNSPLUGIN} + - EMAIL=${${_APPNAME_}_ENVIRONMENT_EMAIL} + - EXTRA_DOMAINS=${${_APPNAME_}_ENVIRONMENT_EXTRA_DOMAINS} + - ONLY_SUBDOMAINS=${${_APPNAME_}_ENVIRONMENT_ONLY_SUBDOMAINS} - PGID=${PGID} - PUID=${PUID} - - SUBDOMAINS=${SWAG_ENVIRONMENT_SUBDOMAINS} + - SUBDOMAINS=${${_APPNAME_}_ENVIRONMENT_SUBDOMAINS} - TZ=${TZ} - - URL=${SWAG_ENVIRONMENT_URL} - - VALIDATION=${SWAG_ENVIRONMENT_VALIDATION} - restart: ${SWAG_RESTART} + - URL=${${_APPNAME_}_ENVIRONMENT_URL} + - VALIDATION=${${_APPNAME_}_ENVIRONMENT_VALIDATION} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/swag:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/synclounge/synclounge.aarch64.yml b/compose/.apps/synclounge/synclounge.aarch64.yml index 769fad8f54..911e142284 100644 --- a/compose/.apps/synclounge/synclounge.aarch64.yml +++ b/compose/.apps/synclounge/synclounge.aarch64.yml @@ -1,3 +1,3 @@ services: - synclounge: - image: lscr.io/linuxserver/synclounge:${SYNCLOUNGE_TAG} + ${_appname_}: + image: lscr.io/linuxserver/synclounge:${${_APPNAME_}_TAG} diff --git a/compose/.apps/synclounge/synclounge.hostname.yml b/compose/.apps/synclounge/synclounge.hostname.yml index 38d3545d11..4dc53c3782 100644 --- a/compose/.apps/synclounge/synclounge.hostname.yml +++ b/compose/.apps/synclounge/synclounge.hostname.yml @@ -1,3 +1,3 @@ services: - synclounge: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/synclounge/synclounge.labels.yml b/compose/.apps/synclounge/synclounge.labels.yml index b64d5f418c..fc5190022c 100644 --- a/compose/.apps/synclounge/synclounge.labels.yml +++ b/compose/.apps/synclounge/synclounge.labels.yml @@ -1,19 +1,19 @@ services: - synclounge: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Watch Plex in sync with your friends/family, wherever you are." com.dockstarter.appinfo.nicename: "SyncLounge" - com.dockstarter.appvars.synclounge_container_name: "synclounge" - com.dockstarter.appvars.synclounge_enabled: "false" - com.dockstarter.appvars.synclounge_environment_auth_list: "" - com.dockstarter.appvars.synclounge_environment_autojoin_enable: "false" - com.dockstarter.appvars.synclounge_environment_autojoin_password: "" - com.dockstarter.appvars.synclounge_environment_autojoin_room: "" - com.dockstarter.appvars.synclounge_environment_external_server_port: "" - com.dockstarter.appvars.synclounge_environment_external_url: "" - com.dockstarter.appvars.synclounge_network_mode: "" - com.dockstarter.appvars.synclounge_port_8088: "8088" - com.dockstarter.appvars.synclounge_port_8089: "8089" - com.dockstarter.appvars.synclounge_restart: "unless-stopped" - com.dockstarter.appvars.synclounge_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_auth_list: "" + com.dockstarter.appvars.${_appname_}_environment_autojoin_enable: "false" + com.dockstarter.appvars.${_appname_}_environment_autojoin_password: "" + com.dockstarter.appvars.${_appname_}_environment_autojoin_room: "" + com.dockstarter.appvars.${_appname_}_environment_external_server_port: "" + com.dockstarter.appvars.${_appname_}_environment_external_url: "" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8088: "8088" + com.dockstarter.appvars.${_appname_}_port_8089: "8089" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/synclounge/synclounge.netmode.yml b/compose/.apps/synclounge/synclounge.netmode.yml index 423c1140c8..f36884ffb9 100644 --- a/compose/.apps/synclounge/synclounge.netmode.yml +++ b/compose/.apps/synclounge/synclounge.netmode.yml @@ -1,3 +1,3 @@ services: - synclounge: - network_mode: ${SYNCLOUNGE_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/synclounge/synclounge.ports.yml b/compose/.apps/synclounge/synclounge.ports.yml index eb0016d021..0b68b0becd 100644 --- a/compose/.apps/synclounge/synclounge.ports.yml +++ b/compose/.apps/synclounge/synclounge.ports.yml @@ -1,5 +1,5 @@ services: - synclounge: + ${_appname_}: ports: - - ${SYNCLOUNGE_PORT_8088}:8088 - - ${SYNCLOUNGE_PORT_8089}:8089 + - ${${_APPNAME_}_PORT_8088}:8088 + - ${${_APPNAME_}_PORT_8089}:8089 diff --git a/compose/.apps/synclounge/synclounge.x86_64.yml b/compose/.apps/synclounge/synclounge.x86_64.yml index 769fad8f54..911e142284 100644 --- a/compose/.apps/synclounge/synclounge.x86_64.yml +++ b/compose/.apps/synclounge/synclounge.x86_64.yml @@ -1,3 +1,3 @@ services: - synclounge: - image: lscr.io/linuxserver/synclounge:${SYNCLOUNGE_TAG} + ${_appname_}: + image: lscr.io/linuxserver/synclounge:${${_APPNAME_}_TAG} diff --git a/compose/.apps/synclounge/synclounge.yml b/compose/.apps/synclounge/synclounge.yml index 7467a01164..6dc522ae97 100644 --- a/compose/.apps/synclounge/synclounge.yml +++ b/compose/.apps/synclounge/synclounge.yml @@ -1,15 +1,15 @@ services: - synclounge: - container_name: ${SYNCLOUNGE_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - AUTH_LIST=${SYNCLOUNGE_ENVIRONMENT_AUTH_LIST} - - AUTOJOIN_ENABLED=${SYNCLOUNGE_ENVIRONMENT_AUTOJOIN_ENABLE} - - AUTOJOIN_PASSWORD=${SYNCLOUNGE_ENVIRONMENT_AUTOJOIN_PASSWORD} - - AUTOJOIN_ROOM=${SYNCLOUNGE_ENVIRONMENT_AUTOJOIN_ROOM} - - EXTERNAL_SERVER_PORT=${SYNCLOUNGE_ENVIRONMENT_EXTERNAL_SERVER_PORT} - - EXTERNAL_URL=${SYNCLOUNGE_ENVIRONMENT_EXTERNAL_URL} + - AUTH_LIST=${${_APPNAME_}_ENVIRONMENT_AUTH_LIST} + - AUTOJOIN_ENABLED=${${_APPNAME_}_ENVIRONMENT_AUTOJOIN_ENABLE} + - AUTOJOIN_PASSWORD=${${_APPNAME_}_ENVIRONMENT_AUTOJOIN_PASSWORD} + - AUTOJOIN_ROOM=${${_APPNAME_}_ENVIRONMENT_AUTOJOIN_ROOM} + - EXTERNAL_SERVER_PORT=${${_APPNAME_}_ENVIRONMENT_EXTERNAL_SERVER_PORT} + - EXTERNAL_URL=${${_APPNAME_}_ENVIRONMENT_EXTERNAL_URL} - TZ=${TZ} - restart: ${SYNCLOUNGE_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/syncthing/syncthing.aarch64.yml b/compose/.apps/syncthing/syncthing.aarch64.yml index 1cb7a10883..2e37f8d0dc 100644 --- a/compose/.apps/syncthing/syncthing.aarch64.yml +++ b/compose/.apps/syncthing/syncthing.aarch64.yml @@ -1,3 +1,3 @@ services: - syncthing: - image: lscr.io/linuxserver/syncthing:${SYNCTHING_TAG} + ${_appname_}: + image: lscr.io/linuxserver/syncthing:${${_APPNAME_}_TAG} diff --git a/compose/.apps/syncthing/syncthing.hostname.yml b/compose/.apps/syncthing/syncthing.hostname.yml index 0578374698..4dc53c3782 100644 --- a/compose/.apps/syncthing/syncthing.hostname.yml +++ b/compose/.apps/syncthing/syncthing.hostname.yml @@ -1,3 +1,3 @@ services: - syncthing: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/syncthing/syncthing.labels.yml b/compose/.apps/syncthing/syncthing.labels.yml index 64fdd873ea..5697027028 100644 --- a/compose/.apps/syncthing/syncthing.labels.yml +++ b/compose/.apps/syncthing/syncthing.labels.yml @@ -1,15 +1,15 @@ services: - syncthing: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Open-source peer-to-peer file synchronization" com.dockstarter.appinfo.nicename: "Syncthing" - com.dockstarter.appvars.syncthing_container_name: "syncthing" - com.dockstarter.appvars.syncthing_enabled: "false" - com.dockstarter.appvars.syncthing_network_mode: "" - com.dockstarter.appvars.syncthing_port_21027: "21027" - com.dockstarter.appvars.syncthing_port_22000: "22000" - com.dockstarter.appvars.syncthing_port_8384: "8384" - com.dockstarter.appvars.syncthing_restart: "unless-stopped" - com.dockstarter.appvars.syncthing_tag: "latest" - com.dockstarter.appvars.syncthing_volume_sourcedir: "/mnt/syncthing" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_21027: "21027" + com.dockstarter.appvars.${_appname_}_port_22000: "22000" + com.dockstarter.appvars.${_appname_}_port_8384: "8384" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_sourcedir: "/mnt/syncthing" diff --git a/compose/.apps/syncthing/syncthing.netmode.yml b/compose/.apps/syncthing/syncthing.netmode.yml index d6f6e4ec19..f36884ffb9 100644 --- a/compose/.apps/syncthing/syncthing.netmode.yml +++ b/compose/.apps/syncthing/syncthing.netmode.yml @@ -1,3 +1,3 @@ services: - syncthing: - network_mode: ${SYNCTHING_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/syncthing/syncthing.ports.yml b/compose/.apps/syncthing/syncthing.ports.yml index 8559d5b6e7..e13dc8e158 100644 --- a/compose/.apps/syncthing/syncthing.ports.yml +++ b/compose/.apps/syncthing/syncthing.ports.yml @@ -1,6 +1,6 @@ services: - syncthing: + ${_appname_}: ports: - - ${SYNCTHING_PORT_21027}:21027/udp - - ${SYNCTHING_PORT_22000}:22000 - - ${SYNCTHING_PORT_8384}:8384 + - ${${_APPNAME_}_PORT_21027}:21027/udp + - ${${_APPNAME_}_PORT_22000}:22000 + - ${${_APPNAME_}_PORT_8384}:8384 diff --git a/compose/.apps/syncthing/syncthing.x86_64.yml b/compose/.apps/syncthing/syncthing.x86_64.yml index 1cb7a10883..2e37f8d0dc 100644 --- a/compose/.apps/syncthing/syncthing.x86_64.yml +++ b/compose/.apps/syncthing/syncthing.x86_64.yml @@ -1,3 +1,3 @@ services: - syncthing: - image: lscr.io/linuxserver/syncthing:${SYNCTHING_TAG} + ${_appname_}: + image: lscr.io/linuxserver/syncthing:${${_APPNAME_}_TAG} diff --git a/compose/.apps/syncthing/syncthing.yml b/compose/.apps/syncthing/syncthing.yml index d4e70eada1..55fca4b8e4 100644 --- a/compose/.apps/syncthing/syncthing.yml +++ b/compose/.apps/syncthing/syncthing.yml @@ -1,13 +1,13 @@ services: - syncthing: - container_name: ${SYNCTHING_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${SYNCTHING_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/syncthing:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${SYNCTHING_VOLUME_SOURCEDIR}:/source + - ${${_APPNAME_}_VOLUME_SOURCEDIR}:/source diff --git a/compose/.apps/tandoor/tandoor.aarch64.yml b/compose/.apps/tandoor/tandoor.aarch64.yml index ad8658e08b..1af111ce1c 100644 --- a/compose/.apps/tandoor/tandoor.aarch64.yml +++ b/compose/.apps/tandoor/tandoor.aarch64.yml @@ -1,3 +1,3 @@ services: - tandoor: - image: docker.io/vabene1111/recipes:${TANDOOR_TAG} + ${_appname_}: + image: docker.io/vabene1111/recipes:${${_APPNAME_}_TAG} diff --git a/compose/.apps/tandoor/tandoor.hostname.yml b/compose/.apps/tandoor/tandoor.hostname.yml index 0e19a7adef..4dc53c3782 100644 --- a/compose/.apps/tandoor/tandoor.hostname.yml +++ b/compose/.apps/tandoor/tandoor.hostname.yml @@ -1,3 +1,3 @@ services: - tandoor: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/tandoor/tandoor.labels.yml b/compose/.apps/tandoor/tandoor.labels.yml index 9d437267c9..5dc3129518 100644 --- a/compose/.apps/tandoor/tandoor.labels.yml +++ b/compose/.apps/tandoor/tandoor.labels.yml @@ -1,17 +1,17 @@ services: - tandoor: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "The recipe manager that allows you to manage your ever growing collection of digital recipes." com.dockstarter.appinfo.nicename: "Tandoor" - com.dockstarter.appvars.tandoor_container_name: "tandoor" - com.dockstarter.appvars.tandoor_enabled: "false" - com.dockstarter.appvars.tandoor_environment_allowed_hosts: "*" - com.dockstarter.appvars.tandoor_environment_database_url: "sqlite://localhost/data/db.sqlite3" - com.dockstarter.appvars.tandoor_environment_debug: "0" - com.dockstarter.appvars.tandoor_environment_gunicorn_media: "1" - com.dockstarter.appvars.tandoor_environment_secret_key: "change_me" - com.dockstarter.appvars.tandoor_network_mode: "" - com.dockstarter.appvars.tandoor_port_8080: "8080" - com.dockstarter.appvars.tandoor_restart: "unless-stopped" - com.dockstarter.appvars.tandoor_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_allowed_hosts: "*" + com.dockstarter.appvars.${_appname_}_environment_database_url: "sqlite://localhost/data/db.sqlite3" + com.dockstarter.appvars.${_appname_}_environment_debug: "0" + com.dockstarter.appvars.${_appname_}_environment_gunicorn_media: "1" + com.dockstarter.appvars.${_appname_}_environment_secret_key: "change_me" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8080: "8080" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/tandoor/tandoor.netmode.yml b/compose/.apps/tandoor/tandoor.netmode.yml index 16efeae28f..f36884ffb9 100644 --- a/compose/.apps/tandoor/tandoor.netmode.yml +++ b/compose/.apps/tandoor/tandoor.netmode.yml @@ -1,3 +1,3 @@ services: - tandoor: - network_mode: ${TANDOOR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/tandoor/tandoor.ports.yml b/compose/.apps/tandoor/tandoor.ports.yml index 86d1ea247d..7d1c7e4455 100644 --- a/compose/.apps/tandoor/tandoor.ports.yml +++ b/compose/.apps/tandoor/tandoor.ports.yml @@ -1,4 +1,4 @@ services: - tandoor: + ${_appname_}: ports: - - ${TANDOOR_PORT_8080}:8080 + - ${${_APPNAME_}_PORT_8080}:8080 diff --git a/compose/.apps/tandoor/tandoor.x86_64.yml b/compose/.apps/tandoor/tandoor.x86_64.yml index ad8658e08b..1af111ce1c 100644 --- a/compose/.apps/tandoor/tandoor.x86_64.yml +++ b/compose/.apps/tandoor/tandoor.x86_64.yml @@ -1,3 +1,3 @@ services: - tandoor: - image: docker.io/vabene1111/recipes:${TANDOOR_TAG} + ${_appname_}: + image: docker.io/vabene1111/recipes:${${_APPNAME_}_TAG} diff --git a/compose/.apps/tandoor/tandoor.yml b/compose/.apps/tandoor/tandoor.yml index c2c12ab9cd..ea20085398 100644 --- a/compose/.apps/tandoor/tandoor.yml +++ b/compose/.apps/tandoor/tandoor.yml @@ -1,17 +1,17 @@ services: - tandoor: - container_name: ${TANDOOR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - ALLOWED_HOSTS=${TANDOOR_ENVIRONMENT_ALLOWED_HOSTS} - - DATABASE_URL=${TANDOOR_ENVIRONMENT_DATABASE_URL} - - DEBUG=${TANDOOR_ENVIRONMENT_DEBUG} - - GUNICORN_MEDIA=${TANDOOR_ENVIRONMENT_GUNICORN_MEDIA} - - SECRET_KEY=${TANDOOR_ENVIRONMENT_SECRET_KEY} + - ALLOWED_HOSTS=${${_APPNAME_}_ENVIRONMENT_ALLOWED_HOSTS} + - DATABASE_URL=${${_APPNAME_}_ENVIRONMENT_DATABASE_URL} + - DEBUG=${${_APPNAME_}_ENVIRONMENT_DEBUG} + - GUNICORN_MEDIA=${${_APPNAME_}_ENVIRONMENT_GUNICORN_MEDIA} + - SECRET_KEY=${${_APPNAME_}_ENVIRONMENT_SECRET_KEY} - TZ=${TZ} - restart: ${TANDOOR_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/tandoor/staticfiles:/opt/recipes/staticfiles - - ${DOCKER_VOLUME_CONFIG}/tandoor/mediafiles:/opt/recipes/mediafiles - - ${DOCKER_VOLUME_CONFIG}/tandoor/data:/opt/recipes/data + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/staticfiles:/opt/recipes/staticfiles + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/mediafiles:/opt/recipes/mediafiles + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/data:/opt/recipes/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/tautulli/tautulli.aarch64.yml b/compose/.apps/tautulli/tautulli.aarch64.yml index d1cff769f1..b94e3ad6f6 100644 --- a/compose/.apps/tautulli/tautulli.aarch64.yml +++ b/compose/.apps/tautulli/tautulli.aarch64.yml @@ -1,3 +1,3 @@ services: - tautulli: - image: lscr.io/linuxserver/tautulli:${TAUTULLI_TAG} + ${_appname_}: + image: lscr.io/linuxserver/tautulli:${${_APPNAME_}_TAG} diff --git a/compose/.apps/tautulli/tautulli.hostname.yml b/compose/.apps/tautulli/tautulli.hostname.yml index b93d38ed21..4dc53c3782 100644 --- a/compose/.apps/tautulli/tautulli.hostname.yml +++ b/compose/.apps/tautulli/tautulli.hostname.yml @@ -1,3 +1,3 @@ services: - tautulli: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/tautulli/tautulli.labels.yml b/compose/.apps/tautulli/tautulli.labels.yml index e419651a07..c5d98c5741 100644 --- a/compose/.apps/tautulli/tautulli.labels.yml +++ b/compose/.apps/tautulli/tautulli.labels.yml @@ -1,12 +1,12 @@ services: - tautulli: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Monitoring and tracking tool for Plex Media Server" com.dockstarter.appinfo.nicename: "Tautulli" - com.dockstarter.appvars.tautulli_container_name: "tautulli" - com.dockstarter.appvars.tautulli_enabled: "false" - com.dockstarter.appvars.tautulli_network_mode: "" - com.dockstarter.appvars.tautulli_port_8181: "8181" - com.dockstarter.appvars.tautulli_restart: "unless-stopped" - com.dockstarter.appvars.tautulli_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8181: "8181" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/tautulli/tautulli.netmode.yml b/compose/.apps/tautulli/tautulli.netmode.yml index 5675b55834..f36884ffb9 100644 --- a/compose/.apps/tautulli/tautulli.netmode.yml +++ b/compose/.apps/tautulli/tautulli.netmode.yml @@ -1,3 +1,3 @@ services: - tautulli: - network_mode: ${TAUTULLI_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/tautulli/tautulli.ports.yml b/compose/.apps/tautulli/tautulli.ports.yml index d94ac6db8c..be7c543d2e 100644 --- a/compose/.apps/tautulli/tautulli.ports.yml +++ b/compose/.apps/tautulli/tautulli.ports.yml @@ -1,4 +1,4 @@ services: - tautulli: + ${_appname_}: ports: - - ${TAUTULLI_PORT_8181}:8181 + - ${${_APPNAME_}_PORT_8181}:8181 diff --git a/compose/.apps/tautulli/tautulli.x86_64.yml b/compose/.apps/tautulli/tautulli.x86_64.yml index d1cff769f1..b94e3ad6f6 100644 --- a/compose/.apps/tautulli/tautulli.x86_64.yml +++ b/compose/.apps/tautulli/tautulli.x86_64.yml @@ -1,3 +1,3 @@ services: - tautulli: - image: lscr.io/linuxserver/tautulli:${TAUTULLI_TAG} + ${_appname_}: + image: lscr.io/linuxserver/tautulli:${${_APPNAME_}_TAG} diff --git a/compose/.apps/tautulli/tautulli.yml b/compose/.apps/tautulli/tautulli.yml index eb34ff7bd8..ace6d5d0ab 100644 --- a/compose/.apps/tautulli/tautulli.yml +++ b/compose/.apps/tautulli/tautulli.yml @@ -1,12 +1,12 @@ services: - tautulli: - container_name: ${TAUTULLI_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${TAUTULLI_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/tautulli:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/tdarr/tdarr.hostname.yml b/compose/.apps/tdarr/tdarr.hostname.yml index 293fb247ce..4dc53c3782 100644 --- a/compose/.apps/tdarr/tdarr.hostname.yml +++ b/compose/.apps/tdarr/tdarr.hostname.yml @@ -1,3 +1,3 @@ services: - tdarr: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/tdarr/tdarr.labels.yml b/compose/.apps/tdarr/tdarr.labels.yml index 4be3d5493c..393a143a7c 100644 --- a/compose/.apps/tdarr/tdarr.labels.yml +++ b/compose/.apps/tdarr/tdarr.labels.yml @@ -1,15 +1,15 @@ services: - tdarr: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Audio/Video Library Analytics & Transcode/Remux Automation" com.dockstarter.appinfo.nicename: "Tdarr" - com.dockstarter.appvars.tdarr_container_name: "tdarr" - com.dockstarter.appvars.tdarr_enabled: "false" - com.dockstarter.appvars.tdarr_environment_serverip: "tdarr" - com.dockstarter.appvars.tdarr_network_mode: "" - com.dockstarter.appvars.tdarr_port_8265: "8265" - com.dockstarter.appvars.tdarr_port_8266: "8266" - com.dockstarter.appvars.tdarr_restart: "unless-stopped" - com.dockstarter.appvars.tdarr_tag: "latest" - com.dockstarter.appvars.tdarr_volume_transcode_cache: "~/.config/appdata/tdarr/cache" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_serverip: "tdarr" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8265: "8265" + com.dockstarter.appvars.${_appname_}_port_8266: "8266" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_transcode_cache: "~/.config/appdata/tdarr/cache" diff --git a/compose/.apps/tdarr/tdarr.netmode.yml b/compose/.apps/tdarr/tdarr.netmode.yml index ba3078ec1e..f36884ffb9 100644 --- a/compose/.apps/tdarr/tdarr.netmode.yml +++ b/compose/.apps/tdarr/tdarr.netmode.yml @@ -1,3 +1,3 @@ services: - tdarr: - network_mode: ${TDARR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/tdarr/tdarr.ports.yml b/compose/.apps/tdarr/tdarr.ports.yml index 54336f0284..3478a939d5 100644 --- a/compose/.apps/tdarr/tdarr.ports.yml +++ b/compose/.apps/tdarr/tdarr.ports.yml @@ -1,5 +1,5 @@ services: - tdarr: + ${_appname_}: ports: - - ${TDARR_PORT_8265}:8265 - - ${TDARR_PORT_8266}:8266 + - ${${_APPNAME_}_PORT_8265}:8265 + - ${${_APPNAME_}_PORT_8266}:8266 diff --git a/compose/.apps/tdarr/tdarr.x86_64.yml b/compose/.apps/tdarr/tdarr.x86_64.yml index 6426ad66b8..a09addd8cb 100644 --- a/compose/.apps/tdarr/tdarr.x86_64.yml +++ b/compose/.apps/tdarr/tdarr.x86_64.yml @@ -1,3 +1,3 @@ services: - tdarr: - image: haveagitgat/tdarr:${TDARR_TAG} + ${_appname_}: + image: haveagitgat/tdarr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/tdarr/tdarr.yml b/compose/.apps/tdarr/tdarr.yml index 0c25ed6cf9..fbe46a3394 100644 --- a/compose/.apps/tdarr/tdarr.yml +++ b/compose/.apps/tdarr/tdarr.yml @@ -1,16 +1,16 @@ services: - tdarr: - container_name: ${TDARR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - - serverIP=${TDARR_ENVIRONMENT_SERVERIP} - - serverPort=${TDARR_PORT_8266} + - serverIP=${${_APPNAME_}_ENVIRONMENT_SERVERIP} + - serverPort=${${_APPNAME_}_PORT_8266} - TZ=${TZ} - - webUIPort=${TDARR_PORT_8265} - restart: ${TDARR_RESTART} + - webUIPort=${${_APPNAME_}_PORT_8265} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/tdarr:/app/server + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/app/server - ${DOCKER_VOLUME_STORAGE}:/storage - - ${TDARR_VOLUME_TRANSCODE_CACHE}:/temp + - ${${_APPNAME_}_VOLUME_TRANSCODE_CACHE}:/temp diff --git a/compose/.apps/tdarrnode/tdarrnode.hostname.yml b/compose/.apps/tdarrnode/tdarrnode.hostname.yml index 8055952ee5..4dc53c3782 100644 --- a/compose/.apps/tdarrnode/tdarrnode.hostname.yml +++ b/compose/.apps/tdarrnode/tdarrnode.hostname.yml @@ -1,3 +1,3 @@ services: - tdarrnode: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/tdarrnode/tdarrnode.labels.yml b/compose/.apps/tdarrnode/tdarrnode.labels.yml index a3086c94ff..230c557b66 100644 --- a/compose/.apps/tdarrnode/tdarrnode.labels.yml +++ b/compose/.apps/tdarrnode/tdarrnode.labels.yml @@ -1,17 +1,17 @@ services: - tdarrnode: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Tdarr Node is a self hosted module used for encoding in conjunction with Tdarr" com.dockstarter.appinfo.nicename: "TdarrNode" - com.dockstarter.appvars.tdarrnode_container_name: "tdarrnode" - com.dockstarter.appvars.tdarrnode_enabled: "false" - com.dockstarter.appvars.tdarrnode_environment_nodeid: "TdarrNode" - com.dockstarter.appvars.tdarrnode_environment_nodeip: "tdarrnode" - com.dockstarter.appvars.tdarrnode_environment_serverip: "tdarr" - com.dockstarter.appvars.tdarrnode_environment_serverport: "8266" - com.dockstarter.appvars.tdarrnode_network_mode: "" - com.dockstarter.appvars.tdarrnode_port_8267: "8267" - com.dockstarter.appvars.tdarrnode_restart: "unless-stopped" - com.dockstarter.appvars.tdarrnode_tag: "latest" - com.dockstarter.appvars.tdarrnode_volume_transcode_cache: "~/.config/appdata/tdarrnode/cache" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_nodeid: "TdarrNode" + com.dockstarter.appvars.${_appname_}_environment_nodeip: "tdarrnode" + com.dockstarter.appvars.${_appname_}_environment_serverip: "tdarr" + com.dockstarter.appvars.${_appname_}_environment_serverport: "8266" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8267: "8267" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_transcode_cache: "~/.config/appdata/tdarrnode/cache" diff --git a/compose/.apps/tdarrnode/tdarrnode.netmode.yml b/compose/.apps/tdarrnode/tdarrnode.netmode.yml index 6628696d37..f36884ffb9 100644 --- a/compose/.apps/tdarrnode/tdarrnode.netmode.yml +++ b/compose/.apps/tdarrnode/tdarrnode.netmode.yml @@ -1,3 +1,3 @@ services: - tdarrnode: - network_mode: ${TDARRNODE_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/tdarrnode/tdarrnode.ports.yml b/compose/.apps/tdarrnode/tdarrnode.ports.yml index ff76db0ec0..305884ef5d 100644 --- a/compose/.apps/tdarrnode/tdarrnode.ports.yml +++ b/compose/.apps/tdarrnode/tdarrnode.ports.yml @@ -1,4 +1,4 @@ services: - tdarrnode: + ${_appname_}: ports: - - ${TDARRNODE_PORT_8267}:8267 + - ${${_APPNAME_}_PORT_8267}:8267 diff --git a/compose/.apps/tdarrnode/tdarrnode.x86_64.yml b/compose/.apps/tdarrnode/tdarrnode.x86_64.yml index 5a31d90091..ea012670da 100644 --- a/compose/.apps/tdarrnode/tdarrnode.x86_64.yml +++ b/compose/.apps/tdarrnode/tdarrnode.x86_64.yml @@ -1,3 +1,3 @@ services: - tdarrnode: - image: haveagitgat/tdarr_node:${TDARRNODE_TAG} + ${_appname_}: + image: haveagitgat/tdarr_node:${${_APPNAME_}_TAG} diff --git a/compose/.apps/tdarrnode/tdarrnode.yml b/compose/.apps/tdarrnode/tdarrnode.yml index b49f91f74c..15bb656dd0 100644 --- a/compose/.apps/tdarrnode/tdarrnode.yml +++ b/compose/.apps/tdarrnode/tdarrnode.yml @@ -1,17 +1,17 @@ services: - tdarrnode: - container_name: ${TDARRNODE_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - nodeID=${TDARRNODE_ENVIRONMENT_NODEID} - - nodeIP=${TDARRNODE_ENVIRONMENT_NODEIP} - - nodePort=${TDARRNODE_PORT_8267} + - nodeID=${${_APPNAME_}_ENVIRONMENT_NODEID} + - nodeIP=${${_APPNAME_}_ENVIRONMENT_NODEIP} + - nodePort=${${_APPNAME_}_PORT_8267} - PGID=${PGID} - PUID=${PUID} - - serverIP=${TDARRNODE_ENVIRONMENT_SERVERIP} - - serverPort=${TDARRNODE_ENVIRONMENT_SERVERPORT} + - serverIP=${${_APPNAME_}_ENVIRONMENT_SERVERIP} + - serverPort=${${_APPNAME_}_ENVIRONMENT_SERVERPORT} - TZ=${TZ} - restart: ${TDARRNODE_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage - - ${TDARRNODE_VOLUME_TRANSCODE_CACHE}:/temp + - ${${_APPNAME_}_VOLUME_TRANSCODE_CACHE}:/temp diff --git a/compose/.apps/telegraf/telegraf.aarch64.yml b/compose/.apps/telegraf/telegraf.aarch64.yml index 38cb1f77ce..2ecdeea43e 100644 --- a/compose/.apps/telegraf/telegraf.aarch64.yml +++ b/compose/.apps/telegraf/telegraf.aarch64.yml @@ -1,3 +1,3 @@ services: - telegraf: - image: telegraf:${TELEGRAF_TAG} + ${_appname_}: + image: telegraf:${${_APPNAME_}_TAG} diff --git a/compose/.apps/telegraf/telegraf.hostname.yml b/compose/.apps/telegraf/telegraf.hostname.yml index a4e36e1318..4dc53c3782 100644 --- a/compose/.apps/telegraf/telegraf.hostname.yml +++ b/compose/.apps/telegraf/telegraf.hostname.yml @@ -1,3 +1,3 @@ services: - telegraf: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/telegraf/telegraf.labels.yml b/compose/.apps/telegraf/telegraf.labels.yml index 090ed4384e..b0a82996e2 100644 --- a/compose/.apps/telegraf/telegraf.labels.yml +++ b/compose/.apps/telegraf/telegraf.labels.yml @@ -1,15 +1,15 @@ services: - telegraf: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Agent for collecting metrics and writing them to InfluxDB" com.dockstarter.appinfo.nicename: "Telegraf" - com.dockstarter.appvars.telegraf_container_name: "telegraf" - com.dockstarter.appvars.telegraf_enabled: "false" - com.dockstarter.appvars.telegraf_network_mode: "" - com.dockstarter.appvars.telegraf_port_8092: "8092" - com.dockstarter.appvars.telegraf_port_8094: "8094" - com.dockstarter.appvars.telegraf_port_8125: "8125" - com.dockstarter.appvars.telegraf_restart: "unless-stopped" - com.dockstarter.appvars.telegraf_tag: "latest" - com.dockstarter.appvars.telegraf_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8092: "8092" + com.dockstarter.appvars.${_appname_}_port_8094: "8094" + com.dockstarter.appvars.${_appname_}_port_8125: "8125" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/telegraf/telegraf.netmode.yml b/compose/.apps/telegraf/telegraf.netmode.yml index 6fc70e6b1d..f36884ffb9 100644 --- a/compose/.apps/telegraf/telegraf.netmode.yml +++ b/compose/.apps/telegraf/telegraf.netmode.yml @@ -1,3 +1,3 @@ services: - telegraf: - network_mode: ${TELEGRAF_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/telegraf/telegraf.ports.yml b/compose/.apps/telegraf/telegraf.ports.yml index 98f7b77d46..c5463cf690 100644 --- a/compose/.apps/telegraf/telegraf.ports.yml +++ b/compose/.apps/telegraf/telegraf.ports.yml @@ -1,6 +1,6 @@ services: - telegraf: + ${_appname_}: ports: - - ${TELEGRAF_PORT_8092}:8092/udp - - ${TELEGRAF_PORT_8094}:8094 - - ${TELEGRAF_PORT_8125}:8125 + - ${${_APPNAME_}_PORT_8092}:8092/udp + - ${${_APPNAME_}_PORT_8094}:8094 + - ${${_APPNAME_}_PORT_8125}:8125 diff --git a/compose/.apps/telegraf/telegraf.x86_64.yml b/compose/.apps/telegraf/telegraf.x86_64.yml index 38cb1f77ce..2ecdeea43e 100644 --- a/compose/.apps/telegraf/telegraf.x86_64.yml +++ b/compose/.apps/telegraf/telegraf.x86_64.yml @@ -1,3 +1,3 @@ services: - telegraf: - image: telegraf:${TELEGRAF_TAG} + ${_appname_}: + image: telegraf:${${_APPNAME_}_TAG} diff --git a/compose/.apps/telegraf/telegraf.yml b/compose/.apps/telegraf/telegraf.yml index 61fed8f108..41f3af8696 100644 --- a/compose/.apps/telegraf/telegraf.yml +++ b/compose/.apps/telegraf/telegraf.yml @@ -1,13 +1,13 @@ services: - telegraf: - container_name: ${TELEGRAF_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - HOST_ETC=/host/etc - HOST_MOUNT_PREFIX=/host - HOST_PROC=/host/proc - HOST_SYS=/host/sys - TZ=${TZ} - restart: ${TELEGRAF_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /:/host:ro - /etc:/host/etc:ro @@ -15,6 +15,6 @@ services: - /proc:/host/proc:ro - /sys:/host/sys:ro - /var/run/utmp:/var/run/utmp:ro - - ${DOCKER_VOLUME_CONFIG}/telegraf:/var/lib/telegraf + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/var/lib/telegraf - ${DOCKER_VOLUME_STORAGE}:/storage - - ${TELEGRAF_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock:ro + - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock:ro diff --git a/compose/.apps/thelounge/thelounge.aarch64.yml b/compose/.apps/thelounge/thelounge.aarch64.yml index 457503328a..a791eee83b 100644 --- a/compose/.apps/thelounge/thelounge.aarch64.yml +++ b/compose/.apps/thelounge/thelounge.aarch64.yml @@ -1,3 +1,3 @@ services: - thelounge: - image: lscr.io/linuxserver/thelounge:${THELOUNGE_TAG} + ${_appname_}: + image: lscr.io/linuxserver/thelounge:${${_APPNAME_}_TAG} diff --git a/compose/.apps/thelounge/thelounge.hostname.yml b/compose/.apps/thelounge/thelounge.hostname.yml index ed1bd1d5e8..4dc53c3782 100644 --- a/compose/.apps/thelounge/thelounge.hostname.yml +++ b/compose/.apps/thelounge/thelounge.hostname.yml @@ -1,3 +1,3 @@ services: - thelounge: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/thelounge/thelounge.labels.yml b/compose/.apps/thelounge/thelounge.labels.yml index 4a1b273fee..a60aaa429e 100644 --- a/compose/.apps/thelounge/thelounge.labels.yml +++ b/compose/.apps/thelounge/thelounge.labels.yml @@ -1,12 +1,12 @@ services: - thelounge: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Web IRC client that you host on your own server" com.dockstarter.appinfo.nicename: "TheLounge" - com.dockstarter.appvars.thelounge_container_name: "thelounge" - com.dockstarter.appvars.thelounge_enabled: "false" - com.dockstarter.appvars.thelounge_network_mode: "" - com.dockstarter.appvars.thelounge_port_9000: "9000" - com.dockstarter.appvars.thelounge_restart: "unless-stopped" - com.dockstarter.appvars.thelounge_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_9000: "9000" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/thelounge/thelounge.netmode.yml b/compose/.apps/thelounge/thelounge.netmode.yml index 0eafc89221..f36884ffb9 100644 --- a/compose/.apps/thelounge/thelounge.netmode.yml +++ b/compose/.apps/thelounge/thelounge.netmode.yml @@ -1,3 +1,3 @@ services: - thelounge: - network_mode: ${THELOUNGE_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/thelounge/thelounge.ports.yml b/compose/.apps/thelounge/thelounge.ports.yml index 21b41e3f27..f725dec1dd 100644 --- a/compose/.apps/thelounge/thelounge.ports.yml +++ b/compose/.apps/thelounge/thelounge.ports.yml @@ -1,4 +1,4 @@ services: - thelounge: + ${_appname_}: ports: - - ${THELOUNGE_PORT_9000}:9000 + - ${${_APPNAME_}_PORT_9000}:9000 diff --git a/compose/.apps/thelounge/thelounge.x86_64.yml b/compose/.apps/thelounge/thelounge.x86_64.yml index 457503328a..a791eee83b 100644 --- a/compose/.apps/thelounge/thelounge.x86_64.yml +++ b/compose/.apps/thelounge/thelounge.x86_64.yml @@ -1,3 +1,3 @@ services: - thelounge: - image: lscr.io/linuxserver/thelounge:${THELOUNGE_TAG} + ${_appname_}: + image: lscr.io/linuxserver/thelounge:${${_APPNAME_}_TAG} diff --git a/compose/.apps/thelounge/thelounge.yml b/compose/.apps/thelounge/thelounge.yml index 0948411f5c..ace6d5d0ab 100644 --- a/compose/.apps/thelounge/thelounge.yml +++ b/compose/.apps/thelounge/thelounge.yml @@ -1,12 +1,12 @@ services: - thelounge: - container_name: ${THELOUNGE_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${THELOUNGE_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/thelounge:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/timemachine/timemachine.aarch64.yml b/compose/.apps/timemachine/timemachine.aarch64.yml index 4af884bfef..63de613252 100644 --- a/compose/.apps/timemachine/timemachine.aarch64.yml +++ b/compose/.apps/timemachine/timemachine.aarch64.yml @@ -1,3 +1,3 @@ services: - timemachine: - image: mbentley/timemachine:${TIMEMACHINE_TAG} + ${_appname_}: + image: mbentley/timemachine:${${_APPNAME_}_TAG} diff --git a/compose/.apps/timemachine/timemachine.hostname.yml b/compose/.apps/timemachine/timemachine.hostname.yml index 0ca4dc7517..4dc53c3782 100644 --- a/compose/.apps/timemachine/timemachine.hostname.yml +++ b/compose/.apps/timemachine/timemachine.hostname.yml @@ -1,3 +1,3 @@ services: - timemachine: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/timemachine/timemachine.labels.yml b/compose/.apps/timemachine/timemachine.labels.yml index e50f5b2098..b61875ca64 100644 --- a/compose/.apps/timemachine/timemachine.labels.yml +++ b/compose/.apps/timemachine/timemachine.labels.yml @@ -1,34 +1,34 @@ services: - timemachine: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Docker image to run Samba to provide a compatible Time Machine for macOS" com.dockstarter.appinfo.nicename: "TimeMachine" - com.dockstarter.appvars.timemachine_container_name: "timemachine" - com.dockstarter.appvars.timemachine_enabled: "false" - com.dockstarter.appvars.timemachine_environment_custom_smb_conf: "false" - com.dockstarter.appvars.timemachine_environment_custom_user: "false" - com.dockstarter.appvars.timemachine_environment_debug_level: "1" - com.dockstarter.appvars.timemachine_environment_external_conf: "" - com.dockstarter.appvars.timemachine_environment_hide_shares: "no" - com.dockstarter.appvars.timemachine_environment_mimic_model: "TimeCapsule8,119" - com.dockstarter.appvars.timemachine_environment_password: "timemachine" - com.dockstarter.appvars.timemachine_environment_set_permissions: "false" - com.dockstarter.appvars.timemachine_environment_share_name: "TimeMachine" - com.dockstarter.appvars.timemachine_environment_smb_inherit_permissions: "no" - com.dockstarter.appvars.timemachine_environment_smb_metadata: "stream" - com.dockstarter.appvars.timemachine_environment_smb_nfs_aces: "yes" - com.dockstarter.appvars.timemachine_environment_smb_port: "445" - com.dockstarter.appvars.timemachine_environment_smb_vfs_objects: "acl_xattr fruit streams_xattr" - com.dockstarter.appvars.timemachine_environment_tm_groupname: "timemachine" - com.dockstarter.appvars.timemachine_environment_tm_username: "timemachine" - com.dockstarter.appvars.timemachine_environment_vol_size_limit: "0" - com.dockstarter.appvars.timemachine_environment_workgroup: "WORKGROUP" - com.dockstarter.appvars.timemachine_network_mode: "" - com.dockstarter.appvars.timemachine_port_137: "137" - com.dockstarter.appvars.timemachine_port_138: "138" - com.dockstarter.appvars.timemachine_port_139: "139" - com.dockstarter.appvars.timemachine_port_445: "445" - com.dockstarter.appvars.timemachine_restart: "unless-stopped" - com.dockstarter.appvars.timemachine_tag: "latest" - com.dockstarter.appvars.timemachine_volume_datadir: "/opt/timemachine" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_custom_smb_conf: "false" + com.dockstarter.appvars.${_appname_}_environment_custom_user: "false" + com.dockstarter.appvars.${_appname_}_environment_debug_level: "1" + com.dockstarter.appvars.${_appname_}_environment_external_conf: "" + com.dockstarter.appvars.${_appname_}_environment_hide_shares: "no" + com.dockstarter.appvars.${_appname_}_environment_mimic_model: "TimeCapsule8,119" + com.dockstarter.appvars.${_appname_}_environment_password: "timemachine" + com.dockstarter.appvars.${_appname_}_environment_set_permissions: "false" + com.dockstarter.appvars.${_appname_}_environment_share_name: "TimeMachine" + com.dockstarter.appvars.${_appname_}_environment_smb_inherit_permissions: "no" + com.dockstarter.appvars.${_appname_}_environment_smb_metadata: "stream" + com.dockstarter.appvars.${_appname_}_environment_smb_nfs_aces: "yes" + com.dockstarter.appvars.${_appname_}_environment_smb_port: "445" + com.dockstarter.appvars.${_appname_}_environment_smb_vfs_objects: "acl_xattr fruit streams_xattr" + com.dockstarter.appvars.${_appname_}_environment_tm_groupname: "timemachine" + com.dockstarter.appvars.${_appname_}_environment_tm_username: "timemachine" + com.dockstarter.appvars.${_appname_}_environment_vol_size_limit: "0" + com.dockstarter.appvars.${_appname_}_environment_workgroup: "WORKGROUP" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_137: "137" + com.dockstarter.appvars.${_appname_}_port_138: "138" + com.dockstarter.appvars.${_appname_}_port_139: "139" + com.dockstarter.appvars.${_appname_}_port_445: "445" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_datadir: "/opt/timemachine" diff --git a/compose/.apps/timemachine/timemachine.netmode.yml b/compose/.apps/timemachine/timemachine.netmode.yml index 2629b81ea8..f36884ffb9 100644 --- a/compose/.apps/timemachine/timemachine.netmode.yml +++ b/compose/.apps/timemachine/timemachine.netmode.yml @@ -1,3 +1,3 @@ services: - timemachine: - network_mode: ${TIMEMACHINE_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/timemachine/timemachine.ports.yml b/compose/.apps/timemachine/timemachine.ports.yml index d30780c6d5..5545e23a22 100644 --- a/compose/.apps/timemachine/timemachine.ports.yml +++ b/compose/.apps/timemachine/timemachine.ports.yml @@ -1,7 +1,7 @@ services: - timemachine: + ${_appname_}: ports: - - ${TIMEMACHINE_PORT_137}:137/udp - - ${TIMEMACHINE_PORT_138}:138/udp - - ${TIMEMACHINE_PORT_139}:139 - - ${TIMEMACHINE_PORT_445}:445 + - ${${_APPNAME_}_PORT_137}:137/udp + - ${${_APPNAME_}_PORT_138}:138/udp + - ${${_APPNAME_}_PORT_139}:139 + - ${${_APPNAME_}_PORT_445}:445 diff --git a/compose/.apps/timemachine/timemachine.x86_64.yml b/compose/.apps/timemachine/timemachine.x86_64.yml index 4af884bfef..63de613252 100644 --- a/compose/.apps/timemachine/timemachine.x86_64.yml +++ b/compose/.apps/timemachine/timemachine.x86_64.yml @@ -1,3 +1,3 @@ services: - timemachine: - image: mbentley/timemachine:${TIMEMACHINE_TAG} + ${_appname_}: + image: mbentley/timemachine:${${_APPNAME_}_TAG} diff --git a/compose/.apps/timemachine/timemachine.yml b/compose/.apps/timemachine/timemachine.yml index dc190e01d6..f1eb6a9aca 100644 --- a/compose/.apps/timemachine/timemachine.yml +++ b/compose/.apps/timemachine/timemachine.yml @@ -1,33 +1,33 @@ services: - timemachine: - container_name: ${TIMEMACHINE_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - CUSTOM_SMB_CONF=${TIMEMACHINE_ENVIRONMENT_CUSTOM_SMB_CONF} - - CUSTOM_USER=${TIMEMACHINE_ENVIRONMENT_CUSTOM_USER} - - DEBUG_LEVEL=${TIMEMACHINE_ENVIRONMENT_DEBUG_LEVEL} - - EXTERNAL_CONF=${TIMEMACHINE_ENVIRONMENT_EXTERNAL_CONF} - - HIDE_SHARES=${TIMEMACHINE_ENVIRONMENT_HIDE_SHARES} - - MIMIC_MODEL=${TIMEMACHINE_ENVIRONMENT_MIMIC_MODEL} - - PASSWORD=${TIMEMACHINE_ENVIRONMENT_PASSWORD} + - CUSTOM_SMB_CONF=${${_APPNAME_}_ENVIRONMENT_CUSTOM_SMB_CONF} + - CUSTOM_USER=${${_APPNAME_}_ENVIRONMENT_CUSTOM_USER} + - DEBUG_LEVEL=${${_APPNAME_}_ENVIRONMENT_DEBUG_LEVEL} + - EXTERNAL_CONF=${${_APPNAME_}_ENVIRONMENT_EXTERNAL_CONF} + - HIDE_SHARES=${${_APPNAME_}_ENVIRONMENT_HIDE_SHARES} + - MIMIC_MODEL=${${_APPNAME_}_ENVIRONMENT_MIMIC_MODEL} + - PASSWORD=${${_APPNAME_}_ENVIRONMENT_PASSWORD} - PGID=${PGID} - PUID=${PUID} - - SET_PERMISSIONS=${TIMEMACHINE_ENVIRONMENT_SET_PERMISSIONS} - - SHARE_NAME=${TIMEMACHINE_ENVIRONMENT_SHARE_NAME} - - SMB_INHERIT_PERMISSIONS=${TIMEMACHINE_ENVIRONMENT_SMB_INHERIT_PERMISSIONS} - - SMB_METADATA=${TIMEMACHINE_ENVIRONMENT_SMB_METADATA} - - SMB_NFS_ACES=${TIMEMACHINE_ENVIRONMENT_SMB_NFS_ACES} - - SMB_PORT=${TIMEMACHINE_ENVIRONMENT_SMB_PORT} - - SMB_VFS_OBJECTS=${TIMEMACHINE_ENVIRONMENT_SMB_VFS_OBJECTS} - - TM_GROUPNAME=${TIMEMACHINE_ENVIRONMENT_TM_GROUPNAME} - - TM_USERNAME=${TIMEMACHINE_ENVIRONMENT_TM_USERNAME} + - SET_PERMISSIONS=${${_APPNAME_}_ENVIRONMENT_SET_PERMISSIONS} + - SHARE_NAME=${${_APPNAME_}_ENVIRONMENT_SHARE_NAME} + - SMB_INHERIT_PERMISSIONS=${${_APPNAME_}_ENVIRONMENT_SMB_INHERIT_PERMISSIONS} + - SMB_METADATA=${${_APPNAME_}_ENVIRONMENT_SMB_METADATA} + - SMB_NFS_ACES=${${_APPNAME_}_ENVIRONMENT_SMB_NFS_ACES} + - SMB_PORT=${${_APPNAME_}_ENVIRONMENT_SMB_PORT} + - SMB_VFS_OBJECTS=${${_APPNAME_}_ENVIRONMENT_SMB_VFS_OBJECTS} + - TM_GROUPNAME=${${_APPNAME_}_ENVIRONMENT_TM_GROUPNAME} + - TM_USERNAME=${${_APPNAME_}_ENVIRONMENT_TM_USERNAME} - TZ=${TZ} - - VOLUME_SIZE_LIMIT=${TIMEMACHINE_ENVIRONMENT_VOL_SIZE_LIMIT} - - WORKGROUP=${TIMEMACHINE_ENVIRONMENT_WORKGROUP} - restart: ${TIMEMACHINE_RESTART} + - VOLUME_SIZE_LIMIT=${${_APPNAME_}_ENVIRONMENT_VOL_SIZE_LIMIT} + - WORKGROUP=${${_APPNAME_}_ENVIRONMENT_WORKGROUP} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/timemachine/var-lib-samba:/var/lib/samba - - ${DOCKER_VOLUME_CONFIG}/timemachine/var-cache-samba:/var/cache/samba - - ${DOCKER_VOLUME_CONFIG}/timemachine/run-samba:/run/samba + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/var-lib-samba:/var/lib/samba + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/var-cache-samba:/var/cache/samba + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/run-samba:/run/samba - ${DOCKER_VOLUME_STORAGE}:/storage - - ${TIMEMACHINE_VOLUME_DATADIR}:/opt/timemachine + - ${${_APPNAME_}_VOLUME_DATADIR}:/opt/timemachine diff --git a/compose/.apps/traefik/traefik.aarch64.yml b/compose/.apps/traefik/traefik.aarch64.yml index af555ac79d..a59e4e01dc 100644 --- a/compose/.apps/traefik/traefik.aarch64.yml +++ b/compose/.apps/traefik/traefik.aarch64.yml @@ -1,3 +1,3 @@ services: - traefik: - image: traefik:${TRAEFIK_TAG} + ${_appname_}: + image: traefik:${${_APPNAME_}_TAG} diff --git a/compose/.apps/traefik/traefik.hostname.yml b/compose/.apps/traefik/traefik.hostname.yml index 79373df63a..4dc53c3782 100644 --- a/compose/.apps/traefik/traefik.hostname.yml +++ b/compose/.apps/traefik/traefik.hostname.yml @@ -1,3 +1,3 @@ services: - traefik: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/traefik/traefik.labels.yml b/compose/.apps/traefik/traefik.labels.yml index 134cdcaa40..f29ba51a3d 100644 --- a/compose/.apps/traefik/traefik.labels.yml +++ b/compose/.apps/traefik/traefik.labels.yml @@ -1,15 +1,15 @@ services: - traefik: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A modern HTTP reverse proxy and load balancer that makes deploying microservices easy" com.dockstarter.appinfo.nicename: "Traefik" - com.dockstarter.appvars.traefik_container_name: "traefik" - com.dockstarter.appvars.traefik_enabled: "false" - com.dockstarter.appvars.traefik_network_mode: "" - com.dockstarter.appvars.traefik_port_443: "443" - com.dockstarter.appvars.traefik_port_80: "80" - com.dockstarter.appvars.traefik_port_8080: "8080" - com.dockstarter.appvars.traefik_restart: "unless-stopped" - com.dockstarter.appvars.traefik_tag: "latest" - com.dockstarter.appvars.traefik_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_443: "443" + com.dockstarter.appvars.${_appname_}_port_80: "80" + com.dockstarter.appvars.${_appname_}_port_8080: "8080" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/traefik/traefik.netmode.yml b/compose/.apps/traefik/traefik.netmode.yml index f57785df87..f36884ffb9 100644 --- a/compose/.apps/traefik/traefik.netmode.yml +++ b/compose/.apps/traefik/traefik.netmode.yml @@ -1,3 +1,3 @@ services: - traefik: - network_mode: ${TRAEFIK_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/traefik/traefik.ports.yml b/compose/.apps/traefik/traefik.ports.yml index 004d8b24b9..17baad09d6 100644 --- a/compose/.apps/traefik/traefik.ports.yml +++ b/compose/.apps/traefik/traefik.ports.yml @@ -1,6 +1,6 @@ services: - traefik: + ${_appname_}: ports: - - ${TRAEFIK_PORT_443}:443 - - ${TRAEFIK_PORT_8080}:8080 - - ${TRAEFIK_PORT_80}:80 + - ${${_APPNAME_}_PORT_443}:443 + - ${${_APPNAME_}_PORT_8080}:8080 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/traefik/traefik.x86_64.yml b/compose/.apps/traefik/traefik.x86_64.yml index af555ac79d..a59e4e01dc 100644 --- a/compose/.apps/traefik/traefik.x86_64.yml +++ b/compose/.apps/traefik/traefik.x86_64.yml @@ -1,3 +1,3 @@ services: - traefik: - image: traefik:${TRAEFIK_TAG} + ${_appname_}: + image: traefik:${${_APPNAME_}_TAG} diff --git a/compose/.apps/traefik/traefik.yml b/compose/.apps/traefik/traefik.yml index d8dc140f62..1eedc37267 100644 --- a/compose/.apps/traefik/traefik.yml +++ b/compose/.apps/traefik/traefik.yml @@ -1,13 +1,13 @@ services: - traefik: - container_name: ${TRAEFIK_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${TRAEFIK_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/traefik:/etc/traefik + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/etc/traefik - ${DOCKER_VOLUME_STORAGE}:/storage - - ${TRAEFIK_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock:ro + - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock:ro diff --git a/compose/.apps/traktarr/traktarr.aarch64.yml b/compose/.apps/traktarr/traktarr.aarch64.yml index 9d23b90cc9..9ed8cd7639 100644 --- a/compose/.apps/traktarr/traktarr.aarch64.yml +++ b/compose/.apps/traktarr/traktarr.aarch64.yml @@ -1,3 +1,3 @@ services: - traktarr: - image: eafxx/traktarr:${TRAKTARR_TAG} + ${_appname_}: + image: eafxx/traktarr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/traktarr/traktarr.hostname.yml b/compose/.apps/traktarr/traktarr.hostname.yml index aa3f14b00b..4dc53c3782 100644 --- a/compose/.apps/traktarr/traktarr.hostname.yml +++ b/compose/.apps/traktarr/traktarr.hostname.yml @@ -1,3 +1,3 @@ services: - traktarr: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/traktarr/traktarr.labels.yml b/compose/.apps/traktarr/traktarr.labels.yml index 75608a6f33..1372b20c08 100644 --- a/compose/.apps/traktarr/traktarr.labels.yml +++ b/compose/.apps/traktarr/traktarr.labels.yml @@ -1,11 +1,11 @@ services: - traktarr: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Traktarr uses Trakt.tv to find shows and movies to add in to Sonarr and Radarr, respectively." com.dockstarter.appinfo.nicename: "Traktarr" - com.dockstarter.appvars.traktarr_container_name: "traktarr" - com.dockstarter.appvars.traktarr_enabled: "false" - com.dockstarter.appvars.traktarr_network_mode: "" - com.dockstarter.appvars.traktarr_restart: "unless-stopped" - com.dockstarter.appvars.traktarr_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/traktarr/traktarr.netmode.yml b/compose/.apps/traktarr/traktarr.netmode.yml index 140647442a..f36884ffb9 100644 --- a/compose/.apps/traktarr/traktarr.netmode.yml +++ b/compose/.apps/traktarr/traktarr.netmode.yml @@ -1,3 +1,3 @@ services: - traktarr: - network_mode: ${TRAKTARR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/traktarr/traktarr.x86_64.yml b/compose/.apps/traktarr/traktarr.x86_64.yml index 9d23b90cc9..9ed8cd7639 100644 --- a/compose/.apps/traktarr/traktarr.x86_64.yml +++ b/compose/.apps/traktarr/traktarr.x86_64.yml @@ -1,3 +1,3 @@ services: - traktarr: - image: eafxx/traktarr:${TRAKTARR_TAG} + ${_appname_}: + image: eafxx/traktarr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/traktarr/traktarr.yml b/compose/.apps/traktarr/traktarr.yml index 426741b141..ace6d5d0ab 100644 --- a/compose/.apps/traktarr/traktarr.yml +++ b/compose/.apps/traktarr/traktarr.yml @@ -1,12 +1,12 @@ services: - traktarr: - container_name: ${TRAKTARR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${TRAKTARR_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/traktarr:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/transmission/transmission.aarch64.yml b/compose/.apps/transmission/transmission.aarch64.yml index 6054ca9f6d..f5c5d0abdd 100644 --- a/compose/.apps/transmission/transmission.aarch64.yml +++ b/compose/.apps/transmission/transmission.aarch64.yml @@ -1,3 +1,3 @@ services: - transmission: - image: lscr.io/linuxserver/transmission:${TRANSMISSION_TAG} + ${_appname_}: + image: lscr.io/linuxserver/transmission:${${_APPNAME_}_TAG} diff --git a/compose/.apps/transmission/transmission.hostname.yml b/compose/.apps/transmission/transmission.hostname.yml index 597177712a..4dc53c3782 100644 --- a/compose/.apps/transmission/transmission.hostname.yml +++ b/compose/.apps/transmission/transmission.hostname.yml @@ -1,3 +1,3 @@ services: - transmission: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/transmission/transmission.labels.yml b/compose/.apps/transmission/transmission.labels.yml index 611425dce9..f122cc9145 100644 --- a/compose/.apps/transmission/transmission.labels.yml +++ b/compose/.apps/transmission/transmission.labels.yml @@ -1,14 +1,14 @@ services: - transmission: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Fast, easy, and free BitTorrent client" com.dockstarter.appinfo.nicename: "Transmission" - com.dockstarter.appvars.transmission_container_name: "transmission" - com.dockstarter.appvars.transmission_enabled: "false" - com.dockstarter.appvars.transmission_network_mode: "" - com.dockstarter.appvars.transmission_port_51413: "51413" - com.dockstarter.appvars.transmission_port_6881: "6881" - com.dockstarter.appvars.transmission_port_9091: "9091" - com.dockstarter.appvars.transmission_restart: "unless-stopped" - com.dockstarter.appvars.transmission_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_51413: "51413" + com.dockstarter.appvars.${_appname_}_port_6881: "6881" + com.dockstarter.appvars.${_appname_}_port_9091: "9091" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/transmission/transmission.netmode.yml b/compose/.apps/transmission/transmission.netmode.yml index dc4a538ee5..f36884ffb9 100644 --- a/compose/.apps/transmission/transmission.netmode.yml +++ b/compose/.apps/transmission/transmission.netmode.yml @@ -1,3 +1,3 @@ services: - transmission: - network_mode: ${TRANSMISSION_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/transmission/transmission.ports.yml b/compose/.apps/transmission/transmission.ports.yml index c2fa482afd..b83fd425d4 100644 --- a/compose/.apps/transmission/transmission.ports.yml +++ b/compose/.apps/transmission/transmission.ports.yml @@ -1,8 +1,8 @@ services: - transmission: + ${_appname_}: ports: - - ${TRANSMISSION_PORT_51413}:51413 - - ${TRANSMISSION_PORT_51413}:51413/udp - - ${TRANSMISSION_PORT_6881}:6881 - - ${TRANSMISSION_PORT_6881}:6881/udp - - ${TRANSMISSION_PORT_9091}:9091 + - ${${_APPNAME_}_PORT_51413}:51413 + - ${${_APPNAME_}_PORT_51413}:51413/udp + - ${${_APPNAME_}_PORT_6881}:6881 + - ${${_APPNAME_}_PORT_6881}:6881/udp + - ${${_APPNAME_}_PORT_9091}:9091 diff --git a/compose/.apps/transmission/transmission.x86_64.yml b/compose/.apps/transmission/transmission.x86_64.yml index 6054ca9f6d..f5c5d0abdd 100644 --- a/compose/.apps/transmission/transmission.x86_64.yml +++ b/compose/.apps/transmission/transmission.x86_64.yml @@ -1,3 +1,3 @@ services: - transmission: - image: lscr.io/linuxserver/transmission:${TRANSMISSION_TAG} + ${_appname_}: + image: lscr.io/linuxserver/transmission:${${_APPNAME_}_TAG} diff --git a/compose/.apps/transmission/transmission.yml b/compose/.apps/transmission/transmission.yml index 3ef82a68a1..ace6d5d0ab 100644 --- a/compose/.apps/transmission/transmission.yml +++ b/compose/.apps/transmission/transmission.yml @@ -1,12 +1,12 @@ services: - transmission: - container_name: ${TRANSMISSION_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${TRANSMISSION_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/transmission:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/transmissionvpn/transmissionvpn.aarch64.yml b/compose/.apps/transmissionvpn/transmissionvpn.aarch64.yml index 6838cf2f5a..89df27282b 100644 --- a/compose/.apps/transmissionvpn/transmissionvpn.aarch64.yml +++ b/compose/.apps/transmissionvpn/transmissionvpn.aarch64.yml @@ -1,3 +1,3 @@ services: - transmissionvpn: - image: haugene/transmission-openvpn:${TRANSMISSIONVPN_TAG} + ${_appname_}: + image: haugene/transmission-openvpn:${${_APPNAME_}_TAG} diff --git a/compose/.apps/transmissionvpn/transmissionvpn.hostname.yml b/compose/.apps/transmissionvpn/transmissionvpn.hostname.yml index f69c58b80a..4dc53c3782 100644 --- a/compose/.apps/transmissionvpn/transmissionvpn.hostname.yml +++ b/compose/.apps/transmissionvpn/transmissionvpn.hostname.yml @@ -1,3 +1,3 @@ services: - transmissionvpn: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/transmissionvpn/transmissionvpn.labels.yml b/compose/.apps/transmissionvpn/transmissionvpn.labels.yml index 9955008852..f64fbdc8e8 100644 --- a/compose/.apps/transmissionvpn/transmissionvpn.labels.yml +++ b/compose/.apps/transmissionvpn/transmissionvpn.labels.yml @@ -1,20 +1,20 @@ services: - transmissionvpn: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Transmission with OpenVPN" com.dockstarter.appinfo.nicename: "TransmissionVPN" - com.dockstarter.appvars.transmissionvpn_container_name: "transmissionvpn" - com.dockstarter.appvars.transmissionvpn_enabled: "false" - com.dockstarter.appvars.transmissionvpn_environment_download_dir: "/storage/downloads/completed" - com.dockstarter.appvars.transmissionvpn_environment_home: "/config" - com.dockstarter.appvars.transmissionvpn_environment_incomplete_dir: "/storage/downloads/incomplete" - com.dockstarter.appvars.transmissionvpn_environment_local_network: "192.168.x.x/24" - com.dockstarter.appvars.transmissionvpn_environment_openvpn_password: "your-vpn-pass" - com.dockstarter.appvars.transmissionvpn_environment_openvpn_provider: "custom" - com.dockstarter.appvars.transmissionvpn_environment_openvpn_username: "your-vpn-user" - com.dockstarter.appvars.transmissionvpn_environment_watch_dir: "/storage/downloads/watch" - com.dockstarter.appvars.transmissionvpn_network_mode: "" - com.dockstarter.appvars.transmissionvpn_port_9091: "9091" - com.dockstarter.appvars.transmissionvpn_restart: "unless-stopped" - com.dockstarter.appvars.transmissionvpn_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_download_dir: "/storage/downloads/completed" + com.dockstarter.appvars.${_appname_}_environment_home: "/config" + com.dockstarter.appvars.${_appname_}_environment_incomplete_dir: "/storage/downloads/incomplete" + com.dockstarter.appvars.${_appname_}_environment_local_network: "192.168.x.x/24" + com.dockstarter.appvars.${_appname_}_environment_openvpn_password: "your-vpn-pass" + com.dockstarter.appvars.${_appname_}_environment_openvpn_provider: "custom" + com.dockstarter.appvars.${_appname_}_environment_openvpn_username: "your-vpn-user" + com.dockstarter.appvars.${_appname_}_environment_watch_dir: "/storage/downloads/watch" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_9091: "9091" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/transmissionvpn/transmissionvpn.netmode.yml b/compose/.apps/transmissionvpn/transmissionvpn.netmode.yml index de51bf3949..f36884ffb9 100644 --- a/compose/.apps/transmissionvpn/transmissionvpn.netmode.yml +++ b/compose/.apps/transmissionvpn/transmissionvpn.netmode.yml @@ -1,3 +1,3 @@ services: - transmissionvpn: - network_mode: ${TRANSMISSIONVPN_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/transmissionvpn/transmissionvpn.ports.yml b/compose/.apps/transmissionvpn/transmissionvpn.ports.yml index 706ebe31a6..49f5572e80 100644 --- a/compose/.apps/transmissionvpn/transmissionvpn.ports.yml +++ b/compose/.apps/transmissionvpn/transmissionvpn.ports.yml @@ -1,4 +1,4 @@ services: - transmissionvpn: + ${_appname_}: ports: - - ${TRANSMISSIONVPN_PORT_9091}:9091 + - ${${_APPNAME_}_PORT_9091}:9091 diff --git a/compose/.apps/transmissionvpn/transmissionvpn.x86_64.yml b/compose/.apps/transmissionvpn/transmissionvpn.x86_64.yml index 6838cf2f5a..89df27282b 100644 --- a/compose/.apps/transmissionvpn/transmissionvpn.x86_64.yml +++ b/compose/.apps/transmissionvpn/transmissionvpn.x86_64.yml @@ -1,3 +1,3 @@ services: - transmissionvpn: - image: haugene/transmission-openvpn:${TRANSMISSIONVPN_TAG} + ${_appname_}: + image: haugene/transmission-openvpn:${${_APPNAME_}_TAG} diff --git a/compose/.apps/transmissionvpn/transmissionvpn.yml b/compose/.apps/transmissionvpn/transmissionvpn.yml index c0ec57bee1..550b4fa210 100644 --- a/compose/.apps/transmissionvpn/transmissionvpn.yml +++ b/compose/.apps/transmissionvpn/transmissionvpn.yml @@ -1,22 +1,22 @@ services: - transmissionvpn: + ${_appname_}: cap_add: - NET_ADMIN - container_name: ${TRANSMISSIONVPN_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - LOCAL_NETWORK=${TRANSMISSIONVPN_ENVIRONMENT_LOCAL_NETWORK} - - OPENVPN_PASSWORD=${TRANSMISSIONVPN_ENVIRONMENT_OPENVPN_PASSWORD} - - OPENVPN_PROVIDER=${TRANSMISSIONVPN_ENVIRONMENT_OPENVPN_PROVIDER} - - OPENVPN_USERNAME=${TRANSMISSIONVPN_ENVIRONMENT_OPENVPN_USERNAME} + - LOCAL_NETWORK=${${_APPNAME_}_ENVIRONMENT_LOCAL_NETWORK} + - OPENVPN_PASSWORD=${${_APPNAME_}_ENVIRONMENT_OPENVPN_PASSWORD} + - OPENVPN_PROVIDER=${${_APPNAME_}_ENVIRONMENT_OPENVPN_PROVIDER} + - OPENVPN_USERNAME=${${_APPNAME_}_ENVIRONMENT_OPENVPN_USERNAME} - PGID=${PGID} - PUID=${PUID} - - TRANSMISSION_DOWNLOAD_DIR=${TRANSMISSIONVPN_ENVIRONMENT_DOWNLOAD_DIR} - - TRANSMISSION_HOME=${TRANSMISSIONVPN_ENVIRONMENT_HOME} - - TRANSMISSION_INCOMPLETE_DIR=${TRANSMISSIONVPN_ENVIRONMENT_INCOMPLETE_DIR} - - TRANSMISSION_WATCH_DIR=${TRANSMISSIONVPN_ENVIRONMENT_WATCH_DIR} + - TRANSMISSION_DOWNLOAD_DIR=${${_APPNAME_}_ENVIRONMENT_DOWNLOAD_DIR} + - TRANSMISSION_HOME=${${_APPNAME_}_ENVIRONMENT_HOME} + - TRANSMISSION_INCOMPLETE_DIR=${${_APPNAME_}_ENVIRONMENT_INCOMPLETE_DIR} + - TRANSMISSION_WATCH_DIR=${${_APPNAME_}_ENVIRONMENT_WATCH_DIR} - TZ=${TZ} - restart: ${TRANSMISSIONVPN_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/transmissionvpn:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/tvheadend/tvheadend.aarch64.yml b/compose/.apps/tvheadend/tvheadend.aarch64.yml index 2b529a79a1..5286bcf5d7 100644 --- a/compose/.apps/tvheadend/tvheadend.aarch64.yml +++ b/compose/.apps/tvheadend/tvheadend.aarch64.yml @@ -1,3 +1,3 @@ services: - tvheadend: - image: lscr.io/linuxserver/tvheadend:${TVHEADEND_TAG} + ${_appname_}: + image: lscr.io/linuxserver/tvheadend:${${_APPNAME_}_TAG} diff --git a/compose/.apps/tvheadend/tvheadend.hostname.yml b/compose/.apps/tvheadend/tvheadend.hostname.yml index f61ab4163b..4dc53c3782 100644 --- a/compose/.apps/tvheadend/tvheadend.hostname.yml +++ b/compose/.apps/tvheadend/tvheadend.hostname.yml @@ -1,3 +1,3 @@ services: - tvheadend: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/tvheadend/tvheadend.labels.yml b/compose/.apps/tvheadend/tvheadend.labels.yml index 80aa383cad..9102b508c9 100644 --- a/compose/.apps/tvheadend/tvheadend.labels.yml +++ b/compose/.apps/tvheadend/tvheadend.labels.yml @@ -1,15 +1,15 @@ services: - tvheadend: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "TV streaming server and recorder" com.dockstarter.appinfo.nicename: "Tvheadend" - com.dockstarter.appvars.tvheadend_container_name: "tvheadend" - com.dockstarter.appvars.tvheadend_enabled: "false" - com.dockstarter.appvars.tvheadend_environment_run_opts: "" - com.dockstarter.appvars.tvheadend_network_mode: "" - com.dockstarter.appvars.tvheadend_port_9981: "9981" - com.dockstarter.appvars.tvheadend_port_9982: "9982" - com.dockstarter.appvars.tvheadend_restart: "unless-stopped" - com.dockstarter.appvars.tvheadend_tag: "latest" - com.dockstarter.appvars.tvheadend_volume_recordingsdir: "/mnt/recordings" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_run_opts: "" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_9981: "9981" + com.dockstarter.appvars.${_appname_}_port_9982: "9982" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_recordingsdir: "/mnt/recordings" diff --git a/compose/.apps/tvheadend/tvheadend.netmode.yml b/compose/.apps/tvheadend/tvheadend.netmode.yml index 0141a9238f..f36884ffb9 100644 --- a/compose/.apps/tvheadend/tvheadend.netmode.yml +++ b/compose/.apps/tvheadend/tvheadend.netmode.yml @@ -1,3 +1,3 @@ services: - tvheadend: - network_mode: ${TVHEADEND_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/tvheadend/tvheadend.ports.yml b/compose/.apps/tvheadend/tvheadend.ports.yml index 7b0df5879a..c1384b9975 100644 --- a/compose/.apps/tvheadend/tvheadend.ports.yml +++ b/compose/.apps/tvheadend/tvheadend.ports.yml @@ -1,5 +1,5 @@ services: - tvheadend: + ${_appname_}: ports: - - ${TVHEADEND_PORT_9981}:9981 - - ${TVHEADEND_PORT_9982}:9982 + - ${${_APPNAME_}_PORT_9981}:9981 + - ${${_APPNAME_}_PORT_9982}:9982 diff --git a/compose/.apps/tvheadend/tvheadend.x86_64.yml b/compose/.apps/tvheadend/tvheadend.x86_64.yml index 2b529a79a1..5286bcf5d7 100644 --- a/compose/.apps/tvheadend/tvheadend.x86_64.yml +++ b/compose/.apps/tvheadend/tvheadend.x86_64.yml @@ -1,3 +1,3 @@ services: - tvheadend: - image: lscr.io/linuxserver/tvheadend:${TVHEADEND_TAG} + ${_appname_}: + image: lscr.io/linuxserver/tvheadend:${${_APPNAME_}_TAG} diff --git a/compose/.apps/tvheadend/tvheadend.yml b/compose/.apps/tvheadend/tvheadend.yml index 679e1c0f89..e14a536390 100644 --- a/compose/.apps/tvheadend/tvheadend.yml +++ b/compose/.apps/tvheadend/tvheadend.yml @@ -1,14 +1,14 @@ services: - tvheadend: - container_name: ${TVHEADEND_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - - RUN_OPTS=${TVHEADEND_ENVIRONMENT_RUN_OPTS} + - RUN_OPTS=${${_APPNAME_}_ENVIRONMENT_RUN_OPTS} - TZ=${TZ} - restart: ${TVHEADEND_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/tvheadend:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${TVHEADEND_VOLUME_RECORDINGSDIR}:/recordings + - ${${_APPNAME_}_VOLUME_RECORDINGSDIR}:/recordings diff --git a/compose/.apps/ubooquity/ubooquity.aarch64.yml b/compose/.apps/ubooquity/ubooquity.aarch64.yml index 9aedc4d4c0..bccf5e161c 100644 --- a/compose/.apps/ubooquity/ubooquity.aarch64.yml +++ b/compose/.apps/ubooquity/ubooquity.aarch64.yml @@ -1,3 +1,3 @@ services: - ubooquity: - image: lscr.io/linuxserver/ubooquity:${UBOOQUITY_TAG} + ${_appname_}: + image: lscr.io/linuxserver/ubooquity:${${_APPNAME_}_TAG} diff --git a/compose/.apps/ubooquity/ubooquity.hostname.yml b/compose/.apps/ubooquity/ubooquity.hostname.yml index 0eb78af6e9..4dc53c3782 100644 --- a/compose/.apps/ubooquity/ubooquity.hostname.yml +++ b/compose/.apps/ubooquity/ubooquity.hostname.yml @@ -1,3 +1,3 @@ services: - ubooquity: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/ubooquity/ubooquity.labels.yml b/compose/.apps/ubooquity/ubooquity.labels.yml index ba3a88633e..bf0a5a839e 100644 --- a/compose/.apps/ubooquity/ubooquity.labels.yml +++ b/compose/.apps/ubooquity/ubooquity.labels.yml @@ -1,15 +1,15 @@ services: - ubooquity: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Home server for your comics and ebooks" com.dockstarter.appinfo.nicename: "Ubooquity" - com.dockstarter.appvars.ubooquity_container_name: "ubooquity" - com.dockstarter.appvars.ubooquity_enabled: "false" - com.dockstarter.appvars.ubooquity_environment_maxmem: "512" - com.dockstarter.appvars.ubooquity_network_mode: "" - com.dockstarter.appvars.ubooquity_port_2202: "2202" - com.dockstarter.appvars.ubooquity_port_2203: "2203" - com.dockstarter.appvars.ubooquity_restart: "unless-stopped" - com.dockstarter.appvars.ubooquity_tag: "latest" - com.dockstarter.appvars.ubooquity_volume_filesdir: "/mnt/ubooquity" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_maxmem: "512" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_2202: "2202" + com.dockstarter.appvars.${_appname_}_port_2203: "2203" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_filesdir: "/mnt/ubooquity" diff --git a/compose/.apps/ubooquity/ubooquity.netmode.yml b/compose/.apps/ubooquity/ubooquity.netmode.yml index 15f260a221..f36884ffb9 100644 --- a/compose/.apps/ubooquity/ubooquity.netmode.yml +++ b/compose/.apps/ubooquity/ubooquity.netmode.yml @@ -1,3 +1,3 @@ services: - ubooquity: - network_mode: ${UBOOQUITY_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/ubooquity/ubooquity.ports.yml b/compose/.apps/ubooquity/ubooquity.ports.yml index 1f0d3c5171..b306aaec80 100644 --- a/compose/.apps/ubooquity/ubooquity.ports.yml +++ b/compose/.apps/ubooquity/ubooquity.ports.yml @@ -1,5 +1,5 @@ services: - ubooquity: + ${_appname_}: ports: - - ${UBOOQUITY_PORT_2202}:2202 - - ${UBOOQUITY_PORT_2203}:2203 + - ${${_APPNAME_}_PORT_2202}:2202 + - ${${_APPNAME_}_PORT_2203}:2203 diff --git a/compose/.apps/ubooquity/ubooquity.x86_64.yml b/compose/.apps/ubooquity/ubooquity.x86_64.yml index 9aedc4d4c0..bccf5e161c 100644 --- a/compose/.apps/ubooquity/ubooquity.x86_64.yml +++ b/compose/.apps/ubooquity/ubooquity.x86_64.yml @@ -1,3 +1,3 @@ services: - ubooquity: - image: lscr.io/linuxserver/ubooquity:${UBOOQUITY_TAG} + ${_appname_}: + image: lscr.io/linuxserver/ubooquity:${${_APPNAME_}_TAG} diff --git a/compose/.apps/ubooquity/ubooquity.yml b/compose/.apps/ubooquity/ubooquity.yml index 4108aa06cb..09bb21c059 100644 --- a/compose/.apps/ubooquity/ubooquity.yml +++ b/compose/.apps/ubooquity/ubooquity.yml @@ -1,14 +1,14 @@ services: - ubooquity: - container_name: ${UBOOQUITY_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - MAXMEM=${UBOOQUITY_ENVIRONMENT_MAXMEM} + - MAXMEM=${${_APPNAME_}_ENVIRONMENT_MAXMEM} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${UBOOQUITY_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/ubooquity:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${UBOOQUITY_VOLUME_FILESDIR}:/files + - ${${_APPNAME_}_VOLUME_FILESDIR}:/files diff --git a/compose/.apps/unifi/unifi.aarch64.yml b/compose/.apps/unifi/unifi.aarch64.yml index 7e7d8247fb..b92c9ee070 100644 --- a/compose/.apps/unifi/unifi.aarch64.yml +++ b/compose/.apps/unifi/unifi.aarch64.yml @@ -1,3 +1,3 @@ services: - unifi: - image: lscr.io/linuxserver/unifi-controller:${UNIFI_TAG} + ${_appname_}: + image: lscr.io/linuxserver/unifi-controller:${${_APPNAME_}_TAG} diff --git a/compose/.apps/unifi/unifi.hostname.yml b/compose/.apps/unifi/unifi.hostname.yml index 504524b17c..4dc53c3782 100644 --- a/compose/.apps/unifi/unifi.hostname.yml +++ b/compose/.apps/unifi/unifi.hostname.yml @@ -1,3 +1,3 @@ services: - unifi: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/unifi/unifi.labels.yml b/compose/.apps/unifi/unifi.labels.yml index 8572229fa6..431f34cfc5 100644 --- a/compose/.apps/unifi/unifi.labels.yml +++ b/compose/.apps/unifi/unifi.labels.yml @@ -1,5 +1,5 @@ services: - unifi: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) Use UnifiController" diff --git a/compose/.apps/unifi/unifi.netmode.yml b/compose/.apps/unifi/unifi.netmode.yml index 66a7f691e3..f36884ffb9 100644 --- a/compose/.apps/unifi/unifi.netmode.yml +++ b/compose/.apps/unifi/unifi.netmode.yml @@ -1,3 +1,3 @@ services: - unifi: - network_mode: ${UNIFI_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/unifi/unifi.ports.yml b/compose/.apps/unifi/unifi.ports.yml index 427b5846b1..ba626f829d 100644 --- a/compose/.apps/unifi/unifi.ports.yml +++ b/compose/.apps/unifi/unifi.ports.yml @@ -1,11 +1,11 @@ services: - unifi: + ${_appname_}: ports: - - ${UNIFI_PORT_10001}:10001/udp - - ${UNIFI_PORT_3478}:3478/udp - - ${UNIFI_PORT_6789}:6789 - - ${UNIFI_PORT_8080}:8080 - - ${UNIFI_PORT_8081}:8081 - - ${UNIFI_PORT_8443}:8443 - - ${UNIFI_PORT_8843}:8843 - - ${UNIFI_PORT_8880}:8880 + - ${${_APPNAME_}_PORT_10001}:10001/udp + - ${${_APPNAME_}_PORT_3478}:3478/udp + - ${${_APPNAME_}_PORT_6789}:6789 + - ${${_APPNAME_}_PORT_8080}:8080 + - ${${_APPNAME_}_PORT_8081}:8081 + - ${${_APPNAME_}_PORT_8443}:8443 + - ${${_APPNAME_}_PORT_8843}:8843 + - ${${_APPNAME_}_PORT_8880}:8880 diff --git a/compose/.apps/unifi/unifi.x86_64.yml b/compose/.apps/unifi/unifi.x86_64.yml index 7e7d8247fb..b92c9ee070 100644 --- a/compose/.apps/unifi/unifi.x86_64.yml +++ b/compose/.apps/unifi/unifi.x86_64.yml @@ -1,3 +1,3 @@ services: - unifi: - image: lscr.io/linuxserver/unifi-controller:${UNIFI_TAG} + ${_appname_}: + image: lscr.io/linuxserver/unifi-controller:${${_APPNAME_}_TAG} diff --git a/compose/.apps/unifi/unifi.yml b/compose/.apps/unifi/unifi.yml index 83d0c475cf..ace6d5d0ab 100644 --- a/compose/.apps/unifi/unifi.yml +++ b/compose/.apps/unifi/unifi.yml @@ -1,12 +1,12 @@ services: - unifi: - container_name: ${UNIFI_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${UNIFI_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/unifi:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/unificontroller/unificontroller.aarch64.yml b/compose/.apps/unificontroller/unificontroller.aarch64.yml index 77b22d8ce6..b92c9ee070 100644 --- a/compose/.apps/unificontroller/unificontroller.aarch64.yml +++ b/compose/.apps/unificontroller/unificontroller.aarch64.yml @@ -1,3 +1,3 @@ services: - unificontroller: - image: lscr.io/linuxserver/unifi-controller:${UNIFICONTROLLER_TAG} + ${_appname_}: + image: lscr.io/linuxserver/unifi-controller:${${_APPNAME_}_TAG} diff --git a/compose/.apps/unificontroller/unificontroller.hostname.yml b/compose/.apps/unificontroller/unificontroller.hostname.yml index ae0a67a77d..4dc53c3782 100644 --- a/compose/.apps/unificontroller/unificontroller.hostname.yml +++ b/compose/.apps/unificontroller/unificontroller.hostname.yml @@ -1,3 +1,3 @@ services: - unificontroller: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/unificontroller/unificontroller.labels.yml b/compose/.apps/unificontroller/unificontroller.labels.yml index 9fe1cfbf65..3d4ba3935d 100644 --- a/compose/.apps/unificontroller/unificontroller.labels.yml +++ b/compose/.apps/unificontroller/unificontroller.labels.yml @@ -1,19 +1,19 @@ services: - unificontroller: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Controller software for wireless networks" com.dockstarter.appinfo.nicename: "UnifiController" - com.dockstarter.appvars.unificontroller_container_name: "unificontroller" - com.dockstarter.appvars.unificontroller_enabled: "false" - com.dockstarter.appvars.unificontroller_network_mode: "" - com.dockstarter.appvars.unificontroller_port_10001: "10001" - com.dockstarter.appvars.unificontroller_port_3478: "3478" - com.dockstarter.appvars.unificontroller_port_6789: "6789" - com.dockstarter.appvars.unificontroller_port_8080: "8080" - com.dockstarter.appvars.unificontroller_port_8081: "8081" - com.dockstarter.appvars.unificontroller_port_8443: "8443" - com.dockstarter.appvars.unificontroller_port_8843: "8843" - com.dockstarter.appvars.unificontroller_port_8880: "8880" - com.dockstarter.appvars.unificontroller_restart: "unless-stopped" - com.dockstarter.appvars.unificontroller_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_10001: "10001" + com.dockstarter.appvars.${_appname_}_port_3478: "3478" + com.dockstarter.appvars.${_appname_}_port_6789: "6789" + com.dockstarter.appvars.${_appname_}_port_8080: "8080" + com.dockstarter.appvars.${_appname_}_port_8081: "8081" + com.dockstarter.appvars.${_appname_}_port_8443: "8443" + com.dockstarter.appvars.${_appname_}_port_8843: "8843" + com.dockstarter.appvars.${_appname_}_port_8880: "8880" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/unificontroller/unificontroller.netmode.yml b/compose/.apps/unificontroller/unificontroller.netmode.yml index c52d3a3bc2..f36884ffb9 100644 --- a/compose/.apps/unificontroller/unificontroller.netmode.yml +++ b/compose/.apps/unificontroller/unificontroller.netmode.yml @@ -1,3 +1,3 @@ services: - unificontroller: - network_mode: ${UNIFICONTROLLER_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/unificontroller/unificontroller.ports.yml b/compose/.apps/unificontroller/unificontroller.ports.yml index 426aa0aae2..ba626f829d 100644 --- a/compose/.apps/unificontroller/unificontroller.ports.yml +++ b/compose/.apps/unificontroller/unificontroller.ports.yml @@ -1,11 +1,11 @@ services: - unificontroller: + ${_appname_}: ports: - - ${UNIFICONTROLLER_PORT_10001}:10001/udp - - ${UNIFICONTROLLER_PORT_3478}:3478/udp - - ${UNIFICONTROLLER_PORT_6789}:6789 - - ${UNIFICONTROLLER_PORT_8080}:8080 - - ${UNIFICONTROLLER_PORT_8081}:8081 - - ${UNIFICONTROLLER_PORT_8443}:8443 - - ${UNIFICONTROLLER_PORT_8843}:8843 - - ${UNIFICONTROLLER_PORT_8880}:8880 + - ${${_APPNAME_}_PORT_10001}:10001/udp + - ${${_APPNAME_}_PORT_3478}:3478/udp + - ${${_APPNAME_}_PORT_6789}:6789 + - ${${_APPNAME_}_PORT_8080}:8080 + - ${${_APPNAME_}_PORT_8081}:8081 + - ${${_APPNAME_}_PORT_8443}:8443 + - ${${_APPNAME_}_PORT_8843}:8843 + - ${${_APPNAME_}_PORT_8880}:8880 diff --git a/compose/.apps/unificontroller/unificontroller.x86_64.yml b/compose/.apps/unificontroller/unificontroller.x86_64.yml index 77b22d8ce6..b92c9ee070 100644 --- a/compose/.apps/unificontroller/unificontroller.x86_64.yml +++ b/compose/.apps/unificontroller/unificontroller.x86_64.yml @@ -1,3 +1,3 @@ services: - unificontroller: - image: lscr.io/linuxserver/unifi-controller:${UNIFICONTROLLER_TAG} + ${_appname_}: + image: lscr.io/linuxserver/unifi-controller:${${_APPNAME_}_TAG} diff --git a/compose/.apps/unificontroller/unificontroller.yml b/compose/.apps/unificontroller/unificontroller.yml index e5de3af5c8..ace6d5d0ab 100644 --- a/compose/.apps/unificontroller/unificontroller.yml +++ b/compose/.apps/unificontroller/unificontroller.yml @@ -1,12 +1,12 @@ services: - unificontroller: - container_name: ${UNIFICONTROLLER_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${UNIFICONTROLLER_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/unificontroller:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/unmanic/unmanic.hostname.yml b/compose/.apps/unmanic/unmanic.hostname.yml index 657a42debf..4dc53c3782 100644 --- a/compose/.apps/unmanic/unmanic.hostname.yml +++ b/compose/.apps/unmanic/unmanic.hostname.yml @@ -1,3 +1,3 @@ services: - unmanic: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/unmanic/unmanic.labels.yml b/compose/.apps/unmanic/unmanic.labels.yml index ed628c0e0e..c18ba1d951 100644 --- a/compose/.apps/unmanic/unmanic.labels.yml +++ b/compose/.apps/unmanic/unmanic.labels.yml @@ -1,13 +1,13 @@ services: - unmanic: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Tool for optimising your video library to a single format" com.dockstarter.appinfo.nicename: "Unmanic" - com.dockstarter.appvars.unmanic_container_name: "unmanic" - com.dockstarter.appvars.unmanic_enabled: "false" - com.dockstarter.appvars.unmanic_network_mode: "" - com.dockstarter.appvars.unmanic_port_8888: "8888" - com.dockstarter.appvars.unmanic_restart: "unless-stopped" - com.dockstarter.appvars.unmanic_tag: "latest" - com.dockstarter.appvars.unmanic_volume_encodedir: "/tmp/unmanic_encode" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8888: "8888" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_encodedir: "/tmp/unmanic_encode" diff --git a/compose/.apps/unmanic/unmanic.netmode.yml b/compose/.apps/unmanic/unmanic.netmode.yml index 57e565272e..f36884ffb9 100644 --- a/compose/.apps/unmanic/unmanic.netmode.yml +++ b/compose/.apps/unmanic/unmanic.netmode.yml @@ -1,3 +1,3 @@ services: - unmanic: - network_mode: ${UNMANIC_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/unmanic/unmanic.ports.yml b/compose/.apps/unmanic/unmanic.ports.yml index 7b8c19f365..d7391c5781 100644 --- a/compose/.apps/unmanic/unmanic.ports.yml +++ b/compose/.apps/unmanic/unmanic.ports.yml @@ -1,4 +1,4 @@ services: - unmanic: + ${_appname_}: ports: - - ${UNMANIC_PORT_8888}:8888 + - ${${_APPNAME_}_PORT_8888}:8888 diff --git a/compose/.apps/unmanic/unmanic.x86_64.yml b/compose/.apps/unmanic/unmanic.x86_64.yml index 8ff11969f4..81308a42c0 100644 --- a/compose/.apps/unmanic/unmanic.x86_64.yml +++ b/compose/.apps/unmanic/unmanic.x86_64.yml @@ -1,3 +1,3 @@ services: - unmanic: - image: josh5/unmanic:${UNMANIC_TAG} + ${_appname_}: + image: josh5/unmanic:${${_APPNAME_}_TAG} diff --git a/compose/.apps/unmanic/unmanic.yml b/compose/.apps/unmanic/unmanic.yml index fbbe24c641..5aeea29665 100644 --- a/compose/.apps/unmanic/unmanic.yml +++ b/compose/.apps/unmanic/unmanic.yml @@ -1,13 +1,13 @@ services: - unmanic: - container_name: ${UNMANIC_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${UNMANIC_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/unmanic:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${UNMANIC_VOLUME_ENCODEDIR}:/tmp/unmanic + - ${${_APPNAME_}_VOLUME_ENCODEDIR}:/tmp/unmanic diff --git a/compose/.apps/unpackerr/unpackerr.aarch64.yml b/compose/.apps/unpackerr/unpackerr.aarch64.yml index d0cebc806a..c874a7fb86 100644 --- a/compose/.apps/unpackerr/unpackerr.aarch64.yml +++ b/compose/.apps/unpackerr/unpackerr.aarch64.yml @@ -1,3 +1,3 @@ services: - unpackerr: - image: ghcr.io/hotio/unpackerr:${UNPACKERR_TAG} + ${_appname_}: + image: ghcr.io/hotio/unpackerr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/unpackerr/unpackerr.hostname.yml b/compose/.apps/unpackerr/unpackerr.hostname.yml index ae722cc9ab..4dc53c3782 100644 --- a/compose/.apps/unpackerr/unpackerr.hostname.yml +++ b/compose/.apps/unpackerr/unpackerr.hostname.yml @@ -1,3 +1,3 @@ services: - unpackerr: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/unpackerr/unpackerr.labels.yml b/compose/.apps/unpackerr/unpackerr.labels.yml index c7a831c04b..4619cae15e 100644 --- a/compose/.apps/unpackerr/unpackerr.labels.yml +++ b/compose/.apps/unpackerr/unpackerr.labels.yml @@ -1,22 +1,22 @@ services: - unpackerr: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Checks for completed downloads and extracts them so Radarr, Lidarr, Sonarr, and Readarr may import them" com.dockstarter.appinfo.nicename: "Unpackerr" - com.dockstarter.appvars.unpackerr_container_name: "unpackerr" - com.dockstarter.appvars.unpackerr_enabled: "false" - com.dockstarter.appvars.unpackerr_environment_delete_after: "0" - com.dockstarter.appvars.unpackerr_environment_delete_original: "false" - com.dockstarter.appvars.unpackerr_environment_folder_path: "/storage/torrents" - com.dockstarter.appvars.unpackerr_environment_interval: "2m" - com.dockstarter.appvars.unpackerr_environment_lidarr_api_key: "" - com.dockstarter.appvars.unpackerr_environment_lidarr_url: "http://lidarr:8686" - com.dockstarter.appvars.unpackerr_environment_move_back: "true" - com.dockstarter.appvars.unpackerr_environment_radarr_api_key: "" - com.dockstarter.appvars.unpackerr_environment_radarr_url: "http://radarr:7878" - com.dockstarter.appvars.unpackerr_environment_sonarr_api_key: "" - com.dockstarter.appvars.unpackerr_environment_sonarr_url: "http://sonarr:8989" - com.dockstarter.appvars.unpackerr_network_mode: "" - com.dockstarter.appvars.unpackerr_restart: "unless-stopped" - com.dockstarter.appvars.unpackerr_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_delete_after: "0" + com.dockstarter.appvars.${_appname_}_environment_delete_original: "false" + com.dockstarter.appvars.${_appname_}_environment_folder_path: "/storage/torrents" + com.dockstarter.appvars.${_appname_}_environment_interval: "2m" + com.dockstarter.appvars.${_appname_}_environment_lidarr_api_key: "" + com.dockstarter.appvars.${_appname_}_environment_lidarr_url: "http://lidarr:8686" + com.dockstarter.appvars.${_appname_}_environment_move_back: "true" + com.dockstarter.appvars.${_appname_}_environment_radarr_api_key: "" + com.dockstarter.appvars.${_appname_}_environment_radarr_url: "http://radarr:7878" + com.dockstarter.appvars.${_appname_}_environment_sonarr_api_key: "" + com.dockstarter.appvars.${_appname_}_environment_sonarr_url: "http://sonarr:8989" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/unpackerr/unpackerr.netmode.yml b/compose/.apps/unpackerr/unpackerr.netmode.yml index e8062e2a31..f36884ffb9 100644 --- a/compose/.apps/unpackerr/unpackerr.netmode.yml +++ b/compose/.apps/unpackerr/unpackerr.netmode.yml @@ -1,3 +1,3 @@ services: - unpackerr: - network_mode: ${UNPACKERR_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/unpackerr/unpackerr.x86_64.yml b/compose/.apps/unpackerr/unpackerr.x86_64.yml index d0cebc806a..c874a7fb86 100644 --- a/compose/.apps/unpackerr/unpackerr.x86_64.yml +++ b/compose/.apps/unpackerr/unpackerr.x86_64.yml @@ -1,3 +1,3 @@ services: - unpackerr: - image: ghcr.io/hotio/unpackerr:${UNPACKERR_TAG} + ${_appname_}: + image: ghcr.io/hotio/unpackerr:${${_APPNAME_}_TAG} diff --git a/compose/.apps/unpackerr/unpackerr.yml b/compose/.apps/unpackerr/unpackerr.yml index 0470942895..1a83336585 100644 --- a/compose/.apps/unpackerr/unpackerr.yml +++ b/compose/.apps/unpackerr/unpackerr.yml @@ -1,23 +1,23 @@ services: - unpackerr: - container_name: ${UNPACKERR_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - UN_FOLDER_0_DELETE_AFTER=${UNPACKERR_ENVIRONMENT_DELETE_AFTER} - - UN_FOLDER_0_DELETE_ORIGINAL=${UNPACKERR_ENVIRONMENT_DELETE_ORIGINAL} - - UN_FOLDER_0_MOVE_BACK=${UNPACKERR_ENVIRONMENT_MOVE_BACK} - - UN_FOLDER_0_PATH=${UNPACKERR_ENVIRONMENT_FOLDER_PATH} - - UN_INTERVAL=${UNPACKERR_ENVIRONMENT_INTERVAL} - - UN_LIDARR_0_API_KEY=${UNPACKERR_ENVIRONMENT_LIDARR_API_KEY} - - UN_LIDARR_0_URL=${UNPACKERR_ENVIRONMENT_LIDARR_URL} - - UN_RADARR_0_API_KEY=${UNPACKERR_ENVIRONMENT_RADARR_API_KEY} - - UN_RADARR_0_URL=${UNPACKERR_ENVIRONMENT_RADARR_URL} - - UN_SONARR_0_API_KEY=${UNPACKERR_ENVIRONMENT_SONARR_API_KEY} - - UN_SONARR_0_URL=${UNPACKERR_ENVIRONMENT_SONARR_URL} - restart: ${UNPACKERR_RESTART} + - UN_FOLDER_0_DELETE_AFTER=${${_APPNAME_}_ENVIRONMENT_DELETE_AFTER} + - UN_FOLDER_0_DELETE_ORIGINAL=${${_APPNAME_}_ENVIRONMENT_DELETE_ORIGINAL} + - UN_FOLDER_0_MOVE_BACK=${${_APPNAME_}_ENVIRONMENT_MOVE_BACK} + - UN_FOLDER_0_PATH=${${_APPNAME_}_ENVIRONMENT_FOLDER_PATH} + - UN_INTERVAL=${${_APPNAME_}_ENVIRONMENT_INTERVAL} + - UN_LIDARR_0_API_KEY=${${_APPNAME_}_ENVIRONMENT_LIDARR_API_KEY} + - UN_LIDARR_0_URL=${${_APPNAME_}_ENVIRONMENT_LIDARR_URL} + - UN_RADARR_0_API_KEY=${${_APPNAME_}_ENVIRONMENT_RADARR_API_KEY} + - UN_RADARR_0_URL=${${_APPNAME_}_ENVIRONMENT_RADARR_URL} + - UN_SONARR_0_API_KEY=${${_APPNAME_}_ENVIRONMENT_SONARR_API_KEY} + - UN_SONARR_0_URL=${${_APPNAME_}_ENVIRONMENT_SONARR_URL} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/unpackerr:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/uptimekuma/uptimekuma.aarch64.yml b/compose/.apps/uptimekuma/uptimekuma.aarch64.yml index 2f9c772ab8..7c1bc31ff6 100644 --- a/compose/.apps/uptimekuma/uptimekuma.aarch64.yml +++ b/compose/.apps/uptimekuma/uptimekuma.aarch64.yml @@ -1,3 +1,3 @@ services: - uptimekuma: - image: louislam/uptime-kuma:${UPTIMEKUMA_TAG} + ${_appname_}: + image: louislam/uptime-kuma:${${_APPNAME_}_TAG} diff --git a/compose/.apps/uptimekuma/uptimekuma.hostname.yml b/compose/.apps/uptimekuma/uptimekuma.hostname.yml index a0f0224d5f..4dc53c3782 100644 --- a/compose/.apps/uptimekuma/uptimekuma.hostname.yml +++ b/compose/.apps/uptimekuma/uptimekuma.hostname.yml @@ -1,3 +1,3 @@ services: - uptimekuma: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/uptimekuma/uptimekuma.labels.yml b/compose/.apps/uptimekuma/uptimekuma.labels.yml index e0d67a0b85..47d822c46e 100644 --- a/compose/.apps/uptimekuma/uptimekuma.labels.yml +++ b/compose/.apps/uptimekuma/uptimekuma.labels.yml @@ -1,12 +1,12 @@ services: - uptimekuma: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A self-hosted monitoring tool like Uptime Robot" com.dockstarter.appinfo.nicename: "UptimeKuma" - com.dockstarter.appvars.uptimekuma_container_name: "uptimekuma" - com.dockstarter.appvars.uptimekuma_enabled: "false" - com.dockstarter.appvars.uptimekuma_network_mode: "" - com.dockstarter.appvars.uptimekuma_port_3001: "3001" - com.dockstarter.appvars.uptimekuma_restart: "unless-stopped" - com.dockstarter.appvars.uptimekuma_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_3001: "3001" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/uptimekuma/uptimekuma.netmode.yml b/compose/.apps/uptimekuma/uptimekuma.netmode.yml index fc809d568c..f36884ffb9 100644 --- a/compose/.apps/uptimekuma/uptimekuma.netmode.yml +++ b/compose/.apps/uptimekuma/uptimekuma.netmode.yml @@ -1,3 +1,3 @@ services: - uptimekuma: - network_mode: ${UPTIMEKUMA_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/uptimekuma/uptimekuma.ports.yml b/compose/.apps/uptimekuma/uptimekuma.ports.yml index b6dc06a80e..dd6146abe3 100644 --- a/compose/.apps/uptimekuma/uptimekuma.ports.yml +++ b/compose/.apps/uptimekuma/uptimekuma.ports.yml @@ -1,4 +1,4 @@ services: - uptimekuma: + ${_appname_}: ports: - - ${UPTIMEKUMA_PORT_3001}:3001 + - ${${_APPNAME_}_PORT_3001}:3001 diff --git a/compose/.apps/uptimekuma/uptimekuma.x86_64.yml b/compose/.apps/uptimekuma/uptimekuma.x86_64.yml index 2f9c772ab8..7c1bc31ff6 100644 --- a/compose/.apps/uptimekuma/uptimekuma.x86_64.yml +++ b/compose/.apps/uptimekuma/uptimekuma.x86_64.yml @@ -1,3 +1,3 @@ services: - uptimekuma: - image: louislam/uptime-kuma:${UPTIMEKUMA_TAG} + ${_appname_}: + image: louislam/uptime-kuma:${${_APPNAME_}_TAG} diff --git a/compose/.apps/uptimekuma/uptimekuma.yml b/compose/.apps/uptimekuma/uptimekuma.yml index aa9e88d887..164d83d2a6 100644 --- a/compose/.apps/uptimekuma/uptimekuma.yml +++ b/compose/.apps/uptimekuma/uptimekuma.yml @@ -1,12 +1,12 @@ services: - uptimekuma: - container_name: ${UPTIMEKUMA_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${UPTIMEKUMA_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - - ${DOCKER_VOLUME_CONFIG}/uptimekuma:/app/data + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/app/data - ${DOCKER_VOLUME_STORAGE}:/storage - /etc/localtime:/etc/localtime:ro diff --git a/compose/.apps/varken/varken.aarch64.yml b/compose/.apps/varken/varken.aarch64.yml index 77afeed25b..6eec70f615 100644 --- a/compose/.apps/varken/varken.aarch64.yml +++ b/compose/.apps/varken/varken.aarch64.yml @@ -1,3 +1,3 @@ services: - varken: - image: boerderij/varken:${VARKEN_TAG} + ${_appname_}: + image: boerderij/varken:${${_APPNAME_}_TAG} diff --git a/compose/.apps/varken/varken.hostname.yml b/compose/.apps/varken/varken.hostname.yml index 521d43daa7..4dc53c3782 100644 --- a/compose/.apps/varken/varken.hostname.yml +++ b/compose/.apps/varken/varken.hostname.yml @@ -1,3 +1,3 @@ services: - varken: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/varken/varken.labels.yml b/compose/.apps/varken/varken.labels.yml index 731597b29f..1cde77eec7 100644 --- a/compose/.apps/varken/varken.labels.yml +++ b/compose/.apps/varken/varken.labels.yml @@ -1,11 +1,11 @@ services: - varken: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Utility to aggregate data from the Plex ecosystem" com.dockstarter.appinfo.nicename: "Varken" - com.dockstarter.appvars.varken_container_name: "varken" - com.dockstarter.appvars.varken_enabled: "false" - com.dockstarter.appvars.varken_network_mode: "" - com.dockstarter.appvars.varken_restart: "unless-stopped" - com.dockstarter.appvars.varken_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/varken/varken.netmode.yml b/compose/.apps/varken/varken.netmode.yml index 2900835285..f36884ffb9 100644 --- a/compose/.apps/varken/varken.netmode.yml +++ b/compose/.apps/varken/varken.netmode.yml @@ -1,3 +1,3 @@ services: - varken: - network_mode: ${VARKEN_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/varken/varken.x86_64.yml b/compose/.apps/varken/varken.x86_64.yml index 77afeed25b..6eec70f615 100644 --- a/compose/.apps/varken/varken.x86_64.yml +++ b/compose/.apps/varken/varken.x86_64.yml @@ -1,3 +1,3 @@ services: - varken: - image: boerderij/varken:${VARKEN_TAG} + ${_appname_}: + image: boerderij/varken:${${_APPNAME_}_TAG} diff --git a/compose/.apps/varken/varken.yml b/compose/.apps/varken/varken.yml index 8c8c305a7f..ace6d5d0ab 100644 --- a/compose/.apps/varken/varken.yml +++ b/compose/.apps/varken/varken.yml @@ -1,12 +1,12 @@ services: - varken: - container_name: ${VARKEN_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${VARKEN_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/varken:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/vsftpd/vsftpd.hostname.yml b/compose/.apps/vsftpd/vsftpd.hostname.yml index 8f2246c84a..4dc53c3782 100644 --- a/compose/.apps/vsftpd/vsftpd.hostname.yml +++ b/compose/.apps/vsftpd/vsftpd.hostname.yml @@ -1,3 +1,3 @@ services: - vsftpd: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/vsftpd/vsftpd.labels.yml b/compose/.apps/vsftpd/vsftpd.labels.yml index 8911169479..f619ee3dca 100644 --- a/compose/.apps/vsftpd/vsftpd.labels.yml +++ b/compose/.apps/vsftpd/vsftpd.labels.yml @@ -1,15 +1,15 @@ services: - vsftpd: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Probably the most secure and fastest FTP server for UNIX-like systems" com.dockstarter.appinfo.nicename: "vsftpd" - com.dockstarter.appvars.vsftpd_container_name: "vsftpd" - com.dockstarter.appvars.vsftpd_enabled: "false" - com.dockstarter.appvars.vsftpd_environment_ftp_pass: "" - com.dockstarter.appvars.vsftpd_environment_ftp_user: "" - com.dockstarter.appvars.vsftpd_network_mode: "" - com.dockstarter.appvars.vsftpd_port_21: "21" - com.dockstarter.appvars.vsftpd_restart: "unless-stopped" - com.dockstarter.appvars.vsftpd_tag: "latest" - com.dockstarter.appvars.vsftpd_volume_datadir: "/mnt/vsftpd" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_ftp_pass: "" + com.dockstarter.appvars.${_appname_}_environment_ftp_user: "" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_21: "21" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_datadir: "/mnt/vsftpd" diff --git a/compose/.apps/vsftpd/vsftpd.netmode.yml b/compose/.apps/vsftpd/vsftpd.netmode.yml index 070dea21ca..f36884ffb9 100644 --- a/compose/.apps/vsftpd/vsftpd.netmode.yml +++ b/compose/.apps/vsftpd/vsftpd.netmode.yml @@ -1,3 +1,3 @@ services: - vsftpd: - network_mode: ${VSFTPD_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/vsftpd/vsftpd.ports.yml b/compose/.apps/vsftpd/vsftpd.ports.yml index 3ef1c3ba6f..b3d4e27c28 100644 --- a/compose/.apps/vsftpd/vsftpd.ports.yml +++ b/compose/.apps/vsftpd/vsftpd.ports.yml @@ -1,4 +1,4 @@ services: - vsftpd: + ${_appname_}: ports: - - ${VSFTPD_PORT_21}:21 + - ${${_APPNAME_}_PORT_21}:21 diff --git a/compose/.apps/vsftpd/vsftpd.x86_64.yml b/compose/.apps/vsftpd/vsftpd.x86_64.yml index 617e8e400f..79e29295e0 100644 --- a/compose/.apps/vsftpd/vsftpd.x86_64.yml +++ b/compose/.apps/vsftpd/vsftpd.x86_64.yml @@ -1,3 +1,3 @@ services: - vsftpd: - image: fauria/vsftpd:${VSFTPD_TAG} + ${_appname_}: + image: fauria/vsftpd:${${_APPNAME_}_TAG} diff --git a/compose/.apps/vsftpd/vsftpd.yml b/compose/.apps/vsftpd/vsftpd.yml index 2aeff540f8..06b95e0ec2 100644 --- a/compose/.apps/vsftpd/vsftpd.yml +++ b/compose/.apps/vsftpd/vsftpd.yml @@ -1,12 +1,12 @@ services: - vsftpd: - container_name: ${VSFTPD_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - FTP_USER=${VSFTPD_ENVIRONMENT_FTP_USER} - - FTP_PASS=${VSFTPD_ENVIRONMENT_FTP_PASS} + - FTP_USER=${${_APPNAME_}_ENVIRONMENT_FTP_USER} + - FTP_PASS=${${_APPNAME_}_ENVIRONMENT_FTP_PASS} - TZ=${TZ} - restart: ${VSFTPD_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage - - ${VSFTPD_VOLUME_DATADIR}:/home/vsftpd + - ${${_APPNAME_}_VOLUME_DATADIR}:/home/vsftpd diff --git a/compose/.apps/watchtower/watchtower.aarch64.yml b/compose/.apps/watchtower/watchtower.aarch64.yml index 046152ca6c..310581bb35 100644 --- a/compose/.apps/watchtower/watchtower.aarch64.yml +++ b/compose/.apps/watchtower/watchtower.aarch64.yml @@ -1,3 +1,3 @@ services: - watchtower: - image: ghcr.io/containrrr/watchtower:${WATCHTOWER_TAG} + ${_appname_}: + image: ghcr.io/containrrr/watchtower:${${_APPNAME_}_TAG} diff --git a/compose/.apps/watchtower/watchtower.hostname.yml b/compose/.apps/watchtower/watchtower.hostname.yml index 36437c08d2..4dc53c3782 100644 --- a/compose/.apps/watchtower/watchtower.hostname.yml +++ b/compose/.apps/watchtower/watchtower.hostname.yml @@ -1,3 +1,3 @@ services: - watchtower: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/watchtower/watchtower.labels.yml b/compose/.apps/watchtower/watchtower.labels.yml index 2316f445c8..777bcaa2cb 100644 --- a/compose/.apps/watchtower/watchtower.labels.yml +++ b/compose/.apps/watchtower/watchtower.labels.yml @@ -1,23 +1,23 @@ services: - watchtower: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Automatically update running Docker containers" com.dockstarter.appinfo.nicename: "Watchtower" - com.dockstarter.appvars.watchtower_container_name: "watchtower" - com.dockstarter.appvars.watchtower_enabled: "true" - com.dockstarter.appvars.watchtower_environment_cleanup: "true" - com.dockstarter.appvars.watchtower_environment_include_stopped: "false" - com.dockstarter.appvars.watchtower_environment_monitor_only: "false" - com.dockstarter.appvars.watchtower_environment_notification_template: "{{range .}}{{.Message}}{{println}}{{end}}" - com.dockstarter.appvars.watchtower_environment_notification_url: "" - com.dockstarter.appvars.watchtower_environment_notifications: "shoutrrr" - com.dockstarter.appvars.watchtower_environment_notifications_level: "info" - com.dockstarter.appvars.watchtower_environment_repo_pass: "" - com.dockstarter.appvars.watchtower_environment_repo_user: "" - com.dockstarter.appvars.watchtower_environment_schedule: "0 0 4 * * *" - com.dockstarter.appvars.watchtower_environment_timeout: "10s" - com.dockstarter.appvars.watchtower_network_mode: "" - com.dockstarter.appvars.watchtower_restart: "unless-stopped" - com.dockstarter.appvars.watchtower_tag: "latest" - com.dockstarter.appvars.watchtower_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "true" + com.dockstarter.appvars.${_appname_}_environment_cleanup: "true" + com.dockstarter.appvars.${_appname_}_environment_include_stopped: "false" + com.dockstarter.appvars.${_appname_}_environment_monitor_only: "false" + com.dockstarter.appvars.${_appname_}_environment_notification_template: "{{range .}}{{.Message}}{{println}}{{end}}" + com.dockstarter.appvars.${_appname_}_environment_notification_url: "" + com.dockstarter.appvars.${_appname_}_environment_notifications: "shoutrrr" + com.dockstarter.appvars.${_appname_}_environment_notifications_level: "info" + com.dockstarter.appvars.${_appname_}_environment_repo_pass: "" + com.dockstarter.appvars.${_appname_}_environment_repo_user: "" + com.dockstarter.appvars.${_appname_}_environment_schedule: "0 0 4 * * *" + com.dockstarter.appvars.${_appname_}_environment_timeout: "10s" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/watchtower/watchtower.netmode.yml b/compose/.apps/watchtower/watchtower.netmode.yml index d11982da53..f36884ffb9 100644 --- a/compose/.apps/watchtower/watchtower.netmode.yml +++ b/compose/.apps/watchtower/watchtower.netmode.yml @@ -1,3 +1,3 @@ services: - watchtower: - network_mode: ${WATCHTOWER_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/watchtower/watchtower.x86_64.yml b/compose/.apps/watchtower/watchtower.x86_64.yml index 046152ca6c..310581bb35 100644 --- a/compose/.apps/watchtower/watchtower.x86_64.yml +++ b/compose/.apps/watchtower/watchtower.x86_64.yml @@ -1,3 +1,3 @@ services: - watchtower: - image: ghcr.io/containrrr/watchtower:${WATCHTOWER_TAG} + ${_appname_}: + image: ghcr.io/containrrr/watchtower:${${_APPNAME_}_TAG} diff --git a/compose/.apps/watchtower/watchtower.yml b/compose/.apps/watchtower/watchtower.yml index 52f375e4e8..bd6577466c 100644 --- a/compose/.apps/watchtower/watchtower.yml +++ b/compose/.apps/watchtower/watchtower.yml @@ -1,21 +1,21 @@ services: - watchtower: - container_name: ${WATCHTOWER_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - REPO_PASS=${WATCHTOWER_ENVIRONMENT_REPO_PASS} - - REPO_USER=${WATCHTOWER_ENVIRONMENT_REPO_USER} + - REPO_PASS=${${_APPNAME_}_ENVIRONMENT_REPO_PASS} + - REPO_USER=${${_APPNAME_}_ENVIRONMENT_REPO_USER} - TZ=${TZ} - - WATCHTOWER_CLEANUP=${WATCHTOWER_ENVIRONMENT_CLEANUP} - - WATCHTOWER_INCLUDE_STOPPED=${WATCHTOWER_ENVIRONMENT_INCLUDE_STOPPED} - - WATCHTOWER_MONITOR_ONLY=${WATCHTOWER_ENVIRONMENT_MONITOR_ONLY} - - WATCHTOWER_NOTIFICATION_TEMPLATE=${WATCHTOWER_ENVIRONMENT_NOTIFICATION_TEMPLATE} - - WATCHTOWER_NOTIFICATION_URL=${WATCHTOWER_ENVIRONMENT_NOTIFICATION_URL} - - WATCHTOWER_NOTIFICATIONS_LEVEL=${WATCHTOWER_ENVIRONMENT_NOTIFICATIONS_LEVEL} - - WATCHTOWER_NOTIFICATIONS=${WATCHTOWER_ENVIRONMENT_NOTIFICATIONS} - - WATCHTOWER_SCHEDULE=${WATCHTOWER_ENVIRONMENT_SCHEDULE} - - WATCHTOWER_TIMEOUT=${WATCHTOWER_ENVIRONMENT_TIMEOUT} - restart: ${WATCHTOWER_RESTART} + - WATCHTOWER_CLEANUP=${${_APPNAME_}_ENVIRONMENT_CLEANUP} + - WATCHTOWER_INCLUDE_STOPPED=${${_APPNAME_}_ENVIRONMENT_INCLUDE_STOPPED} + - WATCHTOWER_MONITOR_ONLY=${${_APPNAME_}_ENVIRONMENT_MONITOR_ONLY} + - WATCHTOWER_NOTIFICATION_TEMPLATE=${${_APPNAME_}_ENVIRONMENT_NOTIFICATION_TEMPLATE} + - WATCHTOWER_NOTIFICATION_URL=${${_APPNAME_}_ENVIRONMENT_NOTIFICATION_URL} + - WATCHTOWER_NOTIFICATIONS_LEVEL=${${_APPNAME_}_ENVIRONMENT_NOTIFICATIONS_LEVEL} + - WATCHTOWER_NOTIFICATIONS=${${_APPNAME_}_ENVIRONMENT_NOTIFICATIONS} + - WATCHTOWER_SCHEDULE=${${_APPNAME_}_ENVIRONMENT_SCHEDULE} + - WATCHTOWER_TIMEOUT=${${_APPNAME_}_ENVIRONMENT_TIMEOUT} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage - - ${WATCHTOWER_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock + - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock diff --git a/compose/.apps/wireguard/wireguard.aarch64.yml b/compose/.apps/wireguard/wireguard.aarch64.yml index 07329716a6..f29ba57298 100644 --- a/compose/.apps/wireguard/wireguard.aarch64.yml +++ b/compose/.apps/wireguard/wireguard.aarch64.yml @@ -1,3 +1,3 @@ services: - wireguard: - image: lscr.io/linuxserver/wireguard:${WIREGUARD_TAG} + ${_appname_}: + image: lscr.io/linuxserver/wireguard:${${_APPNAME_}_TAG} diff --git a/compose/.apps/wireguard/wireguard.hostname.yml b/compose/.apps/wireguard/wireguard.hostname.yml index 85209637d9..4dc53c3782 100644 --- a/compose/.apps/wireguard/wireguard.hostname.yml +++ b/compose/.apps/wireguard/wireguard.hostname.yml @@ -1,3 +1,3 @@ services: - wireguard: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/wireguard/wireguard.labels.yml b/compose/.apps/wireguard/wireguard.labels.yml index 716457478a..b9cc7e0cd9 100644 --- a/compose/.apps/wireguard/wireguard.labels.yml +++ b/compose/.apps/wireguard/wireguard.labels.yml @@ -1,17 +1,17 @@ services: - wireguard: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "WireGuard is an extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography." com.dockstarter.appinfo.nicename: "Wireguard" - com.dockstarter.appvars.wireguard_container_name: "wireguard" - com.dockstarter.appvars.wireguard_enabled: "false" - com.dockstarter.appvars.wireguard_environment_allowed_ips: "0.0.0.0/0" - com.dockstarter.appvars.wireguard_environment_internal_subnet: "10.13.13.0" - com.dockstarter.appvars.wireguard_environment_peer_dns: "auto" - com.dockstarter.appvars.wireguard_environment_peers: "1" - com.dockstarter.appvars.wireguard_environment_server_url: "auto" - com.dockstarter.appvars.wireguard_network_mode: "" - com.dockstarter.appvars.wireguard_port_51820: "51820" - com.dockstarter.appvars.wireguard_restart: "unless-stopped" - com.dockstarter.appvars.wireguard_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_allowed_ips: "0.0.0.0/0" + com.dockstarter.appvars.${_appname_}_environment_internal_subnet: "10.13.13.0" + com.dockstarter.appvars.${_appname_}_environment_peer_dns: "auto" + com.dockstarter.appvars.${_appname_}_environment_peers: "1" + com.dockstarter.appvars.${_appname_}_environment_server_url: "auto" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_51820: "51820" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/wireguard/wireguard.netmode.yml b/compose/.apps/wireguard/wireguard.netmode.yml index 7bb4dea6ac..f36884ffb9 100644 --- a/compose/.apps/wireguard/wireguard.netmode.yml +++ b/compose/.apps/wireguard/wireguard.netmode.yml @@ -1,3 +1,3 @@ services: - wireguard: - network_mode: ${WIREGUARD_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/wireguard/wireguard.ports.yml b/compose/.apps/wireguard/wireguard.ports.yml index e318c1ef7c..9c9929567a 100644 --- a/compose/.apps/wireguard/wireguard.ports.yml +++ b/compose/.apps/wireguard/wireguard.ports.yml @@ -1,4 +1,4 @@ services: - wireguard: + ${_appname_}: ports: - - ${WIREGUARD_PORT_51820}:${WIREGUARD_PORT_51820}/udp + - ${${_APPNAME_}_PORT_51820}:${${_APPNAME_}_PORT_51820}/udp diff --git a/compose/.apps/wireguard/wireguard.x86_64.yml b/compose/.apps/wireguard/wireguard.x86_64.yml index 07329716a6..f29ba57298 100644 --- a/compose/.apps/wireguard/wireguard.x86_64.yml +++ b/compose/.apps/wireguard/wireguard.x86_64.yml @@ -1,3 +1,3 @@ services: - wireguard: - image: lscr.io/linuxserver/wireguard:${WIREGUARD_TAG} + ${_appname_}: + image: lscr.io/linuxserver/wireguard:${${_APPNAME_}_TAG} diff --git a/compose/.apps/wireguard/wireguard.yml b/compose/.apps/wireguard/wireguard.yml index d9b7050c0b..97bc45045b 100644 --- a/compose/.apps/wireguard/wireguard.yml +++ b/compose/.apps/wireguard/wireguard.yml @@ -1,24 +1,24 @@ services: - wireguard: + ${_appname_}: cap_add: - NET_ADMIN - SYS_MODULE - container_name: ${WIREGUARD_CONTAINER_NAME} + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - ALLOWEDIPS=${WIREGUARD_ENVIRONMENT_ALLOWED_IPS} - - INTERNAL_SUBNET=${WIREGUARD_ENVIRONMENT_INTERNAL_SUBNET} - - PEERDNS=${WIREGUARD_ENVIRONMENT_PEER_DNS} - - PEERS=${WIREGUARD_ENVIRONMENT_PEERS} + - ALLOWEDIPS=${${_APPNAME_}_ENVIRONMENT_ALLOWED_IPS} + - INTERNAL_SUBNET=${${_APPNAME_}_ENVIRONMENT_INTERNAL_SUBNET} + - PEERDNS=${${_APPNAME_}_ENVIRONMENT_PEER_DNS} + - PEERS=${${_APPNAME_}_ENVIRONMENT_PEERS} - PGID=${PGID} - PUID=${PUID} - - SERVERPORT=${WIREGUARD_PORT_51820} - - SERVERURL=${WIREGUARD_ENVIRONMENT_SERVER_URL} + - SERVERPORT=${${_APPNAME_}_PORT_51820} + - SERVERURL=${${_APPNAME_}_ENVIRONMENT_SERVER_URL} - TZ=${TZ} - restart: ${WIREGUARD_RESTART} + restart: ${${_APPNAME_}_RESTART} sysctls: - net.ipv4.conf.all.src_valid_mark=1 volumes: - /etc/localtime:/etc/localtime:ro - /lib/modules:/lib/modules - - ${DOCKER_VOLUME_CONFIG}/wireguard:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/xbackbone/xbackbone.aarch64.yml b/compose/.apps/xbackbone/xbackbone.aarch64.yml index de8f45f99b..5839435a9e 100644 --- a/compose/.apps/xbackbone/xbackbone.aarch64.yml +++ b/compose/.apps/xbackbone/xbackbone.aarch64.yml @@ -1,3 +1,3 @@ services: - xbackbone: - image: ghcr.io/linuxserver/xbackbone:${XBACKBONE_TAG} + ${_appname_}: + image: ghcr.io/linuxserver/xbackbone:${${_APPNAME_}_TAG} diff --git a/compose/.apps/xbackbone/xbackbone.hostname.yml b/compose/.apps/xbackbone/xbackbone.hostname.yml index 58922904a4..4dc53c3782 100644 --- a/compose/.apps/xbackbone/xbackbone.hostname.yml +++ b/compose/.apps/xbackbone/xbackbone.hostname.yml @@ -1,3 +1,3 @@ services: - xbackbone: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/xbackbone/xbackbone.labels.yml b/compose/.apps/xbackbone/xbackbone.labels.yml index 36c9e18a79..49a6e8839d 100644 --- a/compose/.apps/xbackbone/xbackbone.labels.yml +++ b/compose/.apps/xbackbone/xbackbone.labels.yml @@ -1,13 +1,13 @@ services: - xbackbone: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "XBackBone is a simple, self-hosted, lightweight PHP file manager that support the instant sharing tool ShareX" com.dockstarter.appinfo.nicename: "xbackbone" - com.dockstarter.appvars.xbackbone_container_name: "xbackbone" - com.dockstarter.appvars.xbackbone_enabled: "false" - com.dockstarter.appvars.xbackbone_network_mode: "" - com.dockstarter.appvars.xbackbone_port_80: "80" - com.dockstarter.appvars.xbackbone_restart: "unless-stopped" - com.dockstarter.appvars.xbackbone_tag: "latest" - com.dockstarter.appvars.xbackbone_volume_uploaddir: "/mnt/xbackbone" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_80: "80" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_uploaddir: "/mnt/xbackbone" diff --git a/compose/.apps/xbackbone/xbackbone.netmode.yml b/compose/.apps/xbackbone/xbackbone.netmode.yml index de90f895f0..f36884ffb9 100644 --- a/compose/.apps/xbackbone/xbackbone.netmode.yml +++ b/compose/.apps/xbackbone/xbackbone.netmode.yml @@ -1,3 +1,3 @@ services: - xbackbone: - network_mode: ${XBACKBONE_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/xbackbone/xbackbone.ports.yml b/compose/.apps/xbackbone/xbackbone.ports.yml index e47897260d..c37afbebb5 100644 --- a/compose/.apps/xbackbone/xbackbone.ports.yml +++ b/compose/.apps/xbackbone/xbackbone.ports.yml @@ -1,4 +1,4 @@ services: - xbackbone: + ${_appname_}: ports: - - ${XBACKBONE_PORT_80}:80 + - ${${_APPNAME_}_PORT_80}:80 diff --git a/compose/.apps/xbackbone/xbackbone.x86_64.yml b/compose/.apps/xbackbone/xbackbone.x86_64.yml index de8f45f99b..5839435a9e 100644 --- a/compose/.apps/xbackbone/xbackbone.x86_64.yml +++ b/compose/.apps/xbackbone/xbackbone.x86_64.yml @@ -1,3 +1,3 @@ services: - xbackbone: - image: ghcr.io/linuxserver/xbackbone:${XBACKBONE_TAG} + ${_appname_}: + image: ghcr.io/linuxserver/xbackbone:${${_APPNAME_}_TAG} diff --git a/compose/.apps/xbackbone/xbackbone.yml b/compose/.apps/xbackbone/xbackbone.yml index 49a0166358..7f8b901c19 100644 --- a/compose/.apps/xbackbone/xbackbone.yml +++ b/compose/.apps/xbackbone/xbackbone.yml @@ -1,13 +1,13 @@ services: - xbackbone: - container_name: ${XBACKBONE_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${XBACKBONE_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/xbackbone:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${XBACKBONE_VOLUME_UPLOADDIR}:/config/www/xbackbone/storage + - ${${_APPNAME_}_VOLUME_UPLOADDIR}:/config/www/xbackbone/storage diff --git a/compose/.apps/xteve/xteve.hostname.yml b/compose/.apps/xteve/xteve.hostname.yml index 2d9a1cd819..4dc53c3782 100644 --- a/compose/.apps/xteve/xteve.hostname.yml +++ b/compose/.apps/xteve/xteve.hostname.yml @@ -1,3 +1,3 @@ services: - xteve: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/xteve/xteve.labels.yml b/compose/.apps/xteve/xteve.labels.yml index 38b63176d9..7414e49637 100644 --- a/compose/.apps/xteve/xteve.labels.yml +++ b/compose/.apps/xteve/xteve.labels.yml @@ -1,14 +1,14 @@ services: - xteve: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "xTeVe is a M3U proxy server for Plex, Emby and any client and provider which supports the .TS and .M3U8 (HLS) streaming formats." com.dockstarter.appinfo.nicename: "xTeVe" - com.dockstarter.appvars.xteve_container_name: "xteve" - com.dockstarter.appvars.xteve_enabled: "false" - com.dockstarter.appvars.xteve_environment_branch: "master" - com.dockstarter.appvars.xteve_environment_debug: "0" - com.dockstarter.appvars.xteve_network_mode: "" - com.dockstarter.appvars.xteve_port_34400: "34400" - com.dockstarter.appvars.xteve_restart: "unless-stopped" - com.dockstarter.appvars.xteve_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_branch: "master" + com.dockstarter.appvars.${_appname_}_environment_debug: "0" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_34400: "34400" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/xteve/xteve.netmode.yml b/compose/.apps/xteve/xteve.netmode.yml index 973a9dc393..f36884ffb9 100644 --- a/compose/.apps/xteve/xteve.netmode.yml +++ b/compose/.apps/xteve/xteve.netmode.yml @@ -1,3 +1,3 @@ services: - xteve: - network_mode: ${XTEVE_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/xteve/xteve.ports.yml b/compose/.apps/xteve/xteve.ports.yml index bb369a4aca..1f566c49d7 100644 --- a/compose/.apps/xteve/xteve.ports.yml +++ b/compose/.apps/xteve/xteve.ports.yml @@ -1,4 +1,4 @@ services: - xteve: + ${_appname_}: ports: - - ${XTEVE_PORT_34400}:34400 + - ${${_APPNAME_}_PORT_34400}:34400 diff --git a/compose/.apps/xteve/xteve.x86_64.yml b/compose/.apps/xteve/xteve.x86_64.yml index c351a0bfa8..0f2ad91da4 100644 --- a/compose/.apps/xteve/xteve.x86_64.yml +++ b/compose/.apps/xteve/xteve.x86_64.yml @@ -1,3 +1,3 @@ services: - xteve: - image: dnsforge/xteve:${XTEVE_TAG} + ${_appname_}: + image: dnsforge/xteve:${${_APPNAME_}_TAG} diff --git a/compose/.apps/xteve/xteve.yml b/compose/.apps/xteve/xteve.yml index 85010abba2..8c6a440cb2 100644 --- a/compose/.apps/xteve/xteve.yml +++ b/compose/.apps/xteve/xteve.yml @@ -1,15 +1,15 @@ services: - xteve: - container_name: ${XTEVE_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - XTEVE_BRANCH=${XTEVE_ENVIRONMENT_BRANCH} - - XTEVE_DEBUG=${XTEVE_ENVIRONMENT_DEBUG} - restart: ${XTEVE_RESTART} + - XTEVE_BRANCH=${${_APPNAME_}_ENVIRONMENT_BRANCH} + - XTEVE_DEBUG=${${_APPNAME_}_ENVIRONMENT_DEBUG} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/xteve:/home/xteve/conf - - ${DOCKER_VOLUME_CONFIG}/xteve/tmp:/tmp/xteve + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/home/xteve/conf + - ${DOCKER_VOLUME_CONFIG}/${_appname_}/tmp:/tmp/xteve - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/yacht/yacht.aarch64.yml b/compose/.apps/yacht/yacht.aarch64.yml index ae1ebffd3a..283ce45516 100644 --- a/compose/.apps/yacht/yacht.aarch64.yml +++ b/compose/.apps/yacht/yacht.aarch64.yml @@ -1,3 +1,3 @@ services: - yacht: - image: selfhostedpro/yacht:${YACHT_TAG} + ${_appname_}: + image: selfhostedpro/yacht:${${_APPNAME_}_TAG} diff --git a/compose/.apps/yacht/yacht.hostname.yml b/compose/.apps/yacht/yacht.hostname.yml index 452e972e79..4dc53c3782 100644 --- a/compose/.apps/yacht/yacht.hostname.yml +++ b/compose/.apps/yacht/yacht.hostname.yml @@ -1,3 +1,3 @@ services: - yacht: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/yacht/yacht.labels.yml b/compose/.apps/yacht/yacht.labels.yml index e007cbc5e4..5db8d768d7 100644 --- a/compose/.apps/yacht/yacht.labels.yml +++ b/compose/.apps/yacht/yacht.labels.yml @@ -1,16 +1,16 @@ services: - yacht: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Yacht is a container management UI with a focus on templates and 1-click deployments." com.dockstarter.appinfo.nicename: "Yacht" - com.dockstarter.appvars.yacht_container_name: "yacht" - com.dockstarter.appvars.yacht_enabled: "false" - com.dockstarter.appvars.yacht_environment_admin_email: "admin@yacht.local" - com.dockstarter.appvars.yacht_environment_disable_auth: "false" - com.dockstarter.appvars.yacht_environment_secret_key: "pass" - com.dockstarter.appvars.yacht_network_mode: "" - com.dockstarter.appvars.yacht_port_8000: "8000" - com.dockstarter.appvars.yacht_restart: "unless-stopped" - com.dockstarter.appvars.yacht_tag: "latest" - com.dockstarter.appvars.yacht_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_admin_email: "admin@yacht.local" + com.dockstarter.appvars.${_appname_}_environment_disable_auth: "false" + com.dockstarter.appvars.${_appname_}_environment_secret_key: "pass" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8000: "8000" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/yacht/yacht.netmode.yml b/compose/.apps/yacht/yacht.netmode.yml index 5ba19520bc..f36884ffb9 100644 --- a/compose/.apps/yacht/yacht.netmode.yml +++ b/compose/.apps/yacht/yacht.netmode.yml @@ -1,3 +1,3 @@ services: - yacht: - network_mode: ${YACHT_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/yacht/yacht.ports.yml b/compose/.apps/yacht/yacht.ports.yml index 4cabf16bff..33070f8cee 100644 --- a/compose/.apps/yacht/yacht.ports.yml +++ b/compose/.apps/yacht/yacht.ports.yml @@ -1,4 +1,4 @@ services: - yacht: + ${_appname_}: ports: - - ${YACHT_PORT_8000}:8000 + - ${${_APPNAME_}_PORT_8000}:8000 diff --git a/compose/.apps/yacht/yacht.x86_64.yml b/compose/.apps/yacht/yacht.x86_64.yml index ae1ebffd3a..283ce45516 100644 --- a/compose/.apps/yacht/yacht.x86_64.yml +++ b/compose/.apps/yacht/yacht.x86_64.yml @@ -1,3 +1,3 @@ services: - yacht: - image: selfhostedpro/yacht:${YACHT_TAG} + ${_appname_}: + image: selfhostedpro/yacht:${${_APPNAME_}_TAG} diff --git a/compose/.apps/yacht/yacht.yml b/compose/.apps/yacht/yacht.yml index 7e56652ecb..d9541dcc50 100644 --- a/compose/.apps/yacht/yacht.yml +++ b/compose/.apps/yacht/yacht.yml @@ -1,16 +1,16 @@ services: - yacht: - container_name: ${YACHT_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - - ADMIN_EMAIL=${YACHT_ENVIRONMENT_ADMIN_EMAIL} - - DISABLE_AUTH=${YACHT_ENVIRONMENT_DISABLE_AUTH} + - ADMIN_EMAIL=${${_APPNAME_}_ENVIRONMENT_ADMIN_EMAIL} + - DISABLE_AUTH=${${_APPNAME_}_ENVIRONMENT_DISABLE_AUTH} - PGID=${PGID} - PUID=${PUID} - - SECRET_KEY=${YACHT_ENVIRONMENT_SECRET_KEY} + - SECRET_KEY=${${_APPNAME_}_ENVIRONMENT_SECRET_KEY} - TZ=${TZ} - restart: ${YACHT_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/yacht:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${YACHT_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock + - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock diff --git a/compose/.apps/youtubedl/youtubedl.hostname.yml b/compose/.apps/youtubedl/youtubedl.hostname.yml index 8c9d09cc31..4dc53c3782 100644 --- a/compose/.apps/youtubedl/youtubedl.hostname.yml +++ b/compose/.apps/youtubedl/youtubedl.hostname.yml @@ -1,3 +1,3 @@ services: - youtubedl: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/youtubedl/youtubedl.labels.yml b/compose/.apps/youtubedl/youtubedl.labels.yml index 5918da927e..ccc65f0116 100644 --- a/compose/.apps/youtubedl/youtubedl.labels.yml +++ b/compose/.apps/youtubedl/youtubedl.labels.yml @@ -1,14 +1,14 @@ services: - youtubedl: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Simple Web and REST interface for downloading YouTube videos onto a server." com.dockstarter.appinfo.nicename: "YoutubeDL" - com.dockstarter.appvars.youtubedl_container_name: "youtubedl" - com.dockstarter.appvars.youtubedl_enabled: "false" - com.dockstarter.appvars.youtubedl_environment_config_path: "/youtube-dl/config.yml" - com.dockstarter.appvars.youtubedl_environment_debug: "false" - com.dockstarter.appvars.youtubedl_network_mode: "" - com.dockstarter.appvars.youtubedl_port_8080: "8080" - com.dockstarter.appvars.youtubedl_restart: "unless-stopped" - com.dockstarter.appvars.youtubedl_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_environment_config_path: "/youtube-dl/config.yml" + com.dockstarter.appvars.${_appname_}_environment_debug: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_8080: "8080" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/youtubedl/youtubedl.netmode.yml b/compose/.apps/youtubedl/youtubedl.netmode.yml index 43a8c40900..f36884ffb9 100644 --- a/compose/.apps/youtubedl/youtubedl.netmode.yml +++ b/compose/.apps/youtubedl/youtubedl.netmode.yml @@ -1,3 +1,3 @@ services: - youtubedl: - network_mode: ${YOUTUBEDL_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/youtubedl/youtubedl.ports.yml b/compose/.apps/youtubedl/youtubedl.ports.yml index 2774661e67..7d1c7e4455 100644 --- a/compose/.apps/youtubedl/youtubedl.ports.yml +++ b/compose/.apps/youtubedl/youtubedl.ports.yml @@ -1,4 +1,4 @@ services: - youtubedl: + ${_appname_}: ports: - - ${YOUTUBEDL_PORT_8080}:8080 + - ${${_APPNAME_}_PORT_8080}:8080 diff --git a/compose/.apps/youtubedl/youtubedl.x86_64.yml b/compose/.apps/youtubedl/youtubedl.x86_64.yml index b44fe2c323..da55592a5b 100644 --- a/compose/.apps/youtubedl/youtubedl.x86_64.yml +++ b/compose/.apps/youtubedl/youtubedl.x86_64.yml @@ -1,3 +1,3 @@ services: - youtubedl: - image: nbr23/youtube-dl-server:${YOUTUBEDL_TAG} + ${_appname_}: + image: nbr23/youtube-dl-server:${${_APPNAME_}_TAG} diff --git a/compose/.apps/youtubedl/youtubedl.yml b/compose/.apps/youtubedl/youtubedl.yml index 9b1130f776..fca8e6fb8a 100644 --- a/compose/.apps/youtubedl/youtubedl.yml +++ b/compose/.apps/youtubedl/youtubedl.yml @@ -1,14 +1,14 @@ services: - youtubedl: - container_name: ${YOUTUBEDL_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - YDL_DEBUG=${YOUTUBEDL_ENVIRONMENT_DEBUG} - - YDL_CONFIG_PATH=${YOUTUBEDL_ENVIRONMENT_CONFIG_PATH} - restart: ${YOUTUBEDL_RESTART} + - YDL_DEBUG=${${_APPNAME_}_ENVIRONMENT_DEBUG} + - YDL_CONFIG_PATH=${${_APPNAME_}_ENVIRONMENT_CONFIG_PATH} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/youtubedl:/youtube-dl + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/youtube-dl - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/znc/znc.aarch64.yml b/compose/.apps/znc/znc.aarch64.yml index 1c6facef85..12fe4e0d65 100644 --- a/compose/.apps/znc/znc.aarch64.yml +++ b/compose/.apps/znc/znc.aarch64.yml @@ -1,3 +1,3 @@ services: - znc: - image: lscr.io/linuxserver/znc:${ZNC_TAG} + ${_appname_}: + image: lscr.io/linuxserver/znc:${${_APPNAME_}_TAG} diff --git a/compose/.apps/znc/znc.hostname.yml b/compose/.apps/znc/znc.hostname.yml index a743dad779..4dc53c3782 100644 --- a/compose/.apps/znc/znc.hostname.yml +++ b/compose/.apps/znc/znc.hostname.yml @@ -1,3 +1,3 @@ services: - znc: + ${_appname_}: hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/znc/znc.labels.yml b/compose/.apps/znc/znc.labels.yml index c1828eb404..4dd882e3ac 100644 --- a/compose/.apps/znc/znc.labels.yml +++ b/compose/.apps/znc/znc.labels.yml @@ -1,12 +1,12 @@ services: - znc: + ${_appname_}: labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "IRC network bouncer or BNC" com.dockstarter.appinfo.nicename: "ZNC" - com.dockstarter.appvars.znc_container_name: "znc" - com.dockstarter.appvars.znc_enabled: "false" - com.dockstarter.appvars.znc_network_mode: "" - com.dockstarter.appvars.znc_port_6501: "6501" - com.dockstarter.appvars.znc_restart: "unless-stopped" - com.dockstarter.appvars.znc_tag: "latest" + com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" + com.dockstarter.appvars.${_appname_}_enabled: "false" + com.dockstarter.appvars.${_appname_}_network_mode: "" + com.dockstarter.appvars.${_appname_}_port_6501: "6501" + com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" + com.dockstarter.appvars.${_appname_}_tag: "latest" diff --git a/compose/.apps/znc/znc.netmode.yml b/compose/.apps/znc/znc.netmode.yml index fa4b086012..f36884ffb9 100644 --- a/compose/.apps/znc/znc.netmode.yml +++ b/compose/.apps/znc/znc.netmode.yml @@ -1,3 +1,3 @@ services: - znc: - network_mode: ${znc_NETWORK_MODE} + ${_appname_}: + network_mode: ${${_APPNAME_}_NETWORK_MODE} diff --git a/compose/.apps/znc/znc.ports.yml b/compose/.apps/znc/znc.ports.yml index 9695fe1669..c38d9a7b28 100644 --- a/compose/.apps/znc/znc.ports.yml +++ b/compose/.apps/znc/znc.ports.yml @@ -1,4 +1,4 @@ services: - znc: + ${_appname_}: ports: - - ${ZNC_PORT_6501}:6501 + - ${${_APPNAME_}_PORT_6501}:6501 diff --git a/compose/.apps/znc/znc.x86_64.yml b/compose/.apps/znc/znc.x86_64.yml index 1c6facef85..12fe4e0d65 100644 --- a/compose/.apps/znc/znc.x86_64.yml +++ b/compose/.apps/znc/znc.x86_64.yml @@ -1,3 +1,3 @@ services: - znc: - image: lscr.io/linuxserver/znc:${ZNC_TAG} + ${_appname_}: + image: lscr.io/linuxserver/znc:${${_APPNAME_}_TAG} diff --git a/compose/.apps/znc/znc.yml b/compose/.apps/znc/znc.yml index 0e40793361..ace6d5d0ab 100644 --- a/compose/.apps/znc/znc.yml +++ b/compose/.apps/znc/znc.yml @@ -1,12 +1,12 @@ services: - znc: - container_name: ${ZNC_CONTAINER_NAME} + ${_appname_}: + container_name: ${${_APPNAME_}_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${ZNC_RESTART} + restart: ${${_APPNAME_}_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/znc:/config + - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/docs/assets/icon.png b/docs/assets/icon.png index 3b8b539366fc95c97fe53dfe970b6cdd25ab6827..e19d24755da9428be2aa0ace8dbf4999688de66d 100644 GIT binary patch delta 15 WcmZ45#<--7k)<=h&wV4Sf-?Xszy#v} delta 16 XcmZ3|#<;YNk+n0x&z*N8i-I!%FV6(< diff --git a/docs/assets/logo.png b/docs/assets/logo.png index 317c6ded34ee2ef865c3551af5dc404174573d6b..83c2a787080d9d30e222c1d369615426ecfea798 100644 GIT binary patch delta 15 WcmbQRhN*uI6H8}+pZi8u?r8ume+5MV delta 16 XcmeBQ!!%(H6KiLHpF8hH7Vc>PF|q|x From 41bd2cd516c69fa7f06f9185ba325fb0421fff0d Mon Sep 17 00:00:00 2001 From: CLHatch Date: Wed, 18 Sep 2024 18:56:41 -0500 Subject: [PATCH 2/2] Change template app name variables to `` and `` --- compose/.apps/adguard/adguard.aarch64.yml | 4 +- compose/.apps/adguard/adguard.hostname.yml | 2 +- compose/.apps/adguard/adguard.labels.yml | 28 ++--- compose/.apps/adguard/adguard.netmode.yml | 4 +- compose/.apps/adguard/adguard.ports.yml | 20 +-- compose/.apps/adguard/adguard.x86_64.yml | 4 +- compose/.apps/adguard/adguard.yml | 10 +- compose/.apps/adminer/adminer.aarch64.yml | 4 +- compose/.apps/adminer/adminer.hostname.yml | 2 +- compose/.apps/adminer/adminer.labels.yml | 18 +-- compose/.apps/adminer/adminer.netmode.yml | 4 +- compose/.apps/adminer/adminer.ports.yml | 4 +- compose/.apps/adminer/adminer.x86_64.yml | 4 +- compose/.apps/adminer/adminer.yml | 12 +- compose/.apps/airdcpp/airdcpp.hostname.yml | 2 +- compose/.apps/airdcpp/airdcpp.labels.yml | 22 ++-- compose/.apps/airdcpp/airdcpp.netmode.yml | 4 +- compose/.apps/airdcpp/airdcpp.ports.yml | 12 +- compose/.apps/airdcpp/airdcpp.x86_64.yml | 4 +- compose/.apps/airdcpp/airdcpp.yml | 20 +-- compose/.apps/airsonic/airsonic.aarch64.yml | 4 +- compose/.apps/airsonic/airsonic.hostname.yml | 2 +- compose/.apps/airsonic/airsonic.labels.yml | 18 +-- compose/.apps/airsonic/airsonic.netmode.yml | 4 +- compose/.apps/airsonic/airsonic.ports.yml | 4 +- compose/.apps/airsonic/airsonic.x86_64.yml | 4 +- compose/.apps/airsonic/airsonic.yml | 12 +- .../airsonicadvanced.aarch64.yml | 4 +- .../airsonicadvanced.hostname.yml | 2 +- .../airsonicadvanced.labels.yml | 18 +-- .../airsonicadvanced.netmode.yml | 4 +- .../airsonicadvanced.ports.yml | 4 +- .../airsonicadvanced.x86_64.yml | 4 +- .../airsonicadvanced/airsonicadvanced.yml | 12 +- compose/.apps/amd/amd.aarch64.yml | 4 +- compose/.apps/amd/amd.hostname.yml | 2 +- compose/.apps/amd/amd.labels.yml | 50 ++++---- compose/.apps/amd/amd.netmode.yml | 4 +- compose/.apps/amd/amd.x86_64.yml | 4 +- compose/.apps/amd/amd.yml | 46 +++---- compose/.apps/apcupsd/apcupsd.hostname.yml | 2 +- compose/.apps/apcupsd/apcupsd.labels.yml | 28 ++--- compose/.apps/apcupsd/apcupsd.netmode.yml | 4 +- compose/.apps/apcupsd/apcupsd.x86_64.yml | 4 +- compose/.apps/apcupsd/apcupsd.yml | 24 ++-- compose/.apps/apprise/apprise.aarch64.yml | 4 +- compose/.apps/apprise/apprise.hostname.yml | 2 +- compose/.apps/apprise/apprise.labels.yml | 14 +-- compose/.apps/apprise/apprise.netmode.yml | 4 +- compose/.apps/apprise/apprise.ports.yml | 4 +- compose/.apps/apprise/apprise.x86_64.yml | 4 +- compose/.apps/apprise/apprise.yml | 8 +- .../audiobookshelf/audiobookshelf.aarch64.yml | 4 +- .../audiobookshelf.hostname.yml | 2 +- .../audiobookshelf/audiobookshelf.labels.yml | 14 +-- .../audiobookshelf/audiobookshelf.netmode.yml | 4 +- .../audiobookshelf/audiobookshelf.ports.yml | 4 +- .../audiobookshelf/audiobookshelf.x86_64.yml | 4 +- .../.apps/audiobookshelf/audiobookshelf.yml | 10 +- compose/.apps/autobrr/autobrr.aarch64.yml | 4 +- compose/.apps/autobrr/autobrr.hostname.yml | 2 +- compose/.apps/autobrr/autobrr.labels.yml | 14 +-- compose/.apps/autobrr/autobrr.netmode.yml | 4 +- compose/.apps/autobrr/autobrr.ports.yml | 4 +- compose/.apps/autobrr/autobrr.x86_64.yml | 4 +- compose/.apps/autobrr/autobrr.yml | 8 +- compose/.apps/azuracast/azuracast.aarch64.yml | 4 +- .../.apps/azuracast/azuracast.hostname.yml | 2 +- compose/.apps/azuracast/azuracast.labels.yml | 40 +++--- compose/.apps/azuracast/azuracast.netmode.yml | 4 +- compose/.apps/azuracast/azuracast.ports.yml | 10 +- compose/.apps/azuracast/azuracast.x86_64.yml | 4 +- compose/.apps/azuracast/azuracast.yml | 32 ++--- compose/.apps/bazarr/bazarr.aarch64.yml | 4 +- compose/.apps/bazarr/bazarr.hostname.yml | 2 +- compose/.apps/bazarr/bazarr.labels.yml | 14 +-- compose/.apps/bazarr/bazarr.netmode.yml | 4 +- compose/.apps/bazarr/bazarr.ports.yml | 4 +- compose/.apps/bazarr/bazarr.x86_64.yml | 4 +- compose/.apps/bazarr/bazarr.yml | 8 +- compose/.apps/beets/beets.aarch64.yml | 4 +- compose/.apps/beets/beets.hostname.yml | 2 +- compose/.apps/beets/beets.labels.yml | 14 +-- compose/.apps/beets/beets.netmode.yml | 4 +- compose/.apps/beets/beets.ports.yml | 4 +- compose/.apps/beets/beets.x86_64.yml | 4 +- compose/.apps/beets/beets.yml | 8 +- compose/.apps/bitwarden/bitwarden.aarch64.yml | 4 +- .../.apps/bitwarden/bitwarden.hostname.yml | 2 +- compose/.apps/bitwarden/bitwarden.labels.yml | 36 +++--- compose/.apps/bitwarden/bitwarden.netmode.yml | 4 +- compose/.apps/bitwarden/bitwarden.ports.yml | 6 +- compose/.apps/bitwarden/bitwarden.x86_64.yml | 4 +- compose/.apps/bitwarden/bitwarden.yml | 28 ++--- compose/.apps/booksonic/booksonic.aarch64.yml | 4 +- .../.apps/booksonic/booksonic.hostname.yml | 2 +- compose/.apps/booksonic/booksonic.labels.yml | 16 +-- compose/.apps/booksonic/booksonic.netmode.yml | 4 +- compose/.apps/booksonic/booksonic.ports.yml | 4 +- compose/.apps/booksonic/booksonic.x86_64.yml | 4 +- compose/.apps/booksonic/booksonic.yml | 10 +- .../booksonicair/booksonicair.aarch64.yml | 4 +- .../booksonicair/booksonicair.hostname.yml | 2 +- .../booksonicair/booksonicair.labels.yml | 16 +-- .../booksonicair/booksonicair.netmode.yml | 4 +- .../.apps/booksonicair/booksonicair.ports.yml | 4 +- .../booksonicair/booksonicair.x86_64.yml | 4 +- compose/.apps/booksonicair/booksonicair.yml | 10 +- compose/.apps/bookstack/bookstack.aarch64.yml | 4 +- .../.apps/bookstack/bookstack.hostname.yml | 2 +- compose/.apps/bookstack/bookstack.labels.yml | 24 ++-- compose/.apps/bookstack/bookstack.netmode.yml | 4 +- compose/.apps/bookstack/bookstack.ports.yml | 4 +- compose/.apps/bookstack/bookstack.x86_64.yml | 4 +- compose/.apps/bookstack/bookstack.yml | 18 +-- compose/.apps/calibre/calibre.aarch64.yml | 4 +- compose/.apps/calibre/calibre.hostname.yml | 2 +- compose/.apps/calibre/calibre.labels.yml | 24 ++-- compose/.apps/calibre/calibre.netmode.yml | 4 +- compose/.apps/calibre/calibre.ports.yml | 6 +- compose/.apps/calibre/calibre.x86_64.yml | 4 +- compose/.apps/calibre/calibre.yml | 16 +-- .../.apps/calibreweb/calibreweb.aarch64.yml | 4 +- .../.apps/calibreweb/calibreweb.hostname.yml | 2 +- .../.apps/calibreweb/calibreweb.labels.yml | 14 +-- .../.apps/calibreweb/calibreweb.netmode.yml | 4 +- compose/.apps/calibreweb/calibreweb.ports.yml | 4 +- .../.apps/calibreweb/calibreweb.x86_64.yml | 4 +- compose/.apps/calibreweb/calibreweb.yml | 8 +- compose/.apps/cloudcmd/cloudcmd.hostname.yml | 2 +- compose/.apps/cloudcmd/cloudcmd.labels.yml | 16 +-- compose/.apps/cloudcmd/cloudcmd.netmode.yml | 4 +- compose/.apps/cloudcmd/cloudcmd.ports.yml | 4 +- compose/.apps/cloudcmd/cloudcmd.x86_64.yml | 4 +- compose/.apps/cloudcmd/cloudcmd.yml | 10 +- .../cloudflareddns/cloudflareddns.aarch64.yml | 4 +- .../cloudflareddns.hostname.yml | 2 +- .../cloudflareddns/cloudflareddns.labels.yml | 30 ++--- .../cloudflareddns/cloudflareddns.netmode.yml | 4 +- .../cloudflareddns/cloudflareddns.x86_64.yml | 4 +- .../.apps/cloudflareddns/cloudflareddns.yml | 28 ++--- .../.apps/codeserver/codeserver.aarch64.yml | 4 +- .../.apps/codeserver/codeserver.hostname.yml | 2 +- .../.apps/codeserver/codeserver.labels.yml | 18 +-- .../.apps/codeserver/codeserver.netmode.yml | 4 +- compose/.apps/codeserver/codeserver.ports.yml | 4 +- .../.apps/codeserver/codeserver.x86_64.yml | 4 +- compose/.apps/codeserver/codeserver.yml | 12 +- .../.apps/couchpotato/couchpotato.aarch64.yml | 4 +- .../couchpotato/couchpotato.hostname.yml | 2 +- .../.apps/couchpotato/couchpotato.labels.yml | 14 +-- .../.apps/couchpotato/couchpotato.netmode.yml | 4 +- .../.apps/couchpotato/couchpotato.ports.yml | 4 +- .../.apps/couchpotato/couchpotato.x86_64.yml | 4 +- compose/.apps/couchpotato/couchpotato.yml | 8 +- compose/.apps/dasshio/dasshio.aarch64.yml | 4 +- compose/.apps/dasshio/dasshio.hostname.yml | 2 +- compose/.apps/dasshio/dasshio.labels.yml | 18 +-- compose/.apps/dasshio/dasshio.netmode.yml | 4 +- compose/.apps/dasshio/dasshio.ports.yml | 4 +- compose/.apps/dasshio/dasshio.x86_64.yml | 4 +- compose/.apps/dasshio/dasshio.yml | 12 +- compose/.apps/ddclient/ddclient.aarch64.yml | 4 +- compose/.apps/ddclient/ddclient.hostname.yml | 2 +- compose/.apps/ddclient/ddclient.labels.yml | 12 +- compose/.apps/ddclient/ddclient.netmode.yml | 4 +- compose/.apps/ddclient/ddclient.x86_64.yml | 4 +- compose/.apps/ddclient/ddclient.yml | 8 +- compose/.apps/deemix/deemix.aarch64.yml | 4 +- compose/.apps/deemix/deemix.hostname.yml | 2 +- compose/.apps/deemix/deemix.labels.yml | 14 +-- compose/.apps/deemix/deemix.netmode.yml | 4 +- compose/.apps/deemix/deemix.ports.yml | 4 +- compose/.apps/deemix/deemix.x86_64.yml | 4 +- compose/.apps/deemix/deemix.yml | 8 +- compose/.apps/deluge/deluge.aarch64.yml | 4 +- compose/.apps/deluge/deluge.hostname.yml | 2 +- compose/.apps/deluge/deluge.labels.yml | 22 ++-- compose/.apps/deluge/deluge.netmode.yml | 4 +- compose/.apps/deluge/deluge.ports.yml | 16 +-- compose/.apps/deluge/deluge.x86_64.yml | 4 +- compose/.apps/deluge/deluge.yml | 8 +- compose/.apps/delugevpn/delugevpn.aarch64.yml | 4 +- .../.apps/delugevpn/delugevpn.hostname.yml | 2 +- compose/.apps/delugevpn/delugevpn.labels.yml | 42 +++---- compose/.apps/delugevpn/delugevpn.netmode.yml | 4 +- compose/.apps/delugevpn/delugevpn.ports.yml | 12 +- compose/.apps/delugevpn/delugevpn.x86_64.yml | 4 +- compose/.apps/delugevpn/delugevpn.yml | 30 ++--- compose/.apps/doplarr/doplarr.aarch64.yml | 4 +- compose/.apps/doplarr/doplarr.hostname.yml | 2 +- compose/.apps/doplarr/doplarr.labels.yml | 48 ++++---- compose/.apps/doplarr/doplarr.netmode.yml | 4 +- compose/.apps/doplarr/doplarr.x86_64.yml | 4 +- compose/.apps/doplarr/doplarr.yml | 44 +++---- compose/.apps/dozzle/dozzle.aarch64.yml | 4 +- compose/.apps/dozzle/dozzle.hostname.yml | 2 +- compose/.apps/dozzle/dozzle.labels.yml | 24 ++-- compose/.apps/dozzle/dozzle.netmode.yml | 4 +- compose/.apps/dozzle/dozzle.ports.yml | 4 +- compose/.apps/dozzle/dozzle.x86_64.yml | 4 +- compose/.apps/dozzle/dozzle.yml | 16 +-- compose/.apps/duckdns/duckdns.aarch64.yml | 4 +- compose/.apps/duckdns/duckdns.hostname.yml | 2 +- compose/.apps/duckdns/duckdns.labels.yml | 18 +-- compose/.apps/duckdns/duckdns.netmode.yml | 4 +- compose/.apps/duckdns/duckdns.x86_64.yml | 4 +- compose/.apps/duckdns/duckdns.yml | 14 +-- compose/.apps/duplicacy/duplicacy.aarch64.yml | 4 +- .../.apps/duplicacy/duplicacy.hostname.yml | 2 +- compose/.apps/duplicacy/duplicacy.labels.yml | 20 +-- compose/.apps/duplicacy/duplicacy.netmode.yml | 4 +- compose/.apps/duplicacy/duplicacy.ports.yml | 4 +- compose/.apps/duplicacy/duplicacy.x86_64.yml | 4 +- compose/.apps/duplicacy/duplicacy.yml | 18 +-- compose/.apps/duplicati/duplicati.aarch64.yml | 4 +- .../.apps/duplicati/duplicati.hostname.yml | 2 +- compose/.apps/duplicati/duplicati.labels.yml | 18 +-- compose/.apps/duplicati/duplicati.netmode.yml | 4 +- compose/.apps/duplicati/duplicati.ports.yml | 4 +- compose/.apps/duplicati/duplicati.x86_64.yml | 4 +- compose/.apps/duplicati/duplicati.yml | 12 +- compose/.apps/emby/emby.aarch64.yml | 4 +- compose/.apps/emby/emby.hostname.yml | 2 +- compose/.apps/emby/emby.labels.yml | 18 +-- compose/.apps/emby/emby.netmode.yml | 4 +- compose/.apps/emby/emby.ports.yml | 6 +- compose/.apps/emby/emby.x86_64.yml | 4 +- compose/.apps/emby/emby.yml | 10 +- compose/.apps/fail2ban/fail2ban.aarch64.yml | 2 +- compose/.apps/fail2ban/fail2ban.labels.yml | 10 +- compose/.apps/fail2ban/fail2ban.netmode.yml | 2 +- compose/.apps/fail2ban/fail2ban.x86_64.yml | 2 +- compose/.apps/fail2ban/fail2ban.yml | 6 +- compose/.apps/filebot/filebot.hostname.yml | 2 +- compose/.apps/filebot/filebot.labels.yml | 18 +-- compose/.apps/filebot/filebot.netmode.yml | 4 +- compose/.apps/filebot/filebot.ports.yml | 4 +- compose/.apps/filebot/filebot.x86_64.yml | 4 +- compose/.apps/filebot/filebot.yml | 12 +- .../.apps/filebrowser/filebrowser.aarch64.yml | 4 +- .../filebrowser/filebrowser.hostname.yml | 2 +- .../.apps/filebrowser/filebrowser.labels.yml | 22 ++-- .../.apps/filebrowser/filebrowser.netmode.yml | 4 +- .../.apps/filebrowser/filebrowser.ports.yml | 4 +- .../.apps/filebrowser/filebrowser.x86_64.yml | 4 +- compose/.apps/filebrowser/filebrowser.yml | 18 +-- .../.apps/fireflyiii/fireflyiii.aarch64.yml | 4 +- .../.apps/fireflyiii/fireflyiii.hostname.yml | 2 +- .../.apps/fireflyiii/fireflyiii.labels.yml | 30 ++--- .../.apps/fireflyiii/fireflyiii.netmode.yml | 4 +- compose/.apps/fireflyiii/fireflyiii.ports.yml | 4 +- .../.apps/fireflyiii/fireflyiii.x86_64.yml | 4 +- compose/.apps/fireflyiii/fireflyiii.yml | 26 ++-- compose/.apps/flame/flame.aarch64.yml | 4 +- compose/.apps/flame/flame.hostname.yml | 2 +- compose/.apps/flame/flame.labels.yml | 18 +-- compose/.apps/flame/flame.netmode.yml | 4 +- compose/.apps/flame/flame.ports.yml | 4 +- compose/.apps/flame/flame.x86_64.yml | 4 +- compose/.apps/flame/flame.yml | 10 +- .../flaresolverr/flaresolverr.aarch64.yml | 4 +- .../flaresolverr/flaresolverr.hostname.yml | 2 +- .../flaresolverr/flaresolverr.labels.yml | 20 +-- .../flaresolverr/flaresolverr.netmode.yml | 4 +- .../.apps/flaresolverr/flaresolverr.ports.yml | 4 +- .../flaresolverr/flaresolverr.x86_64.yml | 4 +- compose/.apps/flaresolverr/flaresolverr.yml | 14 +-- compose/.apps/freshrss/freshrss.aarch64.yml | 4 +- compose/.apps/freshrss/freshrss.hostname.yml | 2 +- compose/.apps/freshrss/freshrss.labels.yml | 14 +-- compose/.apps/freshrss/freshrss.netmode.yml | 4 +- compose/.apps/freshrss/freshrss.ports.yml | 4 +- compose/.apps/freshrss/freshrss.x86_64.yml | 4 +- compose/.apps/freshrss/freshrss.yml | 8 +- compose/.apps/gitea/gitea.hostname.yml | 2 +- compose/.apps/gitea/gitea.labels.yml | 14 +-- compose/.apps/gitea/gitea.netmode.yml | 4 +- compose/.apps/gitea/gitea.ports.yml | 4 +- compose/.apps/gitea/gitea.x86_64.yml | 4 +- compose/.apps/gitea/gitea.yml | 8 +- compose/.apps/glances/glances.hostname.yml | 2 +- compose/.apps/glances/glances.labels.yml | 20 +-- compose/.apps/glances/glances.netmode.yml | 4 +- compose/.apps/glances/glances.ports.yml | 6 +- compose/.apps/glances/glances.x86_64.yml | 4 +- compose/.apps/glances/glances.yml | 12 +- compose/.apps/gluetun/gluetun.aarch64.yml | 4 +- compose/.apps/gluetun/gluetun.hostname.yml | 2 +- compose/.apps/gluetun/gluetun.labels.yml | 114 +++++++++--------- compose/.apps/gluetun/gluetun.netmode.yml | 4 +- compose/.apps/gluetun/gluetun.ports.yml | 10 +- compose/.apps/gluetun/gluetun.x86_64.yml | 4 +- compose/.apps/gluetun/gluetun.yml | 102 ++++++++-------- compose/.apps/goaccess/goaccess.hostname.yml | 2 +- compose/.apps/goaccess/goaccess.labels.yml | 16 +-- compose/.apps/goaccess/goaccess.netmode.yml | 4 +- compose/.apps/goaccess/goaccess.ports.yml | 4 +- compose/.apps/goaccess/goaccess.x86_64.yml | 4 +- compose/.apps/goaccess/goaccess.yml | 10 +- compose/.apps/grafana/grafana.aarch64.yml | 4 +- compose/.apps/grafana/grafana.hostname.yml | 2 +- compose/.apps/grafana/grafana.labels.yml | 16 +-- compose/.apps/grafana/grafana.netmode.yml | 4 +- compose/.apps/grafana/grafana.ports.yml | 4 +- compose/.apps/grafana/grafana.x86_64.yml | 4 +- compose/.apps/grafana/grafana.yml | 10 +- compose/.apps/grocy/grocy.aarch64.yml | 4 +- compose/.apps/grocy/grocy.hostname.yml | 2 +- compose/.apps/grocy/grocy.labels.yml | 14 +-- compose/.apps/grocy/grocy.netmode.yml | 4 +- compose/.apps/grocy/grocy.ports.yml | 4 +- compose/.apps/grocy/grocy.x86_64.yml | 4 +- compose/.apps/grocy/grocy.yml | 8 +- compose/.apps/guacamole/guacamole.aarch64.yml | 4 +- .../.apps/guacamole/guacamole.hostname.yml | 2 +- compose/.apps/guacamole/guacamole.labels.yml | 16 +-- compose/.apps/guacamole/guacamole.netmode.yml | 4 +- compose/.apps/guacamole/guacamole.ports.yml | 4 +- compose/.apps/guacamole/guacamole.x86_64.yml | 4 +- compose/.apps/guacamole/guacamole.yml | 10 +- compose/.apps/h5ai/h5ai.labels.yml | 14 +-- compose/.apps/h5ai/h5ai.netmode.yml | 2 +- compose/.apps/h5ai/h5ai.ports.yml | 2 +- compose/.apps/h5ai/h5ai.x86_64.yml | 2 +- compose/.apps/h5ai/h5ai.yml | 6 +- .../.apps/handbrake/handbrake.hostname.yml | 2 +- compose/.apps/handbrake/handbrake.labels.yml | 18 +-- compose/.apps/handbrake/handbrake.netmode.yml | 4 +- compose/.apps/handbrake/handbrake.ports.yml | 4 +- compose/.apps/handbrake/handbrake.x86_64.yml | 4 +- compose/.apps/handbrake/handbrake.yml | 12 +- .../.apps/headphones/headphones.aarch64.yml | 4 +- .../.apps/headphones/headphones.hostname.yml | 2 +- .../.apps/headphones/headphones.labels.yml | 14 +-- .../.apps/headphones/headphones.netmode.yml | 4 +- compose/.apps/headphones/headphones.ports.yml | 4 +- .../.apps/headphones/headphones.x86_64.yml | 4 +- compose/.apps/headphones/headphones.yml | 8 +- compose/.apps/heimdall/heimdall.aarch64.yml | 4 +- compose/.apps/heimdall/heimdall.hostname.yml | 2 +- compose/.apps/heimdall/heimdall.labels.yml | 16 +-- compose/.apps/heimdall/heimdall.netmode.yml | 4 +- compose/.apps/heimdall/heimdall.ports.yml | 6 +- compose/.apps/heimdall/heimdall.x86_64.yml | 4 +- compose/.apps/heimdall/heimdall.yml | 8 +- .../homeassistant/homeassistant.aarch64.yml | 4 +- .../homeassistant/homeassistant.hostname.yml | 2 +- .../homeassistant/homeassistant.labels.yml | 14 +-- .../homeassistant/homeassistant.netmode.yml | 4 +- .../homeassistant/homeassistant.ports.yml | 4 +- .../homeassistant/homeassistant.x86_64.yml | 4 +- compose/.apps/homeassistant/homeassistant.yml | 8 +- .../.apps/homebridge/homebridge.aarch64.yml | 4 +- .../.apps/homebridge/homebridge.hostname.yml | 2 +- .../.apps/homebridge/homebridge.labels.yml | 16 +-- .../.apps/homebridge/homebridge.netmode.yml | 4 +- compose/.apps/homebridge/homebridge.ports.yml | 4 +- .../.apps/homebridge/homebridge.x86_64.yml | 4 +- compose/.apps/homebridge/homebridge.yml | 10 +- compose/.apps/homepage/homepage.aarch64.yml | 4 +- compose/.apps/homepage/homepage.hostname.yml | 2 +- compose/.apps/homepage/homepage.labels.yml | 16 +-- compose/.apps/homepage/homepage.netmode.yml | 4 +- compose/.apps/homepage/homepage.ports.yml | 4 +- compose/.apps/homepage/homepage.x86_64.yml | 4 +- compose/.apps/homepage/homepage.yml | 10 +- compose/.apps/homer/homer.aarch64.yml | 4 +- compose/.apps/homer/homer.hostname.yml | 2 +- compose/.apps/homer/homer.labels.yml | 18 +-- compose/.apps/homer/homer.netmode.yml | 4 +- compose/.apps/homer/homer.ports.yml | 4 +- compose/.apps/homer/homer.x86_64.yml | 4 +- compose/.apps/homer/homer.yml | 12 +- .../.apps/htpcmanager/htpcmanager.aarch64.yml | 4 +- .../htpcmanager/htpcmanager.hostname.yml | 2 +- .../.apps/htpcmanager/htpcmanager.labels.yml | 14 +-- .../.apps/htpcmanager/htpcmanager.netmode.yml | 4 +- .../.apps/htpcmanager/htpcmanager.ports.yml | 4 +- .../.apps/htpcmanager/htpcmanager.x86_64.yml | 4 +- compose/.apps/htpcmanager/htpcmanager.yml | 8 +- .../.apps/httpserver/httpserver.hostname.yml | 2 +- .../.apps/httpserver/httpserver.labels.yml | 20 +-- .../.apps/httpserver/httpserver.netmode.yml | 4 +- compose/.apps/httpserver/httpserver.ports.yml | 4 +- .../.apps/httpserver/httpserver.x86_64.yml | 4 +- compose/.apps/httpserver/httpserver.yml | 12 +- compose/.apps/huginn/huginn.hostname.yml | 2 +- compose/.apps/huginn/huginn.labels.yml | 24 ++-- compose/.apps/huginn/huginn.netmode.yml | 4 +- compose/.apps/huginn/huginn.ports.yml | 4 +- compose/.apps/huginn/huginn.x86_64.yml | 4 +- compose/.apps/huginn/huginn.yml | 16 +-- compose/.apps/hydra2/hydra2.aarch64.yml | 2 +- compose/.apps/hydra2/hydra2.netmode.yml | 2 +- compose/.apps/hydra2/hydra2.ports.yml | 2 +- compose/.apps/hydra2/hydra2.x86_64.yml | 2 +- compose/.apps/hydra2/hydra2.yml | 6 +- compose/.apps/influxdb/influxdb.aarch64.yml | 4 +- compose/.apps/influxdb/influxdb.hostname.yml | 2 +- compose/.apps/influxdb/influxdb.labels.yml | 14 +-- compose/.apps/influxdb/influxdb.netmode.yml | 4 +- compose/.apps/influxdb/influxdb.ports.yml | 4 +- compose/.apps/influxdb/influxdb.x86_64.yml | 4 +- compose/.apps/influxdb/influxdb.yml | 8 +- compose/.apps/jackett/jackett.aarch64.yml | 4 +- compose/.apps/jackett/jackett.hostname.yml | 2 +- compose/.apps/jackett/jackett.labels.yml | 14 +-- compose/.apps/jackett/jackett.netmode.yml | 4 +- compose/.apps/jackett/jackett.ports.yml | 4 +- compose/.apps/jackett/jackett.x86_64.yml | 4 +- compose/.apps/jackett/jackett.yml | 8 +- compose/.apps/jellyfin/jellyfin.aarch64.yml | 4 +- compose/.apps/jellyfin/jellyfin.hostname.yml | 2 +- compose/.apps/jellyfin/jellyfin.labels.yml | 18 +-- compose/.apps/jellyfin/jellyfin.netmode.yml | 4 +- compose/.apps/jellyfin/jellyfin.ports.yml | 6 +- compose/.apps/jellyfin/jellyfin.x86_64.yml | 4 +- compose/.apps/jellyfin/jellyfin.yml | 10 +- compose/.apps/jfago/jfago.aarch64.yml | 4 +- compose/.apps/jfago/jfago.hostname.yml | 2 +- compose/.apps/jfago/jfago.labels.yml | 14 +-- compose/.apps/jfago/jfago.netmode.yml | 4 +- compose/.apps/jfago/jfago.ports.yml | 4 +- compose/.apps/jfago/jfago.x86_64.yml | 4 +- compose/.apps/jfago/jfago.yml | 10 +- compose/.apps/kanboard/kanboard.aarch64.yml | 4 +- compose/.apps/kanboard/kanboard.hostname.yml | 2 +- compose/.apps/kanboard/kanboard.labels.yml | 14 +-- compose/.apps/kanboard/kanboard.netmode.yml | 4 +- compose/.apps/kanboard/kanboard.ports.yml | 4 +- compose/.apps/kanboard/kanboard.x86_64.yml | 4 +- compose/.apps/kanboard/kanboard.yml | 8 +- compose/.apps/kitana/kitana.aarch64.yml | 4 +- compose/.apps/kitana/kitana.hostname.yml | 2 +- compose/.apps/kitana/kitana.labels.yml | 14 +-- compose/.apps/kitana/kitana.netmode.yml | 4 +- compose/.apps/kitana/kitana.ports.yml | 4 +- compose/.apps/kitana/kitana.x86_64.yml | 4 +- compose/.apps/kitana/kitana.yml | 8 +- .../.apps/kiwixserve/kiwixserve.aarch64.yml | 4 +- .../.apps/kiwixserve/kiwixserve.hostname.yml | 2 +- .../.apps/kiwixserve/kiwixserve.labels.yml | 16 +-- .../.apps/kiwixserve/kiwixserve.netmode.yml | 4 +- compose/.apps/kiwixserve/kiwixserve.ports.yml | 4 +- .../.apps/kiwixserve/kiwixserve.x86_64.yml | 4 +- compose/.apps/kiwixserve/kiwixserve.yml | 10 +- compose/.apps/komga/komga.aarch64.yml | 4 +- compose/.apps/komga/komga.hostname.yml | 2 +- compose/.apps/komga/komga.labels.yml | 18 +-- compose/.apps/komga/komga.netmode.yml | 4 +- compose/.apps/komga/komga.ports.yml | 4 +- compose/.apps/komga/komga.x86_64.yml | 4 +- compose/.apps/komga/komga.yml | 12 +- .../lazylibrarian/lazylibrarian.aarch64.yml | 4 +- .../lazylibrarian/lazylibrarian.hostname.yml | 2 +- .../lazylibrarian/lazylibrarian.labels.yml | 14 +-- .../lazylibrarian/lazylibrarian.netmode.yml | 4 +- .../lazylibrarian/lazylibrarian.ports.yml | 4 +- .../lazylibrarian/lazylibrarian.x86_64.yml | 4 +- compose/.apps/lazylibrarian/lazylibrarian.yml | 8 +- compose/.apps/ldapauth/ldapauth.aarch64.yml | 4 +- compose/.apps/ldapauth/ldapauth.hostname.yml | 2 +- compose/.apps/ldapauth/ldapauth.labels.yml | 22 ++-- compose/.apps/ldapauth/ldapauth.netmode.yml | 4 +- compose/.apps/ldapauth/ldapauth.ports.yml | 6 +- compose/.apps/ldapauth/ldapauth.x86_64.yml | 4 +- compose/.apps/ldapauth/ldapauth.yml | 12 +- .../.apps/letsencrypt/letsencrypt.aarch64.yml | 4 +- .../letsencrypt/letsencrypt.hostname.yml | 2 +- .../.apps/letsencrypt/letsencrypt.labels.yml | 32 ++--- .../.apps/letsencrypt/letsencrypt.netmode.yml | 4 +- .../.apps/letsencrypt/letsencrypt.ports.yml | 6 +- .../.apps/letsencrypt/letsencrypt.x86_64.yml | 4 +- compose/.apps/letsencrypt/letsencrypt.yml | 24 ++-- .../.apps/librespeed/librespeed.aarch64.yml | 4 +- .../.apps/librespeed/librespeed.hostname.yml | 2 +- .../.apps/librespeed/librespeed.labels.yml | 26 ++-- .../.apps/librespeed/librespeed.netmode.yml | 4 +- compose/.apps/librespeed/librespeed.ports.yml | 4 +- .../.apps/librespeed/librespeed.x86_64.yml | 4 +- compose/.apps/librespeed/librespeed.yml | 20 +-- compose/.apps/lidarr/lidarr.aarch64.yml | 4 +- compose/.apps/lidarr/lidarr.hostname.yml | 2 +- compose/.apps/lidarr/lidarr.labels.yml | 14 +-- compose/.apps/lidarr/lidarr.netmode.yml | 4 +- compose/.apps/lidarr/lidarr.ports.yml | 4 +- compose/.apps/lidarr/lidarr.x86_64.yml | 4 +- compose/.apps/lidarr/lidarr.yml | 8 +- compose/.apps/limnoria/limnoria.aarch64.yml | 4 +- compose/.apps/limnoria/limnoria.hostname.yml | 2 +- compose/.apps/limnoria/limnoria.labels.yml | 14 +-- compose/.apps/limnoria/limnoria.netmode.yml | 4 +- compose/.apps/limnoria/limnoria.ports.yml | 4 +- compose/.apps/limnoria/limnoria.x86_64.yml | 4 +- compose/.apps/limnoria/limnoria.yml | 8 +- compose/.apps/logarr/logarr.hostname.yml | 2 +- compose/.apps/logarr/logarr.labels.yml | 14 +-- compose/.apps/logarr/logarr.netmode.yml | 4 +- compose/.apps/logarr/logarr.ports.yml | 4 +- compose/.apps/logarr/logarr.x86_64.yml | 4 +- compose/.apps/logarr/logarr.yml | 8 +- .../logitechmediaserver.aarch64.yml | 4 +- .../logitechmediaserver.hostname.yml | 2 +- .../logitechmediaserver.labels.yml | 18 +-- .../logitechmediaserver.netmode.yml | 4 +- .../logitechmediaserver.ports.yml | 10 +- .../logitechmediaserver.x86_64.yml | 4 +- .../logitechmediaserver.yml | 8 +- compose/.apps/makemkv/makemkv.hostname.yml | 2 +- compose/.apps/makemkv/makemkv.labels.yml | 16 +-- compose/.apps/makemkv/makemkv.netmode.yml | 4 +- compose/.apps/makemkv/makemkv.ports.yml | 4 +- compose/.apps/makemkv/makemkv.x86_64.yml | 4 +- compose/.apps/makemkv/makemkv.yml | 10 +- compose/.apps/mariadb/mariadb.aarch64.yml | 4 +- compose/.apps/mariadb/mariadb.hostname.yml | 2 +- compose/.apps/mariadb/mariadb.labels.yml | 16 +-- compose/.apps/mariadb/mariadb.netmode.yml | 4 +- compose/.apps/mariadb/mariadb.ports.yml | 4 +- compose/.apps/mariadb/mariadb.x86_64.yml | 4 +- compose/.apps/mariadb/mariadb.yml | 10 +- .../.apps/mcmyadmin2/mcmyadmin2.netmode.yml | 2 +- compose/.apps/mcmyadmin2/mcmyadmin2.ports.yml | 4 +- .../.apps/mcmyadmin2/mcmyadmin2.x86_64.yml | 2 +- compose/.apps/mcmyadmin2/mcmyadmin2.yml | 6 +- compose/.apps/medusa/medusa.aarch64.yml | 4 +- compose/.apps/medusa/medusa.hostname.yml | 2 +- compose/.apps/medusa/medusa.labels.yml | 14 +-- compose/.apps/medusa/medusa.netmode.yml | 4 +- compose/.apps/medusa/medusa.ports.yml | 4 +- compose/.apps/medusa/medusa.x86_64.yml | 4 +- compose/.apps/medusa/medusa.yml | 8 +- .../minecraftbedrockserver.hostname.yml | 2 +- .../minecraftbedrockserver.labels.yml | 18 +-- .../minecraftbedrockserver.netmode.yml | 4 +- .../minecraftbedrockserver.ports.yml | 4 +- .../minecraftbedrockserver.x86_64.yml | 4 +- .../minecraftbedrockserver.yml | 12 +- .../minecraftserver.aarch64.yml | 4 +- .../minecraftserver.hostname.yml | 2 +- .../minecraftserver.labels.yml | 20 +-- .../minecraftserver.netmode.yml | 4 +- .../minecraftserver/minecraftserver.ports.yml | 4 +- .../minecraftserver.x86_64.yml | 4 +- .../.apps/minecraftserver/minecraftserver.yml | 14 +-- compose/.apps/monitorr/monitorr.hostname.yml | 2 +- compose/.apps/monitorr/monitorr.labels.yml | 14 +-- compose/.apps/monitorr/monitorr.netmode.yml | 4 +- compose/.apps/monitorr/monitorr.ports.yml | 4 +- compose/.apps/monitorr/monitorr.x86_64.yml | 4 +- compose/.apps/monitorr/monitorr.yml | 8 +- compose/.apps/mosquitto/mosquitto.aarch64.yml | 4 +- .../.apps/mosquitto/mosquitto.hostname.yml | 2 +- compose/.apps/mosquitto/mosquitto.labels.yml | 16 +-- compose/.apps/mosquitto/mosquitto.netmode.yml | 4 +- compose/.apps/mosquitto/mosquitto.ports.yml | 6 +- compose/.apps/mosquitto/mosquitto.x86_64.yml | 4 +- compose/.apps/mosquitto/mosquitto.yml | 12 +- .../.apps/moviematch/moviematch.aarch64.yml | 4 +- .../.apps/moviematch/moviematch.hostname.yml | 2 +- .../.apps/moviematch/moviematch.labels.yml | 20 +-- .../.apps/moviematch/moviematch.netmode.yml | 4 +- compose/.apps/moviematch/moviematch.ports.yml | 4 +- .../.apps/moviematch/moviematch.x86_64.yml | 4 +- compose/.apps/moviematch/moviematch.yml | 14 +-- compose/.apps/murmur/murmur.hostname.yml | 2 +- compose/.apps/murmur/murmur.labels.yml | 16 +-- compose/.apps/murmur/murmur.netmode.yml | 4 +- compose/.apps/murmur/murmur.ports.yml | 6 +- compose/.apps/murmur/murmur.x86_64.yml | 4 +- compose/.apps/murmur/murmur.yml | 16 +-- compose/.apps/muximux/muximux.aarch64.yml | 4 +- compose/.apps/muximux/muximux.hostname.yml | 2 +- compose/.apps/muximux/muximux.labels.yml | 14 +-- compose/.apps/muximux/muximux.netmode.yml | 4 +- compose/.apps/muximux/muximux.ports.yml | 4 +- compose/.apps/muximux/muximux.x86_64.yml | 4 +- compose/.apps/muximux/muximux.yml | 8 +- compose/.apps/mylar/mylar.aarch64.yml | 4 +- compose/.apps/mylar/mylar.hostname.yml | 2 +- compose/.apps/mylar/mylar.labels.yml | 14 +-- compose/.apps/mylar/mylar.netmode.yml | 4 +- compose/.apps/mylar/mylar.ports.yml | 4 +- compose/.apps/mylar/mylar.x86_64.yml | 4 +- compose/.apps/mylar/mylar.yml | 8 +- compose/.apps/mylar3/mylar3.aarch64.yml | 2 +- compose/.apps/mylar3/mylar3.labels.yml | 12 +- compose/.apps/mylar3/mylar3.netmode.yml | 2 +- compose/.apps/mylar3/mylar3.ports.yml | 2 +- compose/.apps/mylar3/mylar3.x86_64.yml | 2 +- compose/.apps/mylar3/mylar3.yml | 6 +- compose/.apps/netdata/netdata.aarch64.yml | 4 +- compose/.apps/netdata/netdata.hostname.yml | 2 +- compose/.apps/netdata/netdata.labels.yml | 16 +-- compose/.apps/netdata/netdata.netmode.yml | 4 +- compose/.apps/netdata/netdata.ports.yml | 4 +- compose/.apps/netdata/netdata.x86_64.yml | 4 +- compose/.apps/netdata/netdata.yml | 8 +- compose/.apps/nextcloud/nextcloud.aarch64.yml | 4 +- .../.apps/nextcloud/nextcloud.hostname.yml | 2 +- compose/.apps/nextcloud/nextcloud.labels.yml | 16 +-- compose/.apps/nextcloud/nextcloud.netmode.yml | 4 +- compose/.apps/nextcloud/nextcloud.ports.yml | 4 +- compose/.apps/nextcloud/nextcloud.x86_64.yml | 4 +- compose/.apps/nextcloud/nextcloud.yml | 10 +- compose/.apps/nodered/nodered.aarch64.yml | 4 +- compose/.apps/nodered/nodered.hostname.yml | 2 +- compose/.apps/nodered/nodered.labels.yml | 14 +-- compose/.apps/nodered/nodered.netmode.yml | 4 +- compose/.apps/nodered/nodered.ports.yml | 4 +- compose/.apps/nodered/nodered.x86_64.yml | 4 +- compose/.apps/nodered/nodered.yml | 8 +- compose/.apps/nzbget/nzbget.aarch64.yml | 4 +- compose/.apps/nzbget/nzbget.hostname.yml | 2 +- compose/.apps/nzbget/nzbget.labels.yml | 14 +-- compose/.apps/nzbget/nzbget.netmode.yml | 4 +- compose/.apps/nzbget/nzbget.ports.yml | 4 +- compose/.apps/nzbget/nzbget.x86_64.yml | 4 +- compose/.apps/nzbget/nzbget.yml | 8 +- .../.apps/nzbgetvpn/nzbgetvpn.hostname.yml | 2 +- compose/.apps/nzbgetvpn/nzbgetvpn.labels.yml | 38 +++--- compose/.apps/nzbgetvpn/nzbgetvpn.netmode.yml | 4 +- compose/.apps/nzbgetvpn/nzbgetvpn.ports.yml | 6 +- compose/.apps/nzbgetvpn/nzbgetvpn.x86_64.yml | 4 +- compose/.apps/nzbgetvpn/nzbgetvpn.yml | 30 ++--- compose/.apps/nzbhydra2/nzbhydra2.aarch64.yml | 2 +- compose/.apps/nzbhydra2/nzbhydra2.labels.yml | 12 +- compose/.apps/nzbhydra2/nzbhydra2.netmode.yml | 2 +- compose/.apps/nzbhydra2/nzbhydra2.ports.yml | 2 +- compose/.apps/nzbhydra2/nzbhydra2.x86_64.yml | 2 +- compose/.apps/nzbhydra2/nzbhydra2.yml | 6 +- .../omadacontroller.aarch64.yml | 4 +- .../omadacontroller.hostname.yml | 2 +- .../omadacontroller.labels.yml | 34 +++--- .../omadacontroller.netmode.yml | 4 +- .../omadacontroller/omadacontroller.ports.yml | 18 +-- .../omadacontroller.x86_64.yml | 4 +- .../.apps/omadacontroller/omadacontroller.yml | 34 +++--- compose/.apps/ombi/ombi.aarch64.yml | 4 +- compose/.apps/ombi/ombi.hostname.yml | 2 +- compose/.apps/ombi/ombi.labels.yml | 14 +-- compose/.apps/ombi/ombi.netmode.yml | 4 +- compose/.apps/ombi/ombi.ports.yml | 4 +- compose/.apps/ombi/ombi.x86_64.yml | 4 +- compose/.apps/ombi/ombi.yml | 8 +- compose/.apps/openldap/openldap.aarch64.yml | 4 +- compose/.apps/openldap/openldap.hostname.yml | 2 +- compose/.apps/openldap/openldap.labels.yml | 32 ++--- compose/.apps/openldap/openldap.netmode.yml | 4 +- compose/.apps/openldap/openldap.ports.yml | 6 +- compose/.apps/openldap/openldap.x86_64.yml | 4 +- compose/.apps/openldap/openldap.yml | 26 ++-- .../openspeedtest/openspeedtest.aarch64.yml | 4 +- .../openspeedtest/openspeedtest.hostname.yml | 2 +- .../openspeedtest/openspeedtest.labels.yml | 18 +-- .../openspeedtest/openspeedtest.netmode.yml | 4 +- .../openspeedtest/openspeedtest.ports.yml | 6 +- .../openspeedtest/openspeedtest.x86_64.yml | 4 +- compose/.apps/openspeedtest/openspeedtest.yml | 10 +- .../.apps/openvpnas/openvpnas.hostname.yml | 2 +- compose/.apps/openvpnas/openvpnas.labels.yml | 20 +-- compose/.apps/openvpnas/openvpnas.netmode.yml | 4 +- compose/.apps/openvpnas/openvpnas.ports.yml | 8 +- compose/.apps/openvpnas/openvpnas.x86_64.yml | 4 +- compose/.apps/openvpnas/openvpnas.yml | 10 +- compose/.apps/organizr/organizr.aarch64.yml | 4 +- compose/.apps/organizr/organizr.hostname.yml | 2 +- compose/.apps/organizr/organizr.labels.yml | 18 +-- compose/.apps/organizr/organizr.netmode.yml | 4 +- compose/.apps/organizr/organizr.ports.yml | 4 +- compose/.apps/organizr/organizr.x86_64.yml | 4 +- compose/.apps/organizr/organizr.yml | 12 +- compose/.apps/ouroboros/ouroboros.aarch64.yml | 4 +- .../.apps/ouroboros/ouroboros.hostname.yml | 2 +- compose/.apps/ouroboros/ouroboros.labels.yml | 32 ++--- compose/.apps/ouroboros/ouroboros.netmode.yml | 4 +- compose/.apps/ouroboros/ouroboros.x86_64.yml | 4 +- compose/.apps/ouroboros/ouroboros.yml | 26 ++-- compose/.apps/overseerr/overseerr.aarch64.yml | 4 +- .../.apps/overseerr/overseerr.hostname.yml | 2 +- compose/.apps/overseerr/overseerr.labels.yml | 14 +-- compose/.apps/overseerr/overseerr.netmode.yml | 4 +- compose/.apps/overseerr/overseerr.ports.yml | 4 +- compose/.apps/overseerr/overseerr.x86_64.yml | 4 +- compose/.apps/overseerr/overseerr.yml | 8 +- compose/.apps/petio/petio.aarch64.yml | 4 +- compose/.apps/petio/petio.hostname.yml | 2 +- compose/.apps/petio/petio.labels.yml | 14 +-- compose/.apps/petio/petio.netmode.yml | 4 +- compose/.apps/petio/petio.ports.yml | 4 +- compose/.apps/petio/petio.x86_64.yml | 4 +- compose/.apps/petio/petio.yml | 10 +- compose/.apps/pgadmin/pgadmin.aarch64.yml | 4 +- compose/.apps/pgadmin/pgadmin.hostname.yml | 2 +- compose/.apps/pgadmin/pgadmin.labels.yml | 20 +-- compose/.apps/pgadmin/pgadmin.netmode.yml | 4 +- compose/.apps/pgadmin/pgadmin.ports.yml | 4 +- compose/.apps/pgadmin/pgadmin.x86_64.yml | 4 +- compose/.apps/pgadmin/pgadmin.yml | 14 +-- compose/.apps/pgbackup/pgbackup.aarch64.yml | 4 +- compose/.apps/pgbackup/pgbackup.hostname.yml | 2 +- compose/.apps/pgbackup/pgbackup.labels.yml | 30 ++--- compose/.apps/pgbackup/pgbackup.netmode.yml | 4 +- compose/.apps/pgbackup/pgbackup.x86_64.yml | 4 +- compose/.apps/pgbackup/pgbackup.yml | 24 ++-- compose/.apps/photoshow/photoshow.aarch64.yml | 4 +- .../.apps/photoshow/photoshow.hostname.yml | 2 +- compose/.apps/photoshow/photoshow.labels.yml | 18 +-- compose/.apps/photoshow/photoshow.netmode.yml | 4 +- compose/.apps/photoshow/photoshow.ports.yml | 4 +- compose/.apps/photoshow/photoshow.x86_64.yml | 4 +- compose/.apps/photoshow/photoshow.yml | 12 +- .../photostructure.hostname.yml | 2 +- .../photostructure/photostructure.labels.yml | 22 ++-- .../photostructure/photostructure.netmode.yml | 4 +- .../photostructure/photostructure.ports.yml | 4 +- .../photostructure/photostructure.x86_64.yml | 4 +- .../.apps/photostructure/photostructure.yml | 18 +-- .../.apps/phpmyadmin/phpmyadmin.aarch64.yml | 4 +- .../.apps/phpmyadmin/phpmyadmin.hostname.yml | 2 +- .../.apps/phpmyadmin/phpmyadmin.labels.yml | 20 +-- .../.apps/phpmyadmin/phpmyadmin.netmode.yml | 4 +- compose/.apps/phpmyadmin/phpmyadmin.ports.yml | 4 +- .../.apps/phpmyadmin/phpmyadmin.x86_64.yml | 4 +- compose/.apps/phpmyadmin/phpmyadmin.yml | 14 +-- compose/.apps/picard/picard.hostname.yml | 2 +- compose/.apps/picard/picard.labels.yml | 14 +-- compose/.apps/picard/picard.netmode.yml | 4 +- compose/.apps/picard/picard.ports.yml | 4 +- compose/.apps/picard/picard.x86_64.yml | 4 +- compose/.apps/picard/picard.yml | 8 +- compose/.apps/pihole/pihole.aarch64.yml | 4 +- compose/.apps/pihole/pihole.hostname.yml | 2 +- compose/.apps/pihole/pihole.labels.yml | 28 ++--- compose/.apps/pihole/pihole.netmode.yml | 4 +- compose/.apps/pihole/pihole.ports.yml | 12 +- compose/.apps/pihole/pihole.x86_64.yml | 4 +- compose/.apps/pihole/pihole.yml | 22 ++-- compose/.apps/piwigo/piwigo.aarch64.yml | 4 +- compose/.apps/piwigo/piwigo.hostname.yml | 2 +- compose/.apps/piwigo/piwigo.labels.yml | 14 +-- compose/.apps/piwigo/piwigo.netmode.yml | 4 +- compose/.apps/piwigo/piwigo.ports.yml | 4 +- compose/.apps/piwigo/piwigo.x86_64.yml | 4 +- compose/.apps/piwigo/piwigo.yml | 8 +- compose/.apps/plex/plex.aarch64.yml | 4 +- compose/.apps/plex/plex.hostname.yml | 2 +- compose/.apps/plex/plex.labels.yml | 36 +++--- compose/.apps/plex/plex.netmode.yml | 4 +- compose/.apps/plex/plex.ports.yml | 22 ++-- compose/.apps/plex/plex.x86_64.yml | 4 +- compose/.apps/plex/plex.yml | 12 +- .../.apps/plexanisync/plexanisync.aarch64.yml | 4 +- .../plexanisync/plexanisync.hostname.yml | 2 +- .../.apps/plexanisync/plexanisync.labels.yml | 24 ++-- .../.apps/plexanisync/plexanisync.netmode.yml | 4 +- .../.apps/plexanisync/plexanisync.x86_64.yml | 4 +- compose/.apps/plexanisync/plexanisync.yml | 18 +-- .../plexrequests/plexrequests.hostname.yml | 2 +- .../plexrequests/plexrequests.labels.yml | 2 +- .../plexrequests/plexrequests.netmode.yml | 4 +- .../.apps/plexrequests/plexrequests.ports.yml | 4 +- .../plexrequests/plexrequests.x86_64.yml | 4 +- compose/.apps/plexrequests/plexrequests.yml | 8 +- compose/.apps/portainer/portainer.aarch64.yml | 4 +- .../.apps/portainer/portainer.hostname.yml | 2 +- compose/.apps/portainer/portainer.labels.yml | 16 +-- compose/.apps/portainer/portainer.netmode.yml | 4 +- compose/.apps/portainer/portainer.ports.yml | 4 +- compose/.apps/portainer/portainer.x86_64.yml | 4 +- compose/.apps/portainer/portainer.yml | 10 +- .../portaineragent/portaineragent.aarch64.yml | 4 +- .../portaineragent.hostname.yml | 2 +- .../portaineragent/portaineragent.labels.yml | 18 +-- .../portaineragent/portaineragent.netmode.yml | 4 +- .../portaineragent/portaineragent.ports.yml | 4 +- .../portaineragent/portaineragent.x86_64.yml | 4 +- .../.apps/portaineragent/portaineragent.yml | 10 +- compose/.apps/postgres/postgres.aarch64.yml | 4 +- compose/.apps/postgres/postgres.hostname.yml | 2 +- compose/.apps/postgres/postgres.labels.yml | 18 +-- compose/.apps/postgres/postgres.netmode.yml | 4 +- compose/.apps/postgres/postgres.ports.yml | 4 +- compose/.apps/postgres/postgres.x86_64.yml | 4 +- compose/.apps/postgres/postgres.yml | 12 +- .../.apps/privoxyvpn/privoxyvpn.aarch64.yml | 4 +- .../.apps/privoxyvpn/privoxyvpn.hostname.yml | 2 +- .../.apps/privoxyvpn/privoxyvpn.labels.yml | 46 +++---- .../.apps/privoxyvpn/privoxyvpn.netmode.yml | 4 +- compose/.apps/privoxyvpn/privoxyvpn.ports.yml | 6 +- .../.apps/privoxyvpn/privoxyvpn.x86_64.yml | 4 +- compose/.apps/privoxyvpn/privoxyvpn.yml | 38 +++--- .../.apps/prometheus/prometheus.hostname.yml | 2 +- .../.apps/prometheus/prometheus.labels.yml | 14 +-- .../.apps/prometheus/prometheus.netmode.yml | 4 +- compose/.apps/prometheus/prometheus.ports.yml | 4 +- .../.apps/prometheus/prometheus.x86_64.yml | 4 +- compose/.apps/prometheus/prometheus.yml | 10 +- compose/.apps/prowlarr/prowlarr.aarch64.yml | 4 +- compose/.apps/prowlarr/prowlarr.hostname.yml | 2 +- compose/.apps/prowlarr/prowlarr.labels.yml | 14 +-- compose/.apps/prowlarr/prowlarr.netmode.yml | 4 +- compose/.apps/prowlarr/prowlarr.ports.yml | 4 +- compose/.apps/prowlarr/prowlarr.x86_64.yml | 4 +- compose/.apps/prowlarr/prowlarr.yml | 8 +- compose/.apps/pyload/pyload.aarch64.yml | 4 +- compose/.apps/pyload/pyload.hostname.yml | 2 +- compose/.apps/pyload/pyload.labels.yml | 14 +-- compose/.apps/pyload/pyload.netmode.yml | 4 +- compose/.apps/pyload/pyload.ports.yml | 4 +- compose/.apps/pyload/pyload.x86_64.yml | 4 +- compose/.apps/pyload/pyload.yml | 8 +- .../.apps/qbittorrent/qbittorrent.aarch64.yml | 4 +- .../qbittorrent/qbittorrent.hostname.yml | 2 +- .../.apps/qbittorrent/qbittorrent.labels.yml | 18 +-- .../.apps/qbittorrent/qbittorrent.netmode.yml | 4 +- .../.apps/qbittorrent/qbittorrent.ports.yml | 12 +- .../.apps/qbittorrent/qbittorrent.x86_64.yml | 4 +- compose/.apps/qbittorrent/qbittorrent.yml | 10 +- .../qbittorrentvpn/qbittorrentvpn.aarch64.yml | 4 +- .../qbittorrentvpn.hostname.yml | 2 +- .../qbittorrentvpn/qbittorrentvpn.labels.yml | 40 +++--- .../qbittorrentvpn/qbittorrentvpn.netmode.yml | 4 +- .../qbittorrentvpn/qbittorrentvpn.ports.yml | 10 +- .../qbittorrentvpn/qbittorrentvpn.x86_64.yml | 4 +- .../.apps/qbittorrentvpn/qbittorrentvpn.yml | 32 ++--- .../.apps/quasselcore/quasselcore.aarch64.yml | 4 +- .../quasselcore/quasselcore.hostname.yml | 2 +- .../.apps/quasselcore/quasselcore.labels.yml | 16 +-- .../.apps/quasselcore/quasselcore.netmode.yml | 4 +- .../.apps/quasselcore/quasselcore.ports.yml | 6 +- .../.apps/quasselcore/quasselcore.x86_64.yml | 4 +- compose/.apps/quasselcore/quasselcore.yml | 8 +- .../.apps/quasselweb/quasselweb.aarch64.yml | 4 +- .../.apps/quasselweb/quasselweb.hostname.yml | 2 +- .../.apps/quasselweb/quasselweb.labels.yml | 24 ++-- .../.apps/quasselweb/quasselweb.netmode.yml | 4 +- compose/.apps/quasselweb/quasselweb.ports.yml | 6 +- .../.apps/quasselweb/quasselweb.x86_64.yml | 4 +- compose/.apps/quasselweb/quasselweb.yml | 16 +-- compose/.apps/radarr/radarr.aarch64.yml | 4 +- compose/.apps/radarr/radarr.hostname.yml | 2 +- compose/.apps/radarr/radarr.labels.yml | 14 +-- compose/.apps/radarr/radarr.netmode.yml | 4 +- compose/.apps/radarr/radarr.ports.yml | 4 +- compose/.apps/radarr/radarr.x86_64.yml | 4 +- compose/.apps/radarr/radarr.yml | 8 +- compose/.apps/readarr/readarr.aarch64.yml | 4 +- compose/.apps/readarr/readarr.hostname.yml | 2 +- compose/.apps/readarr/readarr.labels.yml | 14 +-- compose/.apps/readarr/readarr.netmode.yml | 4 +- compose/.apps/readarr/readarr.ports.yml | 4 +- compose/.apps/readarr/readarr.x86_64.yml | 4 +- compose/.apps/readarr/readarr.yml | 8 +- compose/.apps/recyclarr/recyclarr.aarch64.yml | 4 +- .../.apps/recyclarr/recyclarr.hostname.yml | 2 +- compose/.apps/recyclarr/recyclarr.labels.yml | 14 +-- compose/.apps/recyclarr/recyclarr.netmode.yml | 4 +- compose/.apps/recyclarr/recyclarr.x86_64.yml | 4 +- compose/.apps/recyclarr/recyclarr.yml | 10 +- compose/.apps/requestrr/requestrr.aarch64.yml | 4 +- .../.apps/requestrr/requestrr.hostname.yml | 2 +- compose/.apps/requestrr/requestrr.labels.yml | 14 +-- compose/.apps/requestrr/requestrr.netmode.yml | 4 +- compose/.apps/requestrr/requestrr.ports.yml | 4 +- compose/.apps/requestrr/requestrr.x86_64.yml | 4 +- compose/.apps/requestrr/requestrr.yml | 8 +- .../.apps/resiliosync/resiliosync.aarch64.yml | 4 +- .../resiliosync/resiliosync.hostname.yml | 2 +- .../.apps/resiliosync/resiliosync.labels.yml | 18 +-- .../.apps/resiliosync/resiliosync.netmode.yml | 4 +- .../.apps/resiliosync/resiliosync.ports.yml | 6 +- .../.apps/resiliosync/resiliosync.x86_64.yml | 4 +- compose/.apps/resiliosync/resiliosync.yml | 10 +- compose/.apps/rsnapshot/rsnapshot.aarch64.yml | 4 +- .../.apps/rsnapshot/rsnapshot.hostname.yml | 2 +- compose/.apps/rsnapshot/rsnapshot.labels.yml | 18 +-- compose/.apps/rsnapshot/rsnapshot.netmode.yml | 4 +- compose/.apps/rsnapshot/rsnapshot.x86_64.yml | 4 +- compose/.apps/rsnapshot/rsnapshot.yml | 14 +-- .../rtorrentvpn/rtorrentvpn.hostname.yml | 2 +- .../.apps/rtorrentvpn/rtorrentvpn.labels.yml | 40 +++--- .../.apps/rtorrentvpn/rtorrentvpn.netmode.yml | 4 +- .../.apps/rtorrentvpn/rtorrentvpn.ports.yml | 16 +-- .../.apps/rtorrentvpn/rtorrentvpn.x86_64.yml | 4 +- compose/.apps/rtorrentvpn/rtorrentvpn.yml | 26 ++-- compose/.apps/rustdesk/rustdesk.aarch64.yml | 4 +- compose/.apps/rustdesk/rustdesk.hostname.yml | 2 +- compose/.apps/rustdesk/rustdesk.labels.yml | 24 ++-- compose/.apps/rustdesk/rustdesk.netmode.yml | 4 +- compose/.apps/rustdesk/rustdesk.ports.yml | 14 +-- compose/.apps/rustdesk/rustdesk.x86_64.yml | 4 +- compose/.apps/rustdesk/rustdesk.yml | 10 +- compose/.apps/rutorrent/rutorrent.aarch64.yml | 4 +- .../.apps/rutorrent/rutorrent.hostname.yml | 2 +- compose/.apps/rutorrent/rutorrent.labels.yml | 20 +-- compose/.apps/rutorrent/rutorrent.netmode.yml | 4 +- compose/.apps/rutorrent/rutorrent.ports.yml | 14 +-- compose/.apps/rutorrent/rutorrent.x86_64.yml | 4 +- compose/.apps/rutorrent/rutorrent.yml | 8 +- compose/.apps/sabnzbd/sabnzbd.aarch64.yml | 4 +- compose/.apps/sabnzbd/sabnzbd.hostname.yml | 2 +- compose/.apps/sabnzbd/sabnzbd.labels.yml | 14 +-- compose/.apps/sabnzbd/sabnzbd.netmode.yml | 4 +- compose/.apps/sabnzbd/sabnzbd.ports.yml | 4 +- compose/.apps/sabnzbd/sabnzbd.x86_64.yml | 4 +- compose/.apps/sabnzbd/sabnzbd.yml | 8 +- .../.apps/sabnzbdvpn/sabnzbdvpn.hostname.yml | 2 +- .../.apps/sabnzbdvpn/sabnzbdvpn.labels.yml | 40 +++--- .../.apps/sabnzbdvpn/sabnzbdvpn.netmode.yml | 4 +- compose/.apps/sabnzbdvpn/sabnzbdvpn.ports.yml | 8 +- .../.apps/sabnzbdvpn/sabnzbdvpn.x86_64.yml | 4 +- compose/.apps/sabnzbdvpn/sabnzbdvpn.yml | 30 ++--- compose/.apps/samba/samba.aarch64.yml | 4 +- compose/.apps/samba/samba.hostname.yml | 2 +- compose/.apps/samba/samba.labels.yml | 30 ++--- compose/.apps/samba/samba.netmode.yml | 4 +- compose/.apps/samba/samba.ports.yml | 10 +- compose/.apps/samba/samba.x86_64.yml | 4 +- compose/.apps/samba/samba.yml | 18 +-- compose/.apps/sickchill/sickchill.aarch64.yml | 4 +- .../.apps/sickchill/sickchill.hostname.yml | 2 +- compose/.apps/sickchill/sickchill.labels.yml | 14 +-- compose/.apps/sickchill/sickchill.netmode.yml | 4 +- compose/.apps/sickchill/sickchill.ports.yml | 4 +- compose/.apps/sickchill/sickchill.x86_64.yml | 4 +- compose/.apps/sickchill/sickchill.yml | 8 +- compose/.apps/smokeping/smokeping.aarch64.yml | 4 +- .../.apps/smokeping/smokeping.hostname.yml | 2 +- compose/.apps/smokeping/smokeping.labels.yml | 20 +-- compose/.apps/smokeping/smokeping.netmode.yml | 4 +- compose/.apps/smokeping/smokeping.ports.yml | 4 +- compose/.apps/smokeping/smokeping.x86_64.yml | 4 +- compose/.apps/smokeping/smokeping.yml | 14 +-- compose/.apps/sonarr/sonarr.aarch64.yml | 4 +- compose/.apps/sonarr/sonarr.hostname.yml | 2 +- compose/.apps/sonarr/sonarr.labels.yml | 14 +-- compose/.apps/sonarr/sonarr.netmode.yml | 4 +- compose/.apps/sonarr/sonarr.ports.yml | 4 +- compose/.apps/sonarr/sonarr.x86_64.yml | 4 +- compose/.apps/sonarr/sonarr.yml | 8 +- compose/.apps/speedtest/speedtest.aarch64.yml | 4 +- .../.apps/speedtest/speedtest.hostname.yml | 2 +- compose/.apps/speedtest/speedtest.labels.yml | 18 +-- compose/.apps/speedtest/speedtest.netmode.yml | 4 +- compose/.apps/speedtest/speedtest.ports.yml | 4 +- compose/.apps/speedtest/speedtest.x86_64.yml | 4 +- compose/.apps/speedtest/speedtest.yml | 12 +- compose/.apps/swag/swag.aarch64.yml | 4 +- compose/.apps/swag/swag.hostname.yml | 2 +- compose/.apps/swag/swag.labels.yml | 30 ++--- compose/.apps/swag/swag.netmode.yml | 4 +- compose/.apps/swag/swag.ports.yml | 6 +- compose/.apps/swag/swag.x86_64.yml | 4 +- compose/.apps/swag/swag.yml | 22 ++-- .../.apps/synclounge/synclounge.aarch64.yml | 4 +- .../.apps/synclounge/synclounge.hostname.yml | 2 +- .../.apps/synclounge/synclounge.labels.yml | 28 ++--- .../.apps/synclounge/synclounge.netmode.yml | 4 +- compose/.apps/synclounge/synclounge.ports.yml | 6 +- .../.apps/synclounge/synclounge.x86_64.yml | 4 +- compose/.apps/synclounge/synclounge.yml | 18 +-- compose/.apps/syncthing/syncthing.aarch64.yml | 4 +- .../.apps/syncthing/syncthing.hostname.yml | 2 +- compose/.apps/syncthing/syncthing.labels.yml | 20 +-- compose/.apps/syncthing/syncthing.netmode.yml | 4 +- compose/.apps/syncthing/syncthing.ports.yml | 8 +- compose/.apps/syncthing/syncthing.x86_64.yml | 4 +- compose/.apps/syncthing/syncthing.yml | 10 +- compose/.apps/tandoor/tandoor.aarch64.yml | 4 +- compose/.apps/tandoor/tandoor.hostname.yml | 2 +- compose/.apps/tandoor/tandoor.labels.yml | 24 ++-- compose/.apps/tandoor/tandoor.netmode.yml | 4 +- compose/.apps/tandoor/tandoor.ports.yml | 4 +- compose/.apps/tandoor/tandoor.x86_64.yml | 4 +- compose/.apps/tandoor/tandoor.yml | 22 ++-- compose/.apps/tautulli/tautulli.aarch64.yml | 4 +- compose/.apps/tautulli/tautulli.hostname.yml | 2 +- compose/.apps/tautulli/tautulli.labels.yml | 14 +-- compose/.apps/tautulli/tautulli.netmode.yml | 4 +- compose/.apps/tautulli/tautulli.ports.yml | 4 +- compose/.apps/tautulli/tautulli.x86_64.yml | 4 +- compose/.apps/tautulli/tautulli.yml | 8 +- compose/.apps/tdarr/tdarr.hostname.yml | 2 +- compose/.apps/tdarr/tdarr.labels.yml | 20 +-- compose/.apps/tdarr/tdarr.netmode.yml | 4 +- compose/.apps/tdarr/tdarr.ports.yml | 6 +- compose/.apps/tdarr/tdarr.x86_64.yml | 4 +- compose/.apps/tdarr/tdarr.yml | 16 +-- .../.apps/tdarrnode/tdarrnode.hostname.yml | 2 +- compose/.apps/tdarrnode/tdarrnode.labels.yml | 24 ++-- compose/.apps/tdarrnode/tdarrnode.netmode.yml | 4 +- compose/.apps/tdarrnode/tdarrnode.ports.yml | 4 +- compose/.apps/tdarrnode/tdarrnode.x86_64.yml | 4 +- compose/.apps/tdarrnode/tdarrnode.yml | 18 +-- compose/.apps/telegraf/telegraf.aarch64.yml | 4 +- compose/.apps/telegraf/telegraf.hostname.yml | 2 +- compose/.apps/telegraf/telegraf.labels.yml | 20 +-- compose/.apps/telegraf/telegraf.netmode.yml | 4 +- compose/.apps/telegraf/telegraf.ports.yml | 8 +- compose/.apps/telegraf/telegraf.x86_64.yml | 4 +- compose/.apps/telegraf/telegraf.yml | 10 +- compose/.apps/thelounge/thelounge.aarch64.yml | 4 +- .../.apps/thelounge/thelounge.hostname.yml | 2 +- compose/.apps/thelounge/thelounge.labels.yml | 14 +-- compose/.apps/thelounge/thelounge.netmode.yml | 4 +- compose/.apps/thelounge/thelounge.ports.yml | 4 +- compose/.apps/thelounge/thelounge.x86_64.yml | 4 +- compose/.apps/thelounge/thelounge.yml | 8 +- .../.apps/timemachine/timemachine.aarch64.yml | 4 +- .../timemachine/timemachine.hostname.yml | 2 +- .../.apps/timemachine/timemachine.labels.yml | 58 ++++----- .../.apps/timemachine/timemachine.netmode.yml | 4 +- .../.apps/timemachine/timemachine.ports.yml | 10 +- .../.apps/timemachine/timemachine.x86_64.yml | 4 +- compose/.apps/timemachine/timemachine.yml | 50 ++++---- compose/.apps/traefik/traefik.aarch64.yml | 4 +- compose/.apps/traefik/traefik.hostname.yml | 2 +- compose/.apps/traefik/traefik.labels.yml | 20 +-- compose/.apps/traefik/traefik.netmode.yml | 4 +- compose/.apps/traefik/traefik.ports.yml | 8 +- compose/.apps/traefik/traefik.x86_64.yml | 4 +- compose/.apps/traefik/traefik.yml | 10 +- compose/.apps/traktarr/traktarr.aarch64.yml | 4 +- compose/.apps/traktarr/traktarr.hostname.yml | 2 +- compose/.apps/traktarr/traktarr.labels.yml | 12 +- compose/.apps/traktarr/traktarr.netmode.yml | 4 +- compose/.apps/traktarr/traktarr.x86_64.yml | 4 +- compose/.apps/traktarr/traktarr.yml | 8 +- .../transmission/transmission.aarch64.yml | 4 +- .../transmission/transmission.hostname.yml | 2 +- .../transmission/transmission.labels.yml | 18 +-- .../transmission/transmission.netmode.yml | 4 +- .../.apps/transmission/transmission.ports.yml | 12 +- .../transmission/transmission.x86_64.yml | 4 +- compose/.apps/transmission/transmission.yml | 8 +- .../transmissionvpn.aarch64.yml | 4 +- .../transmissionvpn.hostname.yml | 2 +- .../transmissionvpn.labels.yml | 30 ++--- .../transmissionvpn.netmode.yml | 4 +- .../transmissionvpn/transmissionvpn.ports.yml | 4 +- .../transmissionvpn.x86_64.yml | 4 +- .../.apps/transmissionvpn/transmissionvpn.yml | 24 ++-- compose/.apps/tvheadend/tvheadend.aarch64.yml | 4 +- .../.apps/tvheadend/tvheadend.hostname.yml | 2 +- compose/.apps/tvheadend/tvheadend.labels.yml | 20 +-- compose/.apps/tvheadend/tvheadend.netmode.yml | 4 +- compose/.apps/tvheadend/tvheadend.ports.yml | 6 +- compose/.apps/tvheadend/tvheadend.x86_64.yml | 4 +- compose/.apps/tvheadend/tvheadend.yml | 12 +- compose/.apps/ubooquity/ubooquity.aarch64.yml | 4 +- .../.apps/ubooquity/ubooquity.hostname.yml | 2 +- compose/.apps/ubooquity/ubooquity.labels.yml | 20 +-- compose/.apps/ubooquity/ubooquity.netmode.yml | 4 +- compose/.apps/ubooquity/ubooquity.ports.yml | 6 +- compose/.apps/ubooquity/ubooquity.x86_64.yml | 4 +- compose/.apps/ubooquity/ubooquity.yml | 12 +- compose/.apps/unifi/unifi.aarch64.yml | 4 +- compose/.apps/unifi/unifi.hostname.yml | 2 +- compose/.apps/unifi/unifi.labels.yml | 2 +- compose/.apps/unifi/unifi.netmode.yml | 4 +- compose/.apps/unifi/unifi.ports.yml | 18 +-- compose/.apps/unifi/unifi.x86_64.yml | 4 +- compose/.apps/unifi/unifi.yml | 8 +- .../unificontroller.aarch64.yml | 4 +- .../unificontroller.hostname.yml | 2 +- .../unificontroller.labels.yml | 28 ++--- .../unificontroller.netmode.yml | 4 +- .../unificontroller/unificontroller.ports.yml | 18 +-- .../unificontroller.x86_64.yml | 4 +- .../.apps/unificontroller/unificontroller.yml | 8 +- compose/.apps/unmanic/unmanic.hostname.yml | 2 +- compose/.apps/unmanic/unmanic.labels.yml | 16 +-- compose/.apps/unmanic/unmanic.netmode.yml | 4 +- compose/.apps/unmanic/unmanic.ports.yml | 4 +- compose/.apps/unmanic/unmanic.x86_64.yml | 4 +- compose/.apps/unmanic/unmanic.yml | 10 +- compose/.apps/unpackerr/unpackerr.aarch64.yml | 4 +- .../.apps/unpackerr/unpackerr.hostname.yml | 2 +- compose/.apps/unpackerr/unpackerr.labels.yml | 34 +++--- compose/.apps/unpackerr/unpackerr.netmode.yml | 4 +- compose/.apps/unpackerr/unpackerr.x86_64.yml | 4 +- compose/.apps/unpackerr/unpackerr.yml | 30 ++--- .../.apps/uptimekuma/uptimekuma.aarch64.yml | 4 +- .../.apps/uptimekuma/uptimekuma.hostname.yml | 2 +- .../.apps/uptimekuma/uptimekuma.labels.yml | 14 +-- .../.apps/uptimekuma/uptimekuma.netmode.yml | 4 +- compose/.apps/uptimekuma/uptimekuma.ports.yml | 4 +- .../.apps/uptimekuma/uptimekuma.x86_64.yml | 4 +- compose/.apps/uptimekuma/uptimekuma.yml | 8 +- compose/.apps/varken/varken.aarch64.yml | 4 +- compose/.apps/varken/varken.hostname.yml | 2 +- compose/.apps/varken/varken.labels.yml | 12 +- compose/.apps/varken/varken.netmode.yml | 4 +- compose/.apps/varken/varken.x86_64.yml | 4 +- compose/.apps/varken/varken.yml | 8 +- compose/.apps/vsftpd/vsftpd.hostname.yml | 2 +- compose/.apps/vsftpd/vsftpd.labels.yml | 20 +-- compose/.apps/vsftpd/vsftpd.netmode.yml | 4 +- compose/.apps/vsftpd/vsftpd.ports.yml | 4 +- compose/.apps/vsftpd/vsftpd.x86_64.yml | 4 +- compose/.apps/vsftpd/vsftpd.yml | 12 +- .../.apps/watchtower/watchtower.aarch64.yml | 4 +- .../.apps/watchtower/watchtower.hostname.yml | 2 +- .../.apps/watchtower/watchtower.labels.yml | 36 +++--- .../.apps/watchtower/watchtower.netmode.yml | 4 +- .../.apps/watchtower/watchtower.x86_64.yml | 4 +- compose/.apps/watchtower/watchtower.yml | 30 ++--- compose/.apps/wireguard/wireguard.aarch64.yml | 4 +- .../.apps/wireguard/wireguard.hostname.yml | 2 +- compose/.apps/wireguard/wireguard.labels.yml | 24 ++-- compose/.apps/wireguard/wireguard.netmode.yml | 4 +- compose/.apps/wireguard/wireguard.ports.yml | 4 +- compose/.apps/wireguard/wireguard.x86_64.yml | 4 +- compose/.apps/wireguard/wireguard.yml | 20 +-- compose/.apps/xbackbone/xbackbone.aarch64.yml | 4 +- .../.apps/xbackbone/xbackbone.hostname.yml | 2 +- compose/.apps/xbackbone/xbackbone.labels.yml | 16 +-- compose/.apps/xbackbone/xbackbone.netmode.yml | 4 +- compose/.apps/xbackbone/xbackbone.ports.yml | 4 +- compose/.apps/xbackbone/xbackbone.x86_64.yml | 4 +- compose/.apps/xbackbone/xbackbone.yml | 10 +- compose/.apps/xteve/xteve.hostname.yml | 2 +- compose/.apps/xteve/xteve.labels.yml | 18 +-- compose/.apps/xteve/xteve.netmode.yml | 4 +- compose/.apps/xteve/xteve.ports.yml | 4 +- compose/.apps/xteve/xteve.x86_64.yml | 4 +- compose/.apps/xteve/xteve.yml | 14 +-- compose/.apps/yacht/yacht.aarch64.yml | 4 +- compose/.apps/yacht/yacht.hostname.yml | 2 +- compose/.apps/yacht/yacht.labels.yml | 22 ++-- compose/.apps/yacht/yacht.netmode.yml | 4 +- compose/.apps/yacht/yacht.ports.yml | 4 +- compose/.apps/yacht/yacht.x86_64.yml | 4 +- compose/.apps/yacht/yacht.yml | 16 +-- .../.apps/youtubedl/youtubedl.hostname.yml | 2 +- compose/.apps/youtubedl/youtubedl.labels.yml | 18 +-- compose/.apps/youtubedl/youtubedl.netmode.yml | 4 +- compose/.apps/youtubedl/youtubedl.ports.yml | 4 +- compose/.apps/youtubedl/youtubedl.x86_64.yml | 4 +- compose/.apps/youtubedl/youtubedl.yml | 12 +- compose/.apps/znc/znc.aarch64.yml | 4 +- compose/.apps/znc/znc.hostname.yml | 2 +- compose/.apps/znc/znc.labels.yml | 14 +-- compose/.apps/znc/znc.netmode.yml | 4 +- compose/.apps/znc/znc.ports.yml | 4 +- compose/.apps/znc/znc.x86_64.yml | 4 +- compose/.apps/znc/znc.yml | 8 +- 1149 files changed, 4500 insertions(+), 4500 deletions(-) diff --git a/compose/.apps/adguard/adguard.aarch64.yml b/compose/.apps/adguard/adguard.aarch64.yml index 5e44cec50b..4e57de81bb 100644 --- a/compose/.apps/adguard/adguard.aarch64.yml +++ b/compose/.apps/adguard/adguard.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: adguard/adguardhome:${${_APPNAME_}_TAG} + : + image: adguard/adguardhome:${_TAG} diff --git a/compose/.apps/adguard/adguard.hostname.yml b/compose/.apps/adguard/adguard.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/adguard/adguard.hostname.yml +++ b/compose/.apps/adguard/adguard.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/adguard/adguard.labels.yml b/compose/.apps/adguard/adguard.labels.yml index 64c3c2ac15..83f934e247 100644 --- a/compose/.apps/adguard/adguard.labels.yml +++ b/compose/.apps/adguard/adguard.labels.yml @@ -1,19 +1,19 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Network-wide ads & trackers blocking DNS server" com.dockstarter.appinfo.nicename: "Adguard" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_serverip: "0.0.0.0" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_3000: "3000" - com.dockstarter.appvars.${_appname_}_port_443: "446" - com.dockstarter.appvars.${_appname_}_port_53: "53" - com.dockstarter.appvars.${_appname_}_port_67: "67" - com.dockstarter.appvars.${_appname_}_port_68: "68" - com.dockstarter.appvars.${_appname_}_port_80: "8008" - com.dockstarter.appvars.${_appname_}_port_853: "853" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_serverip: "0.0.0.0" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_3000: "3000" + com.dockstarter.appvars._port_443: "446" + com.dockstarter.appvars._port_53: "53" + com.dockstarter.appvars._port_67: "67" + com.dockstarter.appvars._port_68: "68" + com.dockstarter.appvars._port_80: "8008" + com.dockstarter.appvars._port_853: "853" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/adguard/adguard.netmode.yml b/compose/.apps/adguard/adguard.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/adguard/adguard.netmode.yml +++ b/compose/.apps/adguard/adguard.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/adguard/adguard.ports.yml b/compose/.apps/adguard/adguard.ports.yml index 6dfff48e8b..858fc0205d 100644 --- a/compose/.apps/adguard/adguard.ports.yml +++ b/compose/.apps/adguard/adguard.ports.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_3000}:3000 - - ${${_APPNAME_}_PORT_443}:443 - - ${${_APPNAME_}_PORT_80}:80 - - ${${_APPNAME_}_PORT_853}:853 - - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${${_APPNAME_}_PORT_53}:53 - - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${${_APPNAME_}_PORT_53}:53/udp - - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${${_APPNAME_}_67}:67/udp - - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${${_APPNAME_}_PORT_68}:68 - - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${${_APPNAME_}_PORT_68}:68/udp + - ${_PORT_3000}:3000 + - ${_PORT_443}:443 + - ${_PORT_80}:80 + - ${_PORT_853}:853 + - ${_ENVIRONMENT_SERVERIP}:${_PORT_53}:53 + - ${_ENVIRONMENT_SERVERIP}:${_PORT_53}:53/udp + - ${_ENVIRONMENT_SERVERIP}:${_67}:67/udp + - ${_ENVIRONMENT_SERVERIP}:${_PORT_68}:68 + - ${_ENVIRONMENT_SERVERIP}:${_PORT_68}:68/udp diff --git a/compose/.apps/adguard/adguard.x86_64.yml b/compose/.apps/adguard/adguard.x86_64.yml index 5e44cec50b..4e57de81bb 100644 --- a/compose/.apps/adguard/adguard.x86_64.yml +++ b/compose/.apps/adguard/adguard.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: adguard/adguardhome:${${_APPNAME_}_TAG} + : + image: adguard/adguardhome:${_TAG} diff --git a/compose/.apps/adguard/adguard.yml b/compose/.apps/adguard/adguard.yml index 617ff19ec3..e1f6013579 100644 --- a/compose/.apps/adguard/adguard.yml +++ b/compose/.apps/adguard/adguard.yml @@ -1,11 +1,11 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/work:/opt/adguardhome/work - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/conf:/opt/adguardhome/conf + - ${DOCKER_VOLUME_CONFIG}//work:/opt/adguardhome/work + - ${DOCKER_VOLUME_CONFIG}//conf:/opt/adguardhome/conf - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/adminer/adminer.aarch64.yml b/compose/.apps/adminer/adminer.aarch64.yml index 32f8f58efd..75780fbb7a 100644 --- a/compose/.apps/adminer/adminer.aarch64.yml +++ b/compose/.apps/adminer/adminer.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: adminer:${${_APPNAME_}_TAG} + : + image: adminer:${_TAG} diff --git a/compose/.apps/adminer/adminer.hostname.yml b/compose/.apps/adminer/adminer.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/adminer/adminer.hostname.yml +++ b/compose/.apps/adminer/adminer.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/adminer/adminer.labels.yml b/compose/.apps/adminer/adminer.labels.yml index 57678bd6b0..2290fa128f 100644 --- a/compose/.apps/adminer/adminer.labels.yml +++ b/compose/.apps/adminer/adminer.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A full-featured database management tool" com.dockstarter.appinfo.nicename: "adminer" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_design: "" - com.dockstarter.appvars.${_appname_}_environment_plugins: "" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8080: "8080" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_design: "" + com.dockstarter.appvars._environment_plugins: "" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8080: "8080" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/adminer/adminer.netmode.yml b/compose/.apps/adminer/adminer.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/adminer/adminer.netmode.yml +++ b/compose/.apps/adminer/adminer.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/adminer/adminer.ports.yml b/compose/.apps/adminer/adminer.ports.yml index 7d1c7e4455..f19f4867cd 100644 --- a/compose/.apps/adminer/adminer.ports.yml +++ b/compose/.apps/adminer/adminer.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8080}:8080 + - ${_PORT_8080}:8080 diff --git a/compose/.apps/adminer/adminer.x86_64.yml b/compose/.apps/adminer/adminer.x86_64.yml index 32f8f58efd..75780fbb7a 100644 --- a/compose/.apps/adminer/adminer.x86_64.yml +++ b/compose/.apps/adminer/adminer.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: adminer:${${_APPNAME_}_TAG} + : + image: adminer:${_TAG} diff --git a/compose/.apps/adminer/adminer.yml b/compose/.apps/adminer/adminer.yml index 3d2a8a7424..8a734e9e13 100644 --- a/compose/.apps/adminer/adminer.yml +++ b/compose/.apps/adminer/adminer.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - ADMINER_DESIGN=${${_APPNAME_}_ENVIRONMENT_DESIGN} - - ADMINER_PLUGINS=${${_APPNAME_}_ENVIRONMENT_PLUGINS} + - ADMINER_DESIGN=${_ENVIRONMENT_DESIGN} + - ADMINER_PLUGINS=${_ENVIRONMENT_PLUGINS} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/sessions + - ${DOCKER_VOLUME_CONFIG}/:/sessions - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/airdcpp/airdcpp.hostname.yml b/compose/.apps/airdcpp/airdcpp.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/airdcpp/airdcpp.hostname.yml +++ b/compose/.apps/airdcpp/airdcpp.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/airdcpp/airdcpp.labels.yml b/compose/.apps/airdcpp/airdcpp.labels.yml index 32e264c96e..76ba66fa79 100644 --- a/compose/.apps/airdcpp/airdcpp.labels.yml +++ b/compose/.apps/airdcpp/airdcpp.labels.yml @@ -1,16 +1,16 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) No replacement" com.dockstarter.appinfo.nicename: "AirdcPP" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_21248: "21248" - com.dockstarter.appvars.${_appname_}_port_21249: "21249" - com.dockstarter.appvars.${_appname_}_port_5600: "5600" - com.dockstarter.appvars.${_appname_}_port_5601: "5601" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_sharedir: "/mnt/airdcpp" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_21248: "21248" + com.dockstarter.appvars._port_21249: "21249" + com.dockstarter.appvars._port_5600: "5600" + com.dockstarter.appvars._port_5601: "5601" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_sharedir: "/mnt/airdcpp" diff --git a/compose/.apps/airdcpp/airdcpp.netmode.yml b/compose/.apps/airdcpp/airdcpp.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/airdcpp/airdcpp.netmode.yml +++ b/compose/.apps/airdcpp/airdcpp.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/airdcpp/airdcpp.ports.yml b/compose/.apps/airdcpp/airdcpp.ports.yml index 6df163efde..f19459d81e 100644 --- a/compose/.apps/airdcpp/airdcpp.ports.yml +++ b/compose/.apps/airdcpp/airdcpp.ports.yml @@ -1,8 +1,8 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_21248}:21248 - - ${${_APPNAME_}_PORT_21248}:21248/udp - - ${${_APPNAME_}_PORT_21249}:21249 - - ${${_APPNAME_}_PORT_5600}:5600 - - ${${_APPNAME_}_PORT_5601}:5601 + - ${_PORT_21248}:21248 + - ${_PORT_21248}:21248/udp + - ${_PORT_21249}:21249 + - ${_PORT_5600}:5600 + - ${_PORT_5601}:5601 diff --git a/compose/.apps/airdcpp/airdcpp.x86_64.yml b/compose/.apps/airdcpp/airdcpp.x86_64.yml index dd27528e60..d8a2dce45e 100644 --- a/compose/.apps/airdcpp/airdcpp.x86_64.yml +++ b/compose/.apps/airdcpp/airdcpp.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: gangefors/airdcpp-webclient:${${_APPNAME_}_TAG} + : + image: gangefors/airdcpp-webclient:${_TAG} diff --git a/compose/.apps/airdcpp/airdcpp.yml b/compose/.apps/airdcpp/airdcpp.yml index 271ca65830..6095c48219 100644 --- a/compose/.apps/airdcpp/airdcpp.yml +++ b/compose/.apps/airdcpp/airdcpp.yml @@ -1,18 +1,18 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - HTTP_PORT=${${_APPNAME_}_PORT_5600} - - HTTPS_PORT=${${_APPNAME_}_PORT_5601} + - HTTP_PORT=${_PORT_5600} + - HTTPS_PORT=${_PORT_5601} - PGID=${PGID} - PUID=${PUID} - - TCP_PORT=${${_APPNAME_}_PORT_21248} - - TLS_PORT=${${_APPNAME_}_PORT_21249} + - TCP_PORT=${_PORT_21248} + - TLS_PORT=${_PORT_21249} - TZ=${TZ} - - UDP_PORT=${${_APPNAME_}_PORT_21248} - restart: ${${_APPNAME_}_RESTART} + - UDP_PORT=${_PORT_21248} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${${_APPNAME_}_VOLUME_SHAREDIR}:/Share - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/.airdcpp + - ${_VOLUME_SHAREDIR}:/Share + - ${DOCKER_VOLUME_CONFIG}/:/.airdcpp - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/airsonic/airsonic.aarch64.yml b/compose/.apps/airsonic/airsonic.aarch64.yml index 375a796b32..a31b2aa3bd 100644 --- a/compose/.apps/airsonic/airsonic.aarch64.yml +++ b/compose/.apps/airsonic/airsonic.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/airsonic:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/airsonic:${_TAG} diff --git a/compose/.apps/airsonic/airsonic.hostname.yml b/compose/.apps/airsonic/airsonic.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/airsonic/airsonic.hostname.yml +++ b/compose/.apps/airsonic/airsonic.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/airsonic/airsonic.labels.yml b/compose/.apps/airsonic/airsonic.labels.yml index 2bdf65933f..e2e94a2381 100644 --- a/compose/.apps/airsonic/airsonic.labels.yml +++ b/compose/.apps/airsonic/airsonic.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) Use AirsonicAdvanced" com.dockstarter.appinfo.nicename: "Airsonic" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_context_path: "/airsonic" - com.dockstarter.appvars.${_appname_}_environment_java_opts: "" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_4040: "4040" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_context_path: "/airsonic" + com.dockstarter.appvars._environment_java_opts: "" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_4040: "4040" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/airsonic/airsonic.netmode.yml b/compose/.apps/airsonic/airsonic.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/airsonic/airsonic.netmode.yml +++ b/compose/.apps/airsonic/airsonic.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/airsonic/airsonic.ports.yml b/compose/.apps/airsonic/airsonic.ports.yml index b4d795b88b..2cdf3e4cc0 100644 --- a/compose/.apps/airsonic/airsonic.ports.yml +++ b/compose/.apps/airsonic/airsonic.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_4040}:4040 + - ${_PORT_4040}:4040 diff --git a/compose/.apps/airsonic/airsonic.x86_64.yml b/compose/.apps/airsonic/airsonic.x86_64.yml index 375a796b32..a31b2aa3bd 100644 --- a/compose/.apps/airsonic/airsonic.x86_64.yml +++ b/compose/.apps/airsonic/airsonic.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/airsonic:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/airsonic:${_TAG} diff --git a/compose/.apps/airsonic/airsonic.yml b/compose/.apps/airsonic/airsonic.yml index 6fb6179c80..fb5f0c69ff 100644 --- a/compose/.apps/airsonic/airsonic.yml +++ b/compose/.apps/airsonic/airsonic.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - CONTEXT_PATH=${${_APPNAME_}_ENVIRONMENT_CONTEXT_PATH} - - JAVA_OPTS=${${_APPNAME_}_ENVIRONMENT_JAVA_OPTS} + - CONTEXT_PATH=${_ENVIRONMENT_CONTEXT_PATH} + - JAVA_OPTS=${_ENVIRONMENT_JAVA_OPTS} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/airsonicadvanced/airsonicadvanced.aarch64.yml b/compose/.apps/airsonicadvanced/airsonicadvanced.aarch64.yml index ba2566d2f2..51ff0284b8 100644 --- a/compose/.apps/airsonicadvanced/airsonicadvanced.aarch64.yml +++ b/compose/.apps/airsonicadvanced/airsonicadvanced.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/airsonic-advanced:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/airsonic-advanced:${_TAG} diff --git a/compose/.apps/airsonicadvanced/airsonicadvanced.hostname.yml b/compose/.apps/airsonicadvanced/airsonicadvanced.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/airsonicadvanced/airsonicadvanced.hostname.yml +++ b/compose/.apps/airsonicadvanced/airsonicadvanced.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/airsonicadvanced/airsonicadvanced.labels.yml b/compose/.apps/airsonicadvanced/airsonicadvanced.labels.yml index 53af287b01..6d560c4f62 100644 --- a/compose/.apps/airsonicadvanced/airsonicadvanced.labels.yml +++ b/compose/.apps/airsonicadvanced/airsonicadvanced.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: 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.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_context_path: "/airsonic" - com.dockstarter.appvars.${_appname_}_environment_java_opts: "" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_4040: "4040" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_context_path: "/airsonic" + com.dockstarter.appvars._environment_java_opts: "" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_4040: "4040" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/airsonicadvanced/airsonicadvanced.netmode.yml b/compose/.apps/airsonicadvanced/airsonicadvanced.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/airsonicadvanced/airsonicadvanced.netmode.yml +++ b/compose/.apps/airsonicadvanced/airsonicadvanced.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/airsonicadvanced/airsonicadvanced.ports.yml b/compose/.apps/airsonicadvanced/airsonicadvanced.ports.yml index b4d795b88b..2cdf3e4cc0 100644 --- a/compose/.apps/airsonicadvanced/airsonicadvanced.ports.yml +++ b/compose/.apps/airsonicadvanced/airsonicadvanced.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_4040}:4040 + - ${_PORT_4040}:4040 diff --git a/compose/.apps/airsonicadvanced/airsonicadvanced.x86_64.yml b/compose/.apps/airsonicadvanced/airsonicadvanced.x86_64.yml index ba2566d2f2..51ff0284b8 100644 --- a/compose/.apps/airsonicadvanced/airsonicadvanced.x86_64.yml +++ b/compose/.apps/airsonicadvanced/airsonicadvanced.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/airsonic-advanced:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/airsonic-advanced:${_TAG} diff --git a/compose/.apps/airsonicadvanced/airsonicadvanced.yml b/compose/.apps/airsonicadvanced/airsonicadvanced.yml index 6fb6179c80..fb5f0c69ff 100644 --- a/compose/.apps/airsonicadvanced/airsonicadvanced.yml +++ b/compose/.apps/airsonicadvanced/airsonicadvanced.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - CONTEXT_PATH=${${_APPNAME_}_ENVIRONMENT_CONTEXT_PATH} - - JAVA_OPTS=${${_APPNAME_}_ENVIRONMENT_JAVA_OPTS} + - CONTEXT_PATH=${_ENVIRONMENT_CONTEXT_PATH} + - JAVA_OPTS=${_ENVIRONMENT_JAVA_OPTS} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/amd/amd.aarch64.yml b/compose/.apps/amd/amd.aarch64.yml index a01cbfb4df..3c4aa28cd3 100644 --- a/compose/.apps/amd/amd.aarch64.yml +++ b/compose/.apps/amd/amd.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: halianelf/amd:${${_APPNAME_}_TAG} + : + image: halianelf/amd:${_TAG} diff --git a/compose/.apps/amd/amd.hostname.yml b/compose/.apps/amd/amd.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/amd/amd.hostname.yml +++ b/compose/.apps/amd/amd.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/amd/amd.labels.yml b/compose/.apps/amd/amd.labels.yml index b5c23199e0..be5d49c43c 100644 --- a/compose/.apps/amd/amd.labels.yml +++ b/compose/.apps/amd/amd.labels.yml @@ -1,30 +1,30 @@ services: - ${_appname_}: + : labels: 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.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_arl_token: "" - com.dockstarter.appvars.${_appname_}_environment_autostart: "true" - com.dockstarter.appvars.${_appname_}_environment_bitrate: "320" - com.dockstarter.appvars.${_appname_}_environment_concurrency: "1" - com.dockstarter.appvars.${_appname_}_environment_download_mode: "wanted" - com.dockstarter.appvars.${_appname_}_environment_downloads: "/storage/downloads" - com.dockstarter.appvars.${_appname_}_environment_file_permissions: "666" - com.dockstarter.appvars.${_appname_}_environment_folder_permissions: "766" - com.dockstarter.appvars.${_appname_}_environment_format: "FLAC" - com.dockstarter.appvars.${_appname_}_environment_lidarr_api_key: "" - com.dockstarter.appvars.${_appname_}_environment_lidarr_url: "http://lidarr:8686" - com.dockstarter.appvars.${_appname_}_environment_list: "both" - com.dockstarter.appvars.${_appname_}_environment_match_distance: "10" - com.dockstarter.appvars.${_appname_}_environment_mbrainzmirror: "https://musicbrainz.org" - com.dockstarter.appvars.${_appname_}_environment_mbratelimit: "1" - com.dockstarter.appvars.${_appname_}_environment_replay_again: "true" - com.dockstarter.appvars.${_appname_}_environment_required_quality: "false" - com.dockstarter.appvars.${_appname_}_environment_script_interval: "1h" - com.dockstarter.appvars.${_appname_}_environment_search_type: "both" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_arl_token: "" + com.dockstarter.appvars._environment_autostart: "true" + com.dockstarter.appvars._environment_bitrate: "320" + com.dockstarter.appvars._environment_concurrency: "1" + com.dockstarter.appvars._environment_download_mode: "wanted" + com.dockstarter.appvars._environment_downloads: "/storage/downloads" + com.dockstarter.appvars._environment_file_permissions: "666" + com.dockstarter.appvars._environment_folder_permissions: "766" + com.dockstarter.appvars._environment_format: "FLAC" + com.dockstarter.appvars._environment_lidarr_api_key: "" + com.dockstarter.appvars._environment_lidarr_url: "http://lidarr:8686" + com.dockstarter.appvars._environment_list: "both" + com.dockstarter.appvars._environment_match_distance: "10" + com.dockstarter.appvars._environment_mbrainzmirror: "https://musicbrainz.org" + com.dockstarter.appvars._environment_mbratelimit: "1" + com.dockstarter.appvars._environment_replay_again: "true" + com.dockstarter.appvars._environment_required_quality: "false" + com.dockstarter.appvars._environment_script_interval: "1h" + com.dockstarter.appvars._environment_search_type: "both" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/amd/amd.netmode.yml b/compose/.apps/amd/amd.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/amd/amd.netmode.yml +++ b/compose/.apps/amd/amd.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/amd/amd.x86_64.yml b/compose/.apps/amd/amd.x86_64.yml index a01cbfb4df..3c4aa28cd3 100644 --- a/compose/.apps/amd/amd.x86_64.yml +++ b/compose/.apps/amd/amd.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: halianelf/amd:${${_APPNAME_}_TAG} + : + image: halianelf/amd:${_TAG} diff --git a/compose/.apps/amd/amd.yml b/compose/.apps/amd/amd.yml index 151b07f0a3..363ce3a5af 100644 --- a/compose/.apps/amd/amd.yml +++ b/compose/.apps/amd/amd.yml @@ -1,31 +1,31 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - ARL_TOKEN=${${_APPNAME_}_ENVIRONMENT_ARL_TOKEN} - - AUTOSTART=${${_APPNAME_}_ENVIRONMENT_AUTOSTART} - - BITRATE=${${_APPNAME_}_ENVIRONMENT_BITRATE} - - CONCURRENCY=${${_APPNAME_}_ENVIRONMENT_CONCURRENCY} - - DOWNLOADMODE=${${_APPNAME_}_ENVIRONMENT_DOWNLOAD_MODE} - - DOWNLOADS=${${_APPNAME_}_ENVIRONMENT_DOWNLOADS} - - FILEPERMISSIONS=${${_APPNAME_}_ENVIRONMENT_FILE_PERMISSIONS} - - FOLDERPERMISSIONS=${${_APPNAME_}_ENVIRONMENT_FOLDER_PERMISSIONS} - - FORMAT=${${_APPNAME_}_ENVIRONMENT_FORMAT} - - LIDARRAPIKEY=${${_APPNAME_}_ENVIRONMENT_LIDARR_API_KEY} - - LIDARRURL=${${_APPNAME_}_ENVIRONMENT_LIDARR_URL} - - LIST=${${_APPNAME_}_ENVIRONMENT_LIST} - - MATCHDISTANCE=${${_APPNAME_}_ENVIRONMENT_MATCH_DISTANCE} - - MBRAINZMIRROR=${${_APPNAME_}_ENVIRONMENT_MBRAINZMIRROR} - - MBRATELIMIT=${${_APPNAME_}_ENVIRONMENT_MBRATELIMIT} + - ARL_TOKEN=${_ENVIRONMENT_ARL_TOKEN} + - AUTOSTART=${_ENVIRONMENT_AUTOSTART} + - BITRATE=${_ENVIRONMENT_BITRATE} + - CONCURRENCY=${_ENVIRONMENT_CONCURRENCY} + - DOWNLOADMODE=${_ENVIRONMENT_DOWNLOAD_MODE} + - DOWNLOADS=${_ENVIRONMENT_DOWNLOADS} + - FILEPERMISSIONS=${_ENVIRONMENT_FILE_PERMISSIONS} + - FOLDERPERMISSIONS=${_ENVIRONMENT_FOLDER_PERMISSIONS} + - FORMAT=${_ENVIRONMENT_FORMAT} + - LIDARRAPIKEY=${_ENVIRONMENT_LIDARR_API_KEY} + - LIDARRURL=${_ENVIRONMENT_LIDARR_URL} + - LIST=${_ENVIRONMENT_LIST} + - MATCHDISTANCE=${_ENVIRONMENT_MATCH_DISTANCE} + - MBRAINZMIRROR=${_ENVIRONMENT_MBRAINZMIRROR} + - MBRATELIMIT=${_ENVIRONMENT_MBRATELIMIT} - PGID=${PGID} - PUID=${PUID} - - REPLAYGAIN=${${_APPNAME_}_ENVIRONMENT_REPLAY_AGAIN} - - REQUIREQUALITY=${${_APPNAME_}_ENVIRONMENT_REQUIRED_QUALITY} - - SCRIPTINTERVAL=${${_APPNAME_}_ENVIRONMENT_SCRIPT_INTERVAL} - - SEARCHTYPE=${${_APPNAME_}_ENVIRONMENT_SEARCH_TYPE} + - REPLAYGAIN=${_ENVIRONMENT_REPLAY_AGAIN} + - REQUIREQUALITY=${_ENVIRONMENT_REQUIRED_QUALITY} + - SCRIPTINTERVAL=${_ENVIRONMENT_SCRIPT_INTERVAL} + - SEARCHTYPE=${_ENVIRONMENT_SEARCH_TYPE} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/apcupsd/apcupsd.hostname.yml b/compose/.apps/apcupsd/apcupsd.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/apcupsd/apcupsd.hostname.yml +++ b/compose/.apps/apcupsd/apcupsd.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/apcupsd/apcupsd.labels.yml b/compose/.apps/apcupsd/apcupsd.labels.yml index 33324076f7..07c9843e06 100644 --- a/compose/.apps/apcupsd/apcupsd.labels.yml +++ b/compose/.apps/apcupsd/apcupsd.labels.yml @@ -1,19 +1,19 @@ services: - ${_appname_}: + : labels: 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.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_debug: "false" - com.dockstarter.appvars.${_appname_}_environment_host: "" - com.dockstarter.appvars.${_appname_}_environment_infuxdb_database: "apcupsd" - com.dockstarter.appvars.${_appname_}_environment_infuxdb_host: "influxdb" - com.dockstarter.appvars.${_appname_}_environment_infuxdb_password: "" - com.dockstarter.appvars.${_appname_}_environment_infuxdb_port: "8086" - com.dockstarter.appvars.${_appname_}_environment_infuxdb_user: "" - com.dockstarter.appvars.${_appname_}_environment_interval: "10" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_debug: "false" + com.dockstarter.appvars._environment_host: "" + com.dockstarter.appvars._environment_infuxdb_database: "apcupsd" + com.dockstarter.appvars._environment_infuxdb_host: "influxdb" + com.dockstarter.appvars._environment_infuxdb_password: "" + com.dockstarter.appvars._environment_infuxdb_port: "8086" + com.dockstarter.appvars._environment_infuxdb_user: "" + com.dockstarter.appvars._environment_interval: "10" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/apcupsd/apcupsd.netmode.yml b/compose/.apps/apcupsd/apcupsd.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/apcupsd/apcupsd.netmode.yml +++ b/compose/.apps/apcupsd/apcupsd.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/apcupsd/apcupsd.x86_64.yml b/compose/.apps/apcupsd/apcupsd.x86_64.yml index 717359fe15..4ea20cfa16 100644 --- a/compose/.apps/apcupsd/apcupsd.x86_64.yml +++ b/compose/.apps/apcupsd/apcupsd.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: atribe/apcupsd-influxdb-exporter:${${_APPNAME_}_TAG} + : + image: atribe/apcupsd-influxdb-exporter:${_TAG} diff --git a/compose/.apps/apcupsd/apcupsd.yml b/compose/.apps/apcupsd/apcupsd.yml index 7ecb16c8eb..dc9e1c6075 100644 --- a/compose/.apps/apcupsd/apcupsd.yml +++ b/compose/.apps/apcupsd/apcupsd.yml @@ -1,20 +1,20 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - APCUPSD_HOST=${${_APPNAME_}_ENVIRONMENT_HOST} - - INFLUXDB_HOST=${${_APPNAME_}_ENVIRONMENT_INFLUXDB_HOST} - - INFLUXDB_DATABASE=${${_APPNAME_}_ENVIRONMENT_INFLUXDB_DATABASE} - - INFLUXDB_PASSWORD=${${_APPNAME_}_ENVIRONMENT_INFLUXDB_PASSWORD} - - INFLUXDB_PORT=${${_APPNAME_}_ENVIRONMENT_INFLUXDB_PORT} - - INFLUXDB_USER=${${_APPNAME_}_ENVIRONMENT_INFLUXDB_USER} - - INTERVAL=${${_APPNAME_}_ENVIRONMENT_INTERVAL} + - APCUPSD_HOST=${_ENVIRONMENT_HOST} + - INFLUXDB_HOST=${_ENVIRONMENT_INFLUXDB_HOST} + - INFLUXDB_DATABASE=${_ENVIRONMENT_INFLUXDB_DATABASE} + - INFLUXDB_PASSWORD=${_ENVIRONMENT_INFLUXDB_PASSWORD} + - INFLUXDB_PORT=${_ENVIRONMENT_INFLUXDB_PORT} + - INFLUXDB_USER=${_ENVIRONMENT_INFLUXDB_USER} + - INTERVAL=${_ENVIRONMENT_INTERVAL} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - VERBOSE=${${_APPNAME_}_ENVIRONMENT_DEBUG} - restart: ${${_APPNAME_}_RESTART} + - VERBOSE=${_ENVIRONMENT_DEBUG} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/apprise/apprise.aarch64.yml b/compose/.apps/apprise/apprise.aarch64.yml index a87ecbd8ca..16d5136f07 100644 --- a/compose/.apps/apprise/apprise.aarch64.yml +++ b/compose/.apps/apprise/apprise.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/apprise-api:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/apprise-api:${_TAG} diff --git a/compose/.apps/apprise/apprise.hostname.yml b/compose/.apps/apprise/apprise.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/apprise/apprise.hostname.yml +++ b/compose/.apps/apprise/apprise.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/apprise/apprise.labels.yml b/compose/.apps/apprise/apprise.labels.yml index 625017ff9b..fd86c70228 100644 --- a/compose/.apps/apprise/apprise.labels.yml +++ b/compose/.apps/apprise/apprise.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: 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.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8000: "8000" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8000: "8000" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/apprise/apprise.netmode.yml b/compose/.apps/apprise/apprise.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/apprise/apprise.netmode.yml +++ b/compose/.apps/apprise/apprise.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/apprise/apprise.ports.yml b/compose/.apps/apprise/apprise.ports.yml index 33070f8cee..384ad2ee98 100644 --- a/compose/.apps/apprise/apprise.ports.yml +++ b/compose/.apps/apprise/apprise.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8000}:8000 + - ${_PORT_8000}:8000 diff --git a/compose/.apps/apprise/apprise.x86_64.yml b/compose/.apps/apprise/apprise.x86_64.yml index a87ecbd8ca..16d5136f07 100644 --- a/compose/.apps/apprise/apprise.x86_64.yml +++ b/compose/.apps/apprise/apprise.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/apprise-api:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/apprise-api:${_TAG} diff --git a/compose/.apps/apprise/apprise.yml b/compose/.apps/apprise/apprise.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/apprise/apprise.yml +++ b/compose/.apps/apprise/apprise.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/audiobookshelf/audiobookshelf.aarch64.yml b/compose/.apps/audiobookshelf/audiobookshelf.aarch64.yml index 97aef06d1b..4d1b5463f8 100644 --- a/compose/.apps/audiobookshelf/audiobookshelf.aarch64.yml +++ b/compose/.apps/audiobookshelf/audiobookshelf.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/advplyr/audiobookshelf:${${_APPNAME_}_TAG} + : + image: ghcr.io/advplyr/audiobookshelf:${_TAG} diff --git a/compose/.apps/audiobookshelf/audiobookshelf.hostname.yml b/compose/.apps/audiobookshelf/audiobookshelf.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/audiobookshelf/audiobookshelf.hostname.yml +++ b/compose/.apps/audiobookshelf/audiobookshelf.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/audiobookshelf/audiobookshelf.labels.yml b/compose/.apps/audiobookshelf/audiobookshelf.labels.yml index eaa0db84e4..ba271791bd 100644 --- a/compose/.apps/audiobookshelf/audiobookshelf.labels.yml +++ b/compose/.apps/audiobookshelf/audiobookshelf.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Self-hosted audiobook and podcast server" com.dockstarter.appinfo.nicename: "audiobookshelf" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_80: "13378" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_80: "13378" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/audiobookshelf/audiobookshelf.netmode.yml b/compose/.apps/audiobookshelf/audiobookshelf.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/audiobookshelf/audiobookshelf.netmode.yml +++ b/compose/.apps/audiobookshelf/audiobookshelf.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/audiobookshelf/audiobookshelf.ports.yml b/compose/.apps/audiobookshelf/audiobookshelf.ports.yml index c37afbebb5..32f14e45fb 100644 --- a/compose/.apps/audiobookshelf/audiobookshelf.ports.yml +++ b/compose/.apps/audiobookshelf/audiobookshelf.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_80}:80 diff --git a/compose/.apps/audiobookshelf/audiobookshelf.x86_64.yml b/compose/.apps/audiobookshelf/audiobookshelf.x86_64.yml index 97aef06d1b..4d1b5463f8 100644 --- a/compose/.apps/audiobookshelf/audiobookshelf.x86_64.yml +++ b/compose/.apps/audiobookshelf/audiobookshelf.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/advplyr/audiobookshelf:${${_APPNAME_}_TAG} + : + image: ghcr.io/advplyr/audiobookshelf:${_TAG} diff --git a/compose/.apps/audiobookshelf/audiobookshelf.yml b/compose/.apps/audiobookshelf/audiobookshelf.yml index d740f24747..636e7fbb16 100644 --- a/compose/.apps/audiobookshelf/audiobookshelf.yml +++ b/compose/.apps/audiobookshelf/audiobookshelf.yml @@ -1,16 +1,16 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - CONFIG_PATH=/config - HOME=/config/.home - LOG_LEVEL=info - METADATA_PATH=/metadata - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} user: ${PUID}:${PGID} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/.metadata:/metadata + - ${DOCKER_VOLUME_CONFIG}/:/config + - ${DOCKER_VOLUME_CONFIG}//.metadata:/metadata - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/autobrr/autobrr.aarch64.yml b/compose/.apps/autobrr/autobrr.aarch64.yml index 8b0d550578..d350b00505 100644 --- a/compose/.apps/autobrr/autobrr.aarch64.yml +++ b/compose/.apps/autobrr/autobrr.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/autobrr/autobrr:${${_APPNAME_}_TAG} + : + image: ghcr.io/autobrr/autobrr:${_TAG} diff --git a/compose/.apps/autobrr/autobrr.hostname.yml b/compose/.apps/autobrr/autobrr.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/autobrr/autobrr.hostname.yml +++ b/compose/.apps/autobrr/autobrr.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/autobrr/autobrr.labels.yml b/compose/.apps/autobrr/autobrr.labels.yml index 1a126ac862..6f8f48a219 100644 --- a/compose/.apps/autobrr/autobrr.labels.yml +++ b/compose/.apps/autobrr/autobrr.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: 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.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_7474: "7474" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_7474: "7474" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/autobrr/autobrr.netmode.yml b/compose/.apps/autobrr/autobrr.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/autobrr/autobrr.netmode.yml +++ b/compose/.apps/autobrr/autobrr.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/autobrr/autobrr.ports.yml b/compose/.apps/autobrr/autobrr.ports.yml index 32fd3f2364..6280338565 100644 --- a/compose/.apps/autobrr/autobrr.ports.yml +++ b/compose/.apps/autobrr/autobrr.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_7474}:7474 + - ${_PORT_7474}:7474 diff --git a/compose/.apps/autobrr/autobrr.x86_64.yml b/compose/.apps/autobrr/autobrr.x86_64.yml index 8b0d550578..d350b00505 100644 --- a/compose/.apps/autobrr/autobrr.x86_64.yml +++ b/compose/.apps/autobrr/autobrr.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/autobrr/autobrr:${${_APPNAME_}_TAG} + : + image: ghcr.io/autobrr/autobrr:${_TAG} diff --git a/compose/.apps/autobrr/autobrr.yml b/compose/.apps/autobrr/autobrr.yml index aee5c0741b..6c22d19eca 100644 --- a/compose/.apps/autobrr/autobrr.yml +++ b/compose/.apps/autobrr/autobrr.yml @@ -1,11 +1,11 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} user: ${PGID}:${PUID} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/azuracast/azuracast.aarch64.yml b/compose/.apps/azuracast/azuracast.aarch64.yml index bc53045d3b..52686ef623 100644 --- a/compose/.apps/azuracast/azuracast.aarch64.yml +++ b/compose/.apps/azuracast/azuracast.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/azuracast/azuracast:${${_APPNAME_}_TAG} + : + image: ghcr.io/azuracast/azuracast:${_TAG} diff --git a/compose/.apps/azuracast/azuracast.hostname.yml b/compose/.apps/azuracast/azuracast.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/azuracast/azuracast.hostname.yml +++ b/compose/.apps/azuracast/azuracast.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/azuracast/azuracast.labels.yml b/compose/.apps/azuracast/azuracast.labels.yml index c21492e073..b1bea70ea8 100644 --- a/compose/.apps/azuracast/azuracast.labels.yml +++ b/compose/.apps/azuracast/azuracast.labels.yml @@ -1,25 +1,25 @@ services: - ${_appname_}: + : labels: 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.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_application_env: "production" - com.dockstarter.appvars.${_appname_}_environment_enable_redis: "true" - com.dockstarter.appvars.${_appname_}_environment_mysql_database: "azuracast" - com.dockstarter.appvars.${_appname_}_environment_mysql_host: "localhost" - com.dockstarter.appvars.${_appname_}_environment_mysql_password: "azur4c457" - com.dockstarter.appvars.${_appname_}_environment_mysql_port: "3306" - com.dockstarter.appvars.${_appname_}_environment_mysql_user: "azuracast" - com.dockstarter.appvars.${_appname_}_environment_redis_db: "1" - com.dockstarter.appvars.${_appname_}_environment_redis_host: "localhost" - com.dockstarter.appvars.${_appname_}_environment_redis_port: "6379" - com.dockstarter.appvars.${_appname_}_environment_station_port_range: "8000-8100" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_2022: "2022" - com.dockstarter.appvars.${_appname_}_port_443: "443" - com.dockstarter.appvars.${_appname_}_port_80: "80" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_application_env: "production" + com.dockstarter.appvars._environment_enable_redis: "true" + com.dockstarter.appvars._environment_mysql_database: "azuracast" + com.dockstarter.appvars._environment_mysql_host: "localhost" + com.dockstarter.appvars._environment_mysql_password: "azur4c457" + com.dockstarter.appvars._environment_mysql_port: "3306" + com.dockstarter.appvars._environment_mysql_user: "azuracast" + com.dockstarter.appvars._environment_redis_db: "1" + com.dockstarter.appvars._environment_redis_host: "localhost" + com.dockstarter.appvars._environment_redis_port: "6379" + com.dockstarter.appvars._environment_station_port_range: "8000-8100" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_2022: "2022" + com.dockstarter.appvars._port_443: "443" + com.dockstarter.appvars._port_80: "80" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/azuracast/azuracast.netmode.yml b/compose/.apps/azuracast/azuracast.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/azuracast/azuracast.netmode.yml +++ b/compose/.apps/azuracast/azuracast.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/azuracast/azuracast.ports.yml b/compose/.apps/azuracast/azuracast.ports.yml index 19ef0643e3..80694af8c9 100644 --- a/compose/.apps/azuracast/azuracast.ports.yml +++ b/compose/.apps/azuracast/azuracast.ports.yml @@ -1,7 +1,7 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_ENVIRONMENT_STATION_PORT_RANGE}:${${_APPNAME_}_ENVIRONMENT_STATION_PORT_RANGE} - - ${${_APPNAME_}_PORT_2022}:2022 - - ${${_APPNAME_}_PORT_443}:443 - - ${${_APPNAME_}_PORT_80}:80 + - ${_ENVIRONMENT_STATION_PORT_RANGE}:${_ENVIRONMENT_STATION_PORT_RANGE} + - ${_PORT_2022}:2022 + - ${_PORT_443}:443 + - ${_PORT_80}:80 diff --git a/compose/.apps/azuracast/azuracast.x86_64.yml b/compose/.apps/azuracast/azuracast.x86_64.yml index bc53045d3b..52686ef623 100644 --- a/compose/.apps/azuracast/azuracast.x86_64.yml +++ b/compose/.apps/azuracast/azuracast.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/azuracast/azuracast:${${_APPNAME_}_TAG} + : + image: ghcr.io/azuracast/azuracast:${_TAG} diff --git a/compose/.apps/azuracast/azuracast.yml b/compose/.apps/azuracast/azuracast.yml index 48e42c9077..600d52d67d 100644 --- a/compose/.apps/azuracast/azuracast.yml +++ b/compose/.apps/azuracast/azuracast.yml @@ -1,24 +1,24 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - - APPLICATION_ENV=${${_APPNAME_}_ENVIRONMENT_APPLICATION_ENV} - - MYSQL_HOST=${${_APPNAME_}_ENVIRONMENT_MYSQL_HOST} - - MYSQL_PORT=${${_APPNAME_}_ENVIRONMENT_MYSQL_PORT} - - MYSQL_USER=${${_APPNAME_}_ENVIRONMENT_MYSQL_USER} - - MYSQL_PASSWORD=${${_APPNAME_}_ENVIRONMENT_MYSQL_PASSWORD} - - MYSQL_DATABASE=${${_APPNAME_}_ENVIRONMENT_MYSQL_DATABASE} - - ENABLE_REDIS=${${_APPNAME_}_ENVIRONMENT_ENABLE_REDIS} - - REDIS_HOST=${${_APPNAME_}_ENVIRONMENT_REDIS_HOST} - - REDIS_PORT=${${_APPNAME_}_ENVIRONMENT_REDIS_PORT} - - REDIS_DB=${${_APPNAME_}_ENVIRONMENT_REDIS_DB} - restart: ${${_APPNAME_}_RESTART} + - APPLICATION_ENV=${_ENVIRONMENT_APPLICATION_ENV} + - MYSQL_HOST=${_ENVIRONMENT_MYSQL_HOST} + - MYSQL_PORT=${_ENVIRONMENT_MYSQL_PORT} + - MYSQL_USER=${_ENVIRONMENT_MYSQL_USER} + - MYSQL_PASSWORD=${_ENVIRONMENT_MYSQL_PASSWORD} + - MYSQL_DATABASE=${_ENVIRONMENT_MYSQL_DATABASE} + - ENABLE_REDIS=${_ENVIRONMENT_ENABLE_REDIS} + - REDIS_HOST=${_ENVIRONMENT_REDIS_HOST} + - REDIS_PORT=${_ENVIRONMENT_REDIS_PORT} + - REDIS_DB=${_ENVIRONMENT_REDIS_DB} + restart: ${_RESTART} volumes: - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/shoutcast2/:/var/azuracast/servers/shoutcast2 - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/geoip/:/var/azuracast/geoip - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/sftpgo/:/var/azuracast/sftpgo/persist + - ${DOCKER_VOLUME_CONFIG}//shoutcast2/:/var/azuracast/servers/shoutcast2 + - ${DOCKER_VOLUME_CONFIG}//geoip/:/var/azuracast/geoip + - ${DOCKER_VOLUME_CONFIG}//sftpgo/:/var/azuracast/sftpgo/persist - ${DOCKER_VOLUME_STORAGE}/uploads/:/var/azuracast/uploads - ${DOCKER_VOLUME_STORAGE}/backups/:/var/azuracast/backups - ${DOCKER_VOLUME_STORAGE}/stations/:/var/azuracast/stations diff --git a/compose/.apps/bazarr/bazarr.aarch64.yml b/compose/.apps/bazarr/bazarr.aarch64.yml index 142040d529..c21a1e53fa 100644 --- a/compose/.apps/bazarr/bazarr.aarch64.yml +++ b/compose/.apps/bazarr/bazarr.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/bazarr:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/bazarr:${_TAG} diff --git a/compose/.apps/bazarr/bazarr.hostname.yml b/compose/.apps/bazarr/bazarr.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/bazarr/bazarr.hostname.yml +++ b/compose/.apps/bazarr/bazarr.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/bazarr/bazarr.labels.yml b/compose/.apps/bazarr/bazarr.labels.yml index df2c1b3183..ac16f546c7 100644 --- a/compose/.apps/bazarr/bazarr.labels.yml +++ b/compose/.apps/bazarr/bazarr.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: 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.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_6767: "6767" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_6767: "6767" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/bazarr/bazarr.netmode.yml b/compose/.apps/bazarr/bazarr.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/bazarr/bazarr.netmode.yml +++ b/compose/.apps/bazarr/bazarr.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/bazarr/bazarr.ports.yml b/compose/.apps/bazarr/bazarr.ports.yml index c0429a08bc..931cbe1642 100644 --- a/compose/.apps/bazarr/bazarr.ports.yml +++ b/compose/.apps/bazarr/bazarr.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_6767}:6767 + - ${_PORT_6767}:6767 diff --git a/compose/.apps/bazarr/bazarr.x86_64.yml b/compose/.apps/bazarr/bazarr.x86_64.yml index 142040d529..c21a1e53fa 100644 --- a/compose/.apps/bazarr/bazarr.x86_64.yml +++ b/compose/.apps/bazarr/bazarr.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/bazarr:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/bazarr:${_TAG} diff --git a/compose/.apps/bazarr/bazarr.yml b/compose/.apps/bazarr/bazarr.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/bazarr/bazarr.yml +++ b/compose/.apps/bazarr/bazarr.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/beets/beets.aarch64.yml b/compose/.apps/beets/beets.aarch64.yml index e08fbda4a0..4a69a01e91 100644 --- a/compose/.apps/beets/beets.aarch64.yml +++ b/compose/.apps/beets/beets.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/beets:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/beets:${_TAG} diff --git a/compose/.apps/beets/beets.hostname.yml b/compose/.apps/beets/beets.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/beets/beets.hostname.yml +++ b/compose/.apps/beets/beets.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/beets/beets.labels.yml b/compose/.apps/beets/beets.labels.yml index 2b0df7dcfd..efc2f246d6 100644 --- a/compose/.apps/beets/beets.labels.yml +++ b/compose/.apps/beets/beets.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Music library manager and MusicBrainz tagger" com.dockstarter.appinfo.nicename: "Beets" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8337: "8337" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8337: "8337" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/beets/beets.netmode.yml b/compose/.apps/beets/beets.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/beets/beets.netmode.yml +++ b/compose/.apps/beets/beets.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/beets/beets.ports.yml b/compose/.apps/beets/beets.ports.yml index 353a6f870a..fd6df51dc3 100644 --- a/compose/.apps/beets/beets.ports.yml +++ b/compose/.apps/beets/beets.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8337}:8337 + - ${_PORT_8337}:8337 diff --git a/compose/.apps/beets/beets.x86_64.yml b/compose/.apps/beets/beets.x86_64.yml index e08fbda4a0..4a69a01e91 100644 --- a/compose/.apps/beets/beets.x86_64.yml +++ b/compose/.apps/beets/beets.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/beets:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/beets:${_TAG} diff --git a/compose/.apps/beets/beets.yml b/compose/.apps/beets/beets.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/beets/beets.yml +++ b/compose/.apps/beets/beets.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/bitwarden/bitwarden.aarch64.yml b/compose/.apps/bitwarden/bitwarden.aarch64.yml index a022fba687..308b737902 100644 --- a/compose/.apps/bitwarden/bitwarden.aarch64.yml +++ b/compose/.apps/bitwarden/bitwarden.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: vaultwarden/server:${${_APPNAME_}_TAG} + : + image: vaultwarden/server:${_TAG} diff --git a/compose/.apps/bitwarden/bitwarden.hostname.yml b/compose/.apps/bitwarden/bitwarden.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/bitwarden/bitwarden.hostname.yml +++ b/compose/.apps/bitwarden/bitwarden.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/bitwarden/bitwarden.labels.yml b/compose/.apps/bitwarden/bitwarden.labels.yml index 6fbcadfc33..8d06de3bd4 100644 --- a/compose/.apps/bitwarden/bitwarden.labels.yml +++ b/compose/.apps/bitwarden/bitwarden.labels.yml @@ -1,23 +1,23 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Free and open source password management solution" com.dockstarter.appinfo.nicename: "Bitwarden" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_admin_token: "" - com.dockstarter.appvars.${_appname_}_environment_database_url: "data/db.sqlite3" - com.dockstarter.appvars.${_appname_}_environment_disable_admin_token: "false" - com.dockstarter.appvars.${_appname_}_environment_domain: "" - com.dockstarter.appvars.${_appname_}_environment_enable_db_wal: "true" - com.dockstarter.appvars.${_appname_}_environment_invitations_allowed: "false" - com.dockstarter.appvars.${_appname_}_environment_show_password_hint: "false" - com.dockstarter.appvars.${_appname_}_environment_signups_allowed: "false" - com.dockstarter.appvars.${_appname_}_environment_signups_verify: "false" - com.dockstarter.appvars.${_appname_}_environment_websocket_enable: "true" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_3012: "3012" - com.dockstarter.appvars.${_appname_}_port_80: "8013" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_admin_token: "" + com.dockstarter.appvars._environment_database_url: "data/db.sqlite3" + com.dockstarter.appvars._environment_disable_admin_token: "false" + com.dockstarter.appvars._environment_domain: "" + com.dockstarter.appvars._environment_enable_db_wal: "true" + com.dockstarter.appvars._environment_invitations_allowed: "false" + com.dockstarter.appvars._environment_show_password_hint: "false" + com.dockstarter.appvars._environment_signups_allowed: "false" + com.dockstarter.appvars._environment_signups_verify: "false" + com.dockstarter.appvars._environment_websocket_enable: "true" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_3012: "3012" + com.dockstarter.appvars._port_80: "8013" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/bitwarden/bitwarden.netmode.yml b/compose/.apps/bitwarden/bitwarden.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/bitwarden/bitwarden.netmode.yml +++ b/compose/.apps/bitwarden/bitwarden.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/bitwarden/bitwarden.ports.yml b/compose/.apps/bitwarden/bitwarden.ports.yml index d93ed3e63b..bc8af853fd 100644 --- a/compose/.apps/bitwarden/bitwarden.ports.yml +++ b/compose/.apps/bitwarden/bitwarden.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_3012}:3012 - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_3012}:3012 + - ${_PORT_80}:80 diff --git a/compose/.apps/bitwarden/bitwarden.x86_64.yml b/compose/.apps/bitwarden/bitwarden.x86_64.yml index a022fba687..308b737902 100644 --- a/compose/.apps/bitwarden/bitwarden.x86_64.yml +++ b/compose/.apps/bitwarden/bitwarden.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: vaultwarden/server:${${_APPNAME_}_TAG} + : + image: vaultwarden/server:${_TAG} diff --git a/compose/.apps/bitwarden/bitwarden.yml b/compose/.apps/bitwarden/bitwarden.yml index ff2c02b880..5742ea4bcc 100644 --- a/compose/.apps/bitwarden/bitwarden.yml +++ b/compose/.apps/bitwarden/bitwarden.yml @@ -1,20 +1,20 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - ADMIN_TOKEN=${${_APPNAME_}_ENVIRONMENT_ADMIN_TOKEN} - - DATABASE_URL=${${_APPNAME_}_ENVIRONMENT_DATABASE_URL} - - DISABLE_ADMIN_TOKEN=${${_APPNAME_}_ENVIRONMENT_DISABLE_ADMIN_TOKEN} - - DOMAIN=${${_APPNAME_}_ENVIRONMENT_DOMAIN} - - ENABLE_DB_WAL=${${_APPNAME_}_ENVIRONMENT_ENABLE_DB_WAL} - - INVITATIONS_ALLOWED=${${_APPNAME_}_ENVIRONMENT_INVITATIONS_ALLOWED} - - SHOW_PASSWORD_HINT=${${_APPNAME_}_ENVIRONMENT_SHOW_PASSWORD_HINT} - - SIGNUPS_ALLOWED=${${_APPNAME_}_ENVIRONMENT_SIGNUPS_ALLOWED} - - SIGNUPS_VERIFY=${${_APPNAME_}_ENVIRONMENT_SIGNUPS_VERIFY} + - ADMIN_TOKEN=${_ENVIRONMENT_ADMIN_TOKEN} + - DATABASE_URL=${_ENVIRONMENT_DATABASE_URL} + - DISABLE_ADMIN_TOKEN=${_ENVIRONMENT_DISABLE_ADMIN_TOKEN} + - DOMAIN=${_ENVIRONMENT_DOMAIN} + - ENABLE_DB_WAL=${_ENVIRONMENT_ENABLE_DB_WAL} + - INVITATIONS_ALLOWED=${_ENVIRONMENT_INVITATIONS_ALLOWED} + - SHOW_PASSWORD_HINT=${_ENVIRONMENT_SHOW_PASSWORD_HINT} + - SIGNUPS_ALLOWED=${_ENVIRONMENT_SIGNUPS_ALLOWED} + - SIGNUPS_VERIFY=${_ENVIRONMENT_SIGNUPS_VERIFY} - TZ=${TZ} - - WEBSOCKET_ENABLED=${${_APPNAME_}_ENVIRONMENT_WEBSOCKET_ENABLE} - restart: ${${_APPNAME_}_RESTART} + - WEBSOCKET_ENABLED=${_ENVIRONMENT_WEBSOCKET_ENABLE} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/data + - ${DOCKER_VOLUME_CONFIG}/:/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/booksonic/booksonic.aarch64.yml b/compose/.apps/booksonic/booksonic.aarch64.yml index ba652604ac..df5beef604 100644 --- a/compose/.apps/booksonic/booksonic.aarch64.yml +++ b/compose/.apps/booksonic/booksonic.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/booksonic:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/booksonic:${_TAG} diff --git a/compose/.apps/booksonic/booksonic.hostname.yml b/compose/.apps/booksonic/booksonic.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/booksonic/booksonic.hostname.yml +++ b/compose/.apps/booksonic/booksonic.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/booksonic/booksonic.labels.yml b/compose/.apps/booksonic/booksonic.labels.yml index c8bf5df0ad..173ef7df7d 100644 --- a/compose/.apps/booksonic/booksonic.labels.yml +++ b/compose/.apps/booksonic/booksonic.labels.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) Use BooksonicAir" com.dockstarter.appinfo.nicename: "Booksonic" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_context_path: "/booksonic" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_4040: "4040" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_context_path: "/booksonic" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_4040: "4040" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/booksonic/booksonic.netmode.yml b/compose/.apps/booksonic/booksonic.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/booksonic/booksonic.netmode.yml +++ b/compose/.apps/booksonic/booksonic.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/booksonic/booksonic.ports.yml b/compose/.apps/booksonic/booksonic.ports.yml index b4d795b88b..2cdf3e4cc0 100644 --- a/compose/.apps/booksonic/booksonic.ports.yml +++ b/compose/.apps/booksonic/booksonic.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_4040}:4040 + - ${_PORT_4040}:4040 diff --git a/compose/.apps/booksonic/booksonic.x86_64.yml b/compose/.apps/booksonic/booksonic.x86_64.yml index ba652604ac..df5beef604 100644 --- a/compose/.apps/booksonic/booksonic.x86_64.yml +++ b/compose/.apps/booksonic/booksonic.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/booksonic:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/booksonic:${_TAG} diff --git a/compose/.apps/booksonic/booksonic.yml b/compose/.apps/booksonic/booksonic.yml index 447b2a3d87..843b08b3c5 100644 --- a/compose/.apps/booksonic/booksonic.yml +++ b/compose/.apps/booksonic/booksonic.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - CONTEXT_PATH=${${_APPNAME_}_ENVIRONMENT_CONTEXT_PATH} + - CONTEXT_PATH=${_ENVIRONMENT_CONTEXT_PATH} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/booksonicair/booksonicair.aarch64.yml b/compose/.apps/booksonicair/booksonicair.aarch64.yml index 1ede13d489..d3091a11fe 100644 --- a/compose/.apps/booksonicair/booksonicair.aarch64.yml +++ b/compose/.apps/booksonicair/booksonicair.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/booksonic-air:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/booksonic-air:${_TAG} diff --git a/compose/.apps/booksonicair/booksonicair.hostname.yml b/compose/.apps/booksonicair/booksonicair.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/booksonicair/booksonicair.hostname.yml +++ b/compose/.apps/booksonicair/booksonicair.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/booksonicair/booksonicair.labels.yml b/compose/.apps/booksonicair/booksonicair.labels.yml index bd0cfdbc51..b049c99c9b 100644 --- a/compose/.apps/booksonicair/booksonicair.labels.yml +++ b/compose/.apps/booksonicair/booksonicair.labels.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Web-based streamer for your audiobooks." com.dockstarter.appinfo.nicename: "Booksonicair" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_context_path: "/booksonicair" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_4040: "4040" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_context_path: "/booksonicair" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_4040: "4040" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/booksonicair/booksonicair.netmode.yml b/compose/.apps/booksonicair/booksonicair.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/booksonicair/booksonicair.netmode.yml +++ b/compose/.apps/booksonicair/booksonicair.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/booksonicair/booksonicair.ports.yml b/compose/.apps/booksonicair/booksonicair.ports.yml index b4d795b88b..2cdf3e4cc0 100644 --- a/compose/.apps/booksonicair/booksonicair.ports.yml +++ b/compose/.apps/booksonicair/booksonicair.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_4040}:4040 + - ${_PORT_4040}:4040 diff --git a/compose/.apps/booksonicair/booksonicair.x86_64.yml b/compose/.apps/booksonicair/booksonicair.x86_64.yml index 1ede13d489..d3091a11fe 100644 --- a/compose/.apps/booksonicair/booksonicair.x86_64.yml +++ b/compose/.apps/booksonicair/booksonicair.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/booksonic-air:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/booksonic-air:${_TAG} diff --git a/compose/.apps/booksonicair/booksonicair.yml b/compose/.apps/booksonicair/booksonicair.yml index 447b2a3d87..843b08b3c5 100644 --- a/compose/.apps/booksonicair/booksonicair.yml +++ b/compose/.apps/booksonicair/booksonicair.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - CONTEXT_PATH=${${_APPNAME_}_ENVIRONMENT_CONTEXT_PATH} + - CONTEXT_PATH=${_ENVIRONMENT_CONTEXT_PATH} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/bookstack/bookstack.aarch64.yml b/compose/.apps/bookstack/bookstack.aarch64.yml index c4f5810307..d2bb3a180c 100644 --- a/compose/.apps/bookstack/bookstack.aarch64.yml +++ b/compose/.apps/bookstack/bookstack.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/bookstack:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/bookstack:${_TAG} diff --git a/compose/.apps/bookstack/bookstack.hostname.yml b/compose/.apps/bookstack/bookstack.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/bookstack/bookstack.hostname.yml +++ b/compose/.apps/bookstack/bookstack.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/bookstack/bookstack.labels.yml b/compose/.apps/bookstack/bookstack.labels.yml index 21e7818e44..27a4cab792 100644 --- a/compose/.apps/bookstack/bookstack.labels.yml +++ b/compose/.apps/bookstack/bookstack.labels.yml @@ -1,17 +1,17 @@ services: - ${_appname_}: + : labels: 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.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_app_url: "" - com.dockstarter.appvars.${_appname_}_environment_db_database: "" - com.dockstarter.appvars.${_appname_}_environment_db_host: "" - com.dockstarter.appvars.${_appname_}_environment_db_pass: "" - com.dockstarter.appvars.${_appname_}_environment_db_user: "" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_80: "6875" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_app_url: "" + com.dockstarter.appvars._environment_db_database: "" + com.dockstarter.appvars._environment_db_host: "" + com.dockstarter.appvars._environment_db_pass: "" + com.dockstarter.appvars._environment_db_user: "" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_80: "6875" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/bookstack/bookstack.netmode.yml b/compose/.apps/bookstack/bookstack.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/bookstack/bookstack.netmode.yml +++ b/compose/.apps/bookstack/bookstack.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/bookstack/bookstack.ports.yml b/compose/.apps/bookstack/bookstack.ports.yml index c37afbebb5..32f14e45fb 100644 --- a/compose/.apps/bookstack/bookstack.ports.yml +++ b/compose/.apps/bookstack/bookstack.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_80}:80 diff --git a/compose/.apps/bookstack/bookstack.x86_64.yml b/compose/.apps/bookstack/bookstack.x86_64.yml index c4f5810307..d2bb3a180c 100644 --- a/compose/.apps/bookstack/bookstack.x86_64.yml +++ b/compose/.apps/bookstack/bookstack.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/bookstack:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/bookstack:${_TAG} diff --git a/compose/.apps/bookstack/bookstack.yml b/compose/.apps/bookstack/bookstack.yml index b8add73f8a..7f709a70c7 100644 --- a/compose/.apps/bookstack/bookstack.yml +++ b/compose/.apps/bookstack/bookstack.yml @@ -1,17 +1,17 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - APP_URL=${${_APPNAME_}_ENVIRONMENT_APP_URL} - - DB_DATABASE=${${_APPNAME_}_ENVIRONMENT_DB_DATABASE} - - DB_HOST=${${_APPNAME_}_ENVIRONMENT_DB_HOST} - - DB_PASS=${${_APPNAME_}_ENVIRONMENT_DB_PASS} - - DB_USER=${${_APPNAME_}_ENVIRONMENT_DB_USER} + - APP_URL=${_ENVIRONMENT_APP_URL} + - DB_DATABASE=${_ENVIRONMENT_DB_DATABASE} + - DB_HOST=${_ENVIRONMENT_DB_HOST} + - DB_PASS=${_ENVIRONMENT_DB_PASS} + - DB_USER=${_ENVIRONMENT_DB_USER} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/calibre/calibre.aarch64.yml b/compose/.apps/calibre/calibre.aarch64.yml index 8c76a35f11..0858f4bfe6 100644 --- a/compose/.apps/calibre/calibre.aarch64.yml +++ b/compose/.apps/calibre/calibre.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/calibre:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/calibre:${_TAG} diff --git a/compose/.apps/calibre/calibre.hostname.yml b/compose/.apps/calibre/calibre.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/calibre/calibre.hostname.yml +++ b/compose/.apps/calibre/calibre.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/calibre/calibre.labels.yml b/compose/.apps/calibre/calibre.labels.yml index 93c8d2739f..6cdd2df194 100644 --- a/compose/.apps/calibre/calibre.labels.yml +++ b/compose/.apps/calibre/calibre.labels.yml @@ -1,17 +1,17 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Easy to use e-book manager" com.dockstarter.appinfo.nicename: "Calibre" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_cli_args: "" - com.dockstarter.appvars.${_appname_}_environment_guac_pass: "" - com.dockstarter.appvars.${_appname_}_environment_guac_user: "" - com.dockstarter.appvars.${_appname_}_environment_use_dark_palette: "1" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8080: "8080" - com.dockstarter.appvars.${_appname_}_port_8081: "8081" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_cli_args: "" + com.dockstarter.appvars._environment_guac_pass: "" + com.dockstarter.appvars._environment_guac_user: "" + com.dockstarter.appvars._environment_use_dark_palette: "1" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8080: "8080" + com.dockstarter.appvars._port_8081: "8081" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/calibre/calibre.netmode.yml b/compose/.apps/calibre/calibre.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/calibre/calibre.netmode.yml +++ b/compose/.apps/calibre/calibre.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/calibre/calibre.ports.yml b/compose/.apps/calibre/calibre.ports.yml index 749d35bc5c..f8982c0ec6 100644 --- a/compose/.apps/calibre/calibre.ports.yml +++ b/compose/.apps/calibre/calibre.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8080}:8080 - - ${${_APPNAME_}_PORT_8081}:8081 + - ${_PORT_8080}:8080 + - ${_PORT_8081}:8081 diff --git a/compose/.apps/calibre/calibre.x86_64.yml b/compose/.apps/calibre/calibre.x86_64.yml index 8c76a35f11..0858f4bfe6 100644 --- a/compose/.apps/calibre/calibre.x86_64.yml +++ b/compose/.apps/calibre/calibre.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/calibre:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/calibre:${_TAG} diff --git a/compose/.apps/calibre/calibre.yml b/compose/.apps/calibre/calibre.yml index 258aa1c52c..d1e96d638e 100644 --- a/compose/.apps/calibre/calibre.yml +++ b/compose/.apps/calibre/calibre.yml @@ -1,18 +1,18 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - CALIBRE_USE_DARK_PALETTE=${${_APPNAME_}_ENVIRONMENT_USE_DARK_PALETTE} - - CLI_ARGS=${${_APPNAME_}_ENVIRONMENT_CLI_ARGS} - - GUAC_PASS=${${_APPNAME_}_ENVIRONMENT_GUAC_PASS} - - GUAC_USER=${${_APPNAME_}_ENVIRONMENT_GUAC_USER} + - CALIBRE_USE_DARK_PALETTE=${_ENVIRONMENT_USE_DARK_PALETTE} + - CLI_ARGS=${_ENVIRONMENT_CLI_ARGS} + - GUAC_PASS=${_ENVIRONMENT_GUAC_PASS} + - GUAC_USER=${_ENVIRONMENT_GUAC_USER} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} security_opt: - seccomp:unconfined volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/calibreweb/calibreweb.aarch64.yml b/compose/.apps/calibreweb/calibreweb.aarch64.yml index 43ed5d659c..2c2509f274 100644 --- a/compose/.apps/calibreweb/calibreweb.aarch64.yml +++ b/compose/.apps/calibreweb/calibreweb.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/calibre-web:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/calibre-web:${_TAG} diff --git a/compose/.apps/calibreweb/calibreweb.hostname.yml b/compose/.apps/calibreweb/calibreweb.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/calibreweb/calibreweb.hostname.yml +++ b/compose/.apps/calibreweb/calibreweb.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/calibreweb/calibreweb.labels.yml b/compose/.apps/calibreweb/calibreweb.labels.yml index 16ed98cc47..adedc2b1de 100644 --- a/compose/.apps/calibreweb/calibreweb.labels.yml +++ b/compose/.apps/calibreweb/calibreweb.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: 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.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8083: "8083" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8083: "8083" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/calibreweb/calibreweb.netmode.yml b/compose/.apps/calibreweb/calibreweb.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/calibreweb/calibreweb.netmode.yml +++ b/compose/.apps/calibreweb/calibreweb.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/calibreweb/calibreweb.ports.yml b/compose/.apps/calibreweb/calibreweb.ports.yml index 1517ed1028..37f5e60393 100644 --- a/compose/.apps/calibreweb/calibreweb.ports.yml +++ b/compose/.apps/calibreweb/calibreweb.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8083}:8083 + - ${_PORT_8083}:8083 diff --git a/compose/.apps/calibreweb/calibreweb.x86_64.yml b/compose/.apps/calibreweb/calibreweb.x86_64.yml index 43ed5d659c..2c2509f274 100644 --- a/compose/.apps/calibreweb/calibreweb.x86_64.yml +++ b/compose/.apps/calibreweb/calibreweb.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/calibre-web:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/calibre-web:${_TAG} diff --git a/compose/.apps/calibreweb/calibreweb.yml b/compose/.apps/calibreweb/calibreweb.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/calibreweb/calibreweb.yml +++ b/compose/.apps/calibreweb/calibreweb.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/cloudcmd/cloudcmd.hostname.yml b/compose/.apps/cloudcmd/cloudcmd.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/cloudcmd/cloudcmd.hostname.yml +++ b/compose/.apps/cloudcmd/cloudcmd.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/cloudcmd/cloudcmd.labels.yml b/compose/.apps/cloudcmd/cloudcmd.labels.yml index 2032c67acd..4215d37400 100644 --- a/compose/.apps/cloudcmd/cloudcmd.labels.yml +++ b/compose/.apps/cloudcmd/cloudcmd.labels.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: + : labels: 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.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8000: "8000" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_fsdir: "/mnt/cloudcmd" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8000: "8000" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_fsdir: "/mnt/cloudcmd" diff --git a/compose/.apps/cloudcmd/cloudcmd.netmode.yml b/compose/.apps/cloudcmd/cloudcmd.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/cloudcmd/cloudcmd.netmode.yml +++ b/compose/.apps/cloudcmd/cloudcmd.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/cloudcmd/cloudcmd.ports.yml b/compose/.apps/cloudcmd/cloudcmd.ports.yml index 33070f8cee..384ad2ee98 100644 --- a/compose/.apps/cloudcmd/cloudcmd.ports.yml +++ b/compose/.apps/cloudcmd/cloudcmd.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8000}:8000 + - ${_PORT_8000}:8000 diff --git a/compose/.apps/cloudcmd/cloudcmd.x86_64.yml b/compose/.apps/cloudcmd/cloudcmd.x86_64.yml index d6c3bc837e..97f0f631cc 100644 --- a/compose/.apps/cloudcmd/cloudcmd.x86_64.yml +++ b/compose/.apps/cloudcmd/cloudcmd.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: coderaiser/cloudcmd:${${_APPNAME_}_TAG} + : + image: coderaiser/cloudcmd:${_TAG} diff --git a/compose/.apps/cloudcmd/cloudcmd.yml b/compose/.apps/cloudcmd/cloudcmd.yml index b2ca3f2aa0..9e6d120050 100644 --- a/compose/.apps/cloudcmd/cloudcmd.yml +++ b/compose/.apps/cloudcmd/cloudcmd.yml @@ -1,11 +1,11 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/root + - ${DOCKER_VOLUME_CONFIG}/:/root - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_FSDIR}:/mnt/fs + - ${_VOLUME_FSDIR}:/mnt/fs diff --git a/compose/.apps/cloudflareddns/cloudflareddns.aarch64.yml b/compose/.apps/cloudflareddns/cloudflareddns.aarch64.yml index 0fcd00b639..812a87d6f3 100644 --- a/compose/.apps/cloudflareddns/cloudflareddns.aarch64.yml +++ b/compose/.apps/cloudflareddns/cloudflareddns.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/hotio/cloudflareddns:${${_APPNAME_}_TAG} + : + image: ghcr.io/hotio/cloudflareddns:${_TAG} diff --git a/compose/.apps/cloudflareddns/cloudflareddns.hostname.yml b/compose/.apps/cloudflareddns/cloudflareddns.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/cloudflareddns/cloudflareddns.hostname.yml +++ b/compose/.apps/cloudflareddns/cloudflareddns.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/cloudflareddns/cloudflareddns.labels.yml b/compose/.apps/cloudflareddns/cloudflareddns.labels.yml index 2a35605b6a..8c0c1b1088 100644 --- a/compose/.apps/cloudflareddns/cloudflareddns.labels.yml +++ b/compose/.apps/cloudflareddns/cloudflareddns.labels.yml @@ -1,20 +1,20 @@ services: - ${_appname_}: + : labels: 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.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_apikey: "" - com.dockstarter.appvars.${_appname_}_environment_apitoken: "" - com.dockstarter.appvars.${_appname_}_environment_args: "" - com.dockstarter.appvars.${_appname_}_environment_detection_mode: "dig-google.com" - com.dockstarter.appvars.${_appname_}_environment_hosts: "" - com.dockstarter.appvars.${_appname_}_environment_interval: "300" - com.dockstarter.appvars.${_appname_}_environment_log_level: "2" - com.dockstarter.appvars.${_appname_}_environment_recordtypes: "A" - com.dockstarter.appvars.${_appname_}_environment_user: "" - com.dockstarter.appvars.${_appname_}_environment_zones: "" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_apikey: "" + com.dockstarter.appvars._environment_apitoken: "" + com.dockstarter.appvars._environment_args: "" + com.dockstarter.appvars._environment_detection_mode: "dig-google.com" + com.dockstarter.appvars._environment_hosts: "" + com.dockstarter.appvars._environment_interval: "300" + com.dockstarter.appvars._environment_log_level: "2" + com.dockstarter.appvars._environment_recordtypes: "A" + com.dockstarter.appvars._environment_user: "" + com.dockstarter.appvars._environment_zones: "" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/cloudflareddns/cloudflareddns.netmode.yml b/compose/.apps/cloudflareddns/cloudflareddns.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/cloudflareddns/cloudflareddns.netmode.yml +++ b/compose/.apps/cloudflareddns/cloudflareddns.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/cloudflareddns/cloudflareddns.x86_64.yml b/compose/.apps/cloudflareddns/cloudflareddns.x86_64.yml index 0fcd00b639..812a87d6f3 100644 --- a/compose/.apps/cloudflareddns/cloudflareddns.x86_64.yml +++ b/compose/.apps/cloudflareddns/cloudflareddns.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/hotio/cloudflareddns:${${_APPNAME_}_TAG} + : + image: ghcr.io/hotio/cloudflareddns:${_TAG} diff --git a/compose/.apps/cloudflareddns/cloudflareddns.yml b/compose/.apps/cloudflareddns/cloudflareddns.yml index 066231709c..2e88ddcaf4 100644 --- a/compose/.apps/cloudflareddns/cloudflareddns.yml +++ b/compose/.apps/cloudflareddns/cloudflareddns.yml @@ -1,22 +1,22 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - ARGS=${${_APPNAME_}_ENVIRONMENT_ARGS} - - CF_APIKEY=${${_APPNAME_}_ENVIRONMENT_APIKEY} - - CF_APITOKEN=${${_APPNAME_}_ENVIRONMENT_APITOKEN} - - CF_HOSTS=${${_APPNAME_}_ENVIRONMENT_HOSTS} - - CF_RECORDTYPES=${${_APPNAME_}_ENVIRONMENT_RECORDTYPES} - - CF_USER=${${_APPNAME_}_ENVIRONMENT_USER} - - CF_ZONES=${${_APPNAME_}_ENVIRONMENT_ZONES} - - DETECTION_MODE=${${_APPNAME_}_ENVIRONMENT_DETECTION_MODE} - - INTERVAL=${${_APPNAME_}_ENVIRONMENT_INTERVAL} - - LOG_LEVEL=${${_APPNAME_}_ENVIRONMENT_LOG_LEVEL} + - ARGS=${_ENVIRONMENT_ARGS} + - CF_APIKEY=${_ENVIRONMENT_APIKEY} + - CF_APITOKEN=${_ENVIRONMENT_APITOKEN} + - CF_HOSTS=${_ENVIRONMENT_HOSTS} + - CF_RECORDTYPES=${_ENVIRONMENT_RECORDTYPES} + - CF_USER=${_ENVIRONMENT_USER} + - CF_ZONES=${_ENVIRONMENT_ZONES} + - DETECTION_MODE=${_ENVIRONMENT_DETECTION_MODE} + - INTERVAL=${_ENVIRONMENT_INTERVAL} + - LOG_LEVEL=${_ENVIRONMENT_LOG_LEVEL} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/codeserver/codeserver.aarch64.yml b/compose/.apps/codeserver/codeserver.aarch64.yml index 0195891ae5..32a309e9d9 100644 --- a/compose/.apps/codeserver/codeserver.aarch64.yml +++ b/compose/.apps/codeserver/codeserver.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/code-server:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/code-server:${_TAG} diff --git a/compose/.apps/codeserver/codeserver.hostname.yml b/compose/.apps/codeserver/codeserver.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/codeserver/codeserver.hostname.yml +++ b/compose/.apps/codeserver/codeserver.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/codeserver/codeserver.labels.yml b/compose/.apps/codeserver/codeserver.labels.yml index bd597c4b00..07161b67b4 100644 --- a/compose/.apps/codeserver/codeserver.labels.yml +++ b/compose/.apps/codeserver/codeserver.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: 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.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_password: "" - com.dockstarter.appvars.${_appname_}_environment_sudo_password: "" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8443: "8443" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_password: "" + com.dockstarter.appvars._environment_sudo_password: "" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8443: "8443" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/codeserver/codeserver.netmode.yml b/compose/.apps/codeserver/codeserver.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/codeserver/codeserver.netmode.yml +++ b/compose/.apps/codeserver/codeserver.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/codeserver/codeserver.ports.yml b/compose/.apps/codeserver/codeserver.ports.yml index 2c5eae0965..0196c9ba54 100644 --- a/compose/.apps/codeserver/codeserver.ports.yml +++ b/compose/.apps/codeserver/codeserver.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8443}:8443 + - ${_PORT_8443}:8443 diff --git a/compose/.apps/codeserver/codeserver.x86_64.yml b/compose/.apps/codeserver/codeserver.x86_64.yml index 0195891ae5..32a309e9d9 100644 --- a/compose/.apps/codeserver/codeserver.x86_64.yml +++ b/compose/.apps/codeserver/codeserver.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/code-server:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/code-server:${_TAG} diff --git a/compose/.apps/codeserver/codeserver.yml b/compose/.apps/codeserver/codeserver.yml index 0daec46f1a..d89c99824b 100644 --- a/compose/.apps/codeserver/codeserver.yml +++ b/compose/.apps/codeserver/codeserver.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - PASSWORD=${${_APPNAME_}_ENVIRONMENT_PASSWORD} + - PASSWORD=${_ENVIRONMENT_PASSWORD} - PGID=${PGID} - PUID=${PUID} - - SUDO_PASSWORD=${${_APPNAME_}_ENVIRONMENT_SUDO_PASSWORD} + - SUDO_PASSWORD=${_ENVIRONMENT_SUDO_PASSWORD} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/couchpotato/couchpotato.aarch64.yml b/compose/.apps/couchpotato/couchpotato.aarch64.yml index 5fcb384898..5f5417fc22 100644 --- a/compose/.apps/couchpotato/couchpotato.aarch64.yml +++ b/compose/.apps/couchpotato/couchpotato.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/couchpotato:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/couchpotato:${_TAG} diff --git a/compose/.apps/couchpotato/couchpotato.hostname.yml b/compose/.apps/couchpotato/couchpotato.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/couchpotato/couchpotato.hostname.yml +++ b/compose/.apps/couchpotato/couchpotato.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/couchpotato/couchpotato.labels.yml b/compose/.apps/couchpotato/couchpotato.labels.yml index 60dc6dd7fd..177b00be95 100644 --- a/compose/.apps/couchpotato/couchpotato.labels.yml +++ b/compose/.apps/couchpotato/couchpotato.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) Use Radarr" com.dockstarter.appinfo.nicename: "CouchPotato" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_5050: "5050" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_5050: "5050" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/couchpotato/couchpotato.netmode.yml b/compose/.apps/couchpotato/couchpotato.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/couchpotato/couchpotato.netmode.yml +++ b/compose/.apps/couchpotato/couchpotato.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/couchpotato/couchpotato.ports.yml b/compose/.apps/couchpotato/couchpotato.ports.yml index f1b78a6ace..f2fdd29210 100644 --- a/compose/.apps/couchpotato/couchpotato.ports.yml +++ b/compose/.apps/couchpotato/couchpotato.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_5050}:5050 + - ${_PORT_5050}:5050 diff --git a/compose/.apps/couchpotato/couchpotato.x86_64.yml b/compose/.apps/couchpotato/couchpotato.x86_64.yml index 5fcb384898..5f5417fc22 100644 --- a/compose/.apps/couchpotato/couchpotato.x86_64.yml +++ b/compose/.apps/couchpotato/couchpotato.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/couchpotato:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/couchpotato:${_TAG} diff --git a/compose/.apps/couchpotato/couchpotato.yml b/compose/.apps/couchpotato/couchpotato.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/couchpotato/couchpotato.yml +++ b/compose/.apps/couchpotato/couchpotato.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/dasshio/dasshio.aarch64.yml b/compose/.apps/dasshio/dasshio.aarch64.yml index 83e2cd0300..c7476b16c1 100644 --- a/compose/.apps/dasshio/dasshio.aarch64.yml +++ b/compose/.apps/dasshio/dasshio.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: danimtb/aarch64-dasshio:${${_APPNAME_}_TAG} + : + image: danimtb/aarch64-dasshio:${_TAG} diff --git a/compose/.apps/dasshio/dasshio.hostname.yml b/compose/.apps/dasshio/dasshio.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/dasshio/dasshio.hostname.yml +++ b/compose/.apps/dasshio/dasshio.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/dasshio/dasshio.labels.yml b/compose/.apps/dasshio/dasshio.labels.yml index 857f4b31a0..1f0894751e 100644 --- a/compose/.apps/dasshio/dasshio.labels.yml +++ b/compose/.apps/dasshio/dasshio.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: 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.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_homeassistant_auth_token: "" - com.dockstarter.appvars.${_appname_}_environment_homeassistant_url: "" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_6565: "6565" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_homeassistant_auth_token: "" + com.dockstarter.appvars._environment_homeassistant_url: "" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_6565: "6565" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/dasshio/dasshio.netmode.yml b/compose/.apps/dasshio/dasshio.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/dasshio/dasshio.netmode.yml +++ b/compose/.apps/dasshio/dasshio.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/dasshio/dasshio.ports.yml b/compose/.apps/dasshio/dasshio.ports.yml index ae1c403f15..a621843de0 100644 --- a/compose/.apps/dasshio/dasshio.ports.yml +++ b/compose/.apps/dasshio/dasshio.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_6565}:6565 + - ${_PORT_6565}:6565 diff --git a/compose/.apps/dasshio/dasshio.x86_64.yml b/compose/.apps/dasshio/dasshio.x86_64.yml index 08c9dce2a9..ba5748b3af 100644 --- a/compose/.apps/dasshio/dasshio.x86_64.yml +++ b/compose/.apps/dasshio/dasshio.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: danimtb/amd64-dasshio:${${_APPNAME_}_TAG} + : + image: danimtb/amd64-dasshio:${_TAG} diff --git a/compose/.apps/dasshio/dasshio.yml b/compose/.apps/dasshio/dasshio.yml index 3bc5709ca6..7b92c66867 100644 --- a/compose/.apps/dasshio/dasshio.yml +++ b/compose/.apps/dasshio/dasshio.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - HA_BASE_URL=${${_APPNAME_}_ENVIRONMENT_HOMEASSISTANT_URL} - - HASSIO_TOKEN=${${_APPNAME_}_ENVIRONMENT_HOMEASSISTANT_AUTH_TOKEN} + - HA_BASE_URL=${_ENVIRONMENT_HOMEASSISTANT_URL} + - HASSIO_TOKEN=${_ENVIRONMENT_HOMEASSISTANT_AUTH_TOKEN} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/data + - ${DOCKER_VOLUME_CONFIG}/:/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/ddclient/ddclient.aarch64.yml b/compose/.apps/ddclient/ddclient.aarch64.yml index a4afafeaa2..45750a5daf 100644 --- a/compose/.apps/ddclient/ddclient.aarch64.yml +++ b/compose/.apps/ddclient/ddclient.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/ddclient:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/ddclient:${_TAG} diff --git a/compose/.apps/ddclient/ddclient.hostname.yml b/compose/.apps/ddclient/ddclient.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/ddclient/ddclient.hostname.yml +++ b/compose/.apps/ddclient/ddclient.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/ddclient/ddclient.labels.yml b/compose/.apps/ddclient/ddclient.labels.yml index b224bc5ec9..6496146bde 100644 --- a/compose/.apps/ddclient/ddclient.labels.yml +++ b/compose/.apps/ddclient/ddclient.labels.yml @@ -1,11 +1,11 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Update dynamic DNS entries" com.dockstarter.appinfo.nicename: "DDClient" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/ddclient/ddclient.netmode.yml b/compose/.apps/ddclient/ddclient.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/ddclient/ddclient.netmode.yml +++ b/compose/.apps/ddclient/ddclient.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/ddclient/ddclient.x86_64.yml b/compose/.apps/ddclient/ddclient.x86_64.yml index a4afafeaa2..45750a5daf 100644 --- a/compose/.apps/ddclient/ddclient.x86_64.yml +++ b/compose/.apps/ddclient/ddclient.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/ddclient:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/ddclient:${_TAG} diff --git a/compose/.apps/ddclient/ddclient.yml b/compose/.apps/ddclient/ddclient.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/ddclient/ddclient.yml +++ b/compose/.apps/ddclient/ddclient.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/deemix/deemix.aarch64.yml b/compose/.apps/deemix/deemix.aarch64.yml index dc66b220c8..efb8af4913 100644 --- a/compose/.apps/deemix/deemix.aarch64.yml +++ b/compose/.apps/deemix/deemix.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: registry.gitlab.com/bockiii/deemix-docker:${${_APPNAME_}_TAG} + : + image: registry.gitlab.com/bockiii/deemix-docker:${_TAG} diff --git a/compose/.apps/deemix/deemix.hostname.yml b/compose/.apps/deemix/deemix.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/deemix/deemix.hostname.yml +++ b/compose/.apps/deemix/deemix.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/deemix/deemix.labels.yml b/compose/.apps/deemix/deemix.labels.yml index b5689583dd..d5c40031cb 100644 --- a/compose/.apps/deemix/deemix.labels.yml +++ b/compose/.apps/deemix/deemix.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Download music from Deezer via Deemix" com.dockstarter.appinfo.nicename: "Deemix" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_6595: "6595" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_6595: "6595" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/deemix/deemix.netmode.yml b/compose/.apps/deemix/deemix.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/deemix/deemix.netmode.yml +++ b/compose/.apps/deemix/deemix.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/deemix/deemix.ports.yml b/compose/.apps/deemix/deemix.ports.yml index 6f499a0231..d68351a38b 100644 --- a/compose/.apps/deemix/deemix.ports.yml +++ b/compose/.apps/deemix/deemix.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_6595}:6595 + - ${_PORT_6595}:6595 diff --git a/compose/.apps/deemix/deemix.x86_64.yml b/compose/.apps/deemix/deemix.x86_64.yml index dc66b220c8..efb8af4913 100644 --- a/compose/.apps/deemix/deemix.x86_64.yml +++ b/compose/.apps/deemix/deemix.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: registry.gitlab.com/bockiii/deemix-docker:${${_APPNAME_}_TAG} + : + image: registry.gitlab.com/bockiii/deemix-docker:${_TAG} diff --git a/compose/.apps/deemix/deemix.yml b/compose/.apps/deemix/deemix.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/deemix/deemix.yml +++ b/compose/.apps/deemix/deemix.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/deluge/deluge.aarch64.yml b/compose/.apps/deluge/deluge.aarch64.yml index a28ac72ea4..b98063c536 100644 --- a/compose/.apps/deluge/deluge.aarch64.yml +++ b/compose/.apps/deluge/deluge.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/deluge:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/deluge:${_TAG} diff --git a/compose/.apps/deluge/deluge.hostname.yml b/compose/.apps/deluge/deluge.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/deluge/deluge.hostname.yml +++ b/compose/.apps/deluge/deluge.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/deluge/deluge.labels.yml b/compose/.apps/deluge/deluge.labels.yml index f0ff592e63..77fa7044b4 100644 --- a/compose/.apps/deluge/deluge.labels.yml +++ b/compose/.apps/deluge/deluge.labels.yml @@ -1,16 +1,16 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Lightweight, Full-featured BitTorrent client" com.dockstarter.appinfo.nicename: "Deluge" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_51413: "51413" - com.dockstarter.appvars.${_appname_}_port_58846: "58846" - com.dockstarter.appvars.${_appname_}_port_58946: "58946" - com.dockstarter.appvars.${_appname_}_port_6881: "6881" - com.dockstarter.appvars.${_appname_}_port_8112: "8112" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_51413: "51413" + com.dockstarter.appvars._port_58846: "58846" + com.dockstarter.appvars._port_58946: "58946" + com.dockstarter.appvars._port_6881: "6881" + com.dockstarter.appvars._port_8112: "8112" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/deluge/deluge.netmode.yml b/compose/.apps/deluge/deluge.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/deluge/deluge.netmode.yml +++ b/compose/.apps/deluge/deluge.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/deluge/deluge.ports.yml b/compose/.apps/deluge/deluge.ports.yml index 7834b9a2d0..fa8cd06b1f 100644 --- a/compose/.apps/deluge/deluge.ports.yml +++ b/compose/.apps/deluge/deluge.ports.yml @@ -1,10 +1,10 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_51413}:51413 - - ${${_APPNAME_}_PORT_51413}:51413/udp - - ${${_APPNAME_}_PORT_58846}:58846 - - ${${_APPNAME_}_PORT_58946}:58946 - - ${${_APPNAME_}_PORT_6881}:6881 - - ${${_APPNAME_}_PORT_6881}:6881/udp - - ${${_APPNAME_}_PORT_8112}:8112 + - ${_PORT_51413}:51413 + - ${_PORT_51413}:51413/udp + - ${_PORT_58846}:58846 + - ${_PORT_58946}:58946 + - ${_PORT_6881}:6881 + - ${_PORT_6881}:6881/udp + - ${_PORT_8112}:8112 diff --git a/compose/.apps/deluge/deluge.x86_64.yml b/compose/.apps/deluge/deluge.x86_64.yml index a28ac72ea4..b98063c536 100644 --- a/compose/.apps/deluge/deluge.x86_64.yml +++ b/compose/.apps/deluge/deluge.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/deluge:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/deluge:${_TAG} diff --git a/compose/.apps/deluge/deluge.yml b/compose/.apps/deluge/deluge.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/deluge/deluge.yml +++ b/compose/.apps/deluge/deluge.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/delugevpn/delugevpn.aarch64.yml b/compose/.apps/delugevpn/delugevpn.aarch64.yml index 45b93a94f0..a6142f5958 100644 --- a/compose/.apps/delugevpn/delugevpn.aarch64.yml +++ b/compose/.apps/delugevpn/delugevpn.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/binhex/arch-delugevpn:${${_APPNAME_}_TAG} + : + image: ghcr.io/binhex/arch-delugevpn:${_TAG} diff --git a/compose/.apps/delugevpn/delugevpn.hostname.yml b/compose/.apps/delugevpn/delugevpn.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/delugevpn/delugevpn.hostname.yml +++ b/compose/.apps/delugevpn/delugevpn.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/delugevpn/delugevpn.labels.yml b/compose/.apps/delugevpn/delugevpn.labels.yml index 3a292dc661..e38b3e29ed 100644 --- a/compose/.apps/delugevpn/delugevpn.labels.yml +++ b/compose/.apps/delugevpn/delugevpn.labels.yml @@ -1,26 +1,26 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Deluge with PrivoxyVPN" com.dockstarter.appinfo.nicename: "DelugeVPN" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_enable_privoxy: "no" - com.dockstarter.appvars.${_appname_}_environment_lan_network: "192.168.x.x/24" - com.dockstarter.appvars.${_appname_}_environment_name_servers: "1.1.1.1,8.8.8.8" - com.dockstarter.appvars.${_appname_}_environment_vpn_client: "openvpn" - com.dockstarter.appvars.${_appname_}_environment_vpn_enable: "no" - com.dockstarter.appvars.${_appname_}_environment_vpn_input_ports: "" - com.dockstarter.appvars.${_appname_}_environment_vpn_options: "" - com.dockstarter.appvars.${_appname_}_environment_vpn_output_ports: "" - com.dockstarter.appvars.${_appname_}_environment_vpn_pass: "your-vpn-pass" - com.dockstarter.appvars.${_appname_}_environment_vpn_prov: "custom" - com.dockstarter.appvars.${_appname_}_environment_vpn_user: "your-vpn-user" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_58846: "58846" - com.dockstarter.appvars.${_appname_}_port_58946: "58946" - com.dockstarter.appvars.${_appname_}_port_8112: "8112" - com.dockstarter.appvars.${_appname_}_port_8118: "8118" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_enable_privoxy: "no" + com.dockstarter.appvars._environment_lan_network: "192.168.x.x/24" + com.dockstarter.appvars._environment_name_servers: "1.1.1.1,8.8.8.8" + com.dockstarter.appvars._environment_vpn_client: "openvpn" + com.dockstarter.appvars._environment_vpn_enable: "no" + com.dockstarter.appvars._environment_vpn_input_ports: "" + com.dockstarter.appvars._environment_vpn_options: "" + com.dockstarter.appvars._environment_vpn_output_ports: "" + com.dockstarter.appvars._environment_vpn_pass: "your-vpn-pass" + com.dockstarter.appvars._environment_vpn_prov: "custom" + com.dockstarter.appvars._environment_vpn_user: "your-vpn-user" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_58846: "58846" + com.dockstarter.appvars._port_58946: "58946" + com.dockstarter.appvars._port_8112: "8112" + com.dockstarter.appvars._port_8118: "8118" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/delugevpn/delugevpn.netmode.yml b/compose/.apps/delugevpn/delugevpn.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/delugevpn/delugevpn.netmode.yml +++ b/compose/.apps/delugevpn/delugevpn.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/delugevpn/delugevpn.ports.yml b/compose/.apps/delugevpn/delugevpn.ports.yml index e81d6e259b..f4c258d33c 100644 --- a/compose/.apps/delugevpn/delugevpn.ports.yml +++ b/compose/.apps/delugevpn/delugevpn.ports.yml @@ -1,8 +1,8 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_58846}:58846 - - ${${_APPNAME_}_PORT_58946}:58946 - - ${${_APPNAME_}_PORT_6881}:6881 - - ${${_APPNAME_}_PORT_8112}:8112 - - ${${_APPNAME_}_PORT_8118}:8118 + - ${_PORT_58846}:58846 + - ${_PORT_58946}:58946 + - ${_PORT_6881}:6881 + - ${_PORT_8112}:8112 + - ${_PORT_8118}:8118 diff --git a/compose/.apps/delugevpn/delugevpn.x86_64.yml b/compose/.apps/delugevpn/delugevpn.x86_64.yml index 45b93a94f0..a6142f5958 100644 --- a/compose/.apps/delugevpn/delugevpn.x86_64.yml +++ b/compose/.apps/delugevpn/delugevpn.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/binhex/arch-delugevpn:${${_APPNAME_}_TAG} + : + image: ghcr.io/binhex/arch-delugevpn:${_TAG} diff --git a/compose/.apps/delugevpn/delugevpn.yml b/compose/.apps/delugevpn/delugevpn.yml index 7cc77e89ea..9d8cab9ca4 100644 --- a/compose/.apps/delugevpn/delugevpn.yml +++ b/compose/.apps/delugevpn/delugevpn.yml @@ -1,29 +1,29 @@ services: - ${_appname_}: + : cap_add: - NET_ADMIN - SYS_MODULE - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} environment: - - ENABLE_PRIVOXY=${${_APPNAME_}_ENVIRONMENT_ENABLE_PRIVOXY} - - LAN_NETWORK=${${_APPNAME_}_ENVIRONMENT_LAN_NETWORK} - - NAME_SERVERS=${${_APPNAME_}_ENVIRONMENT_NAME_SERVERS} + - ENABLE_PRIVOXY=${_ENVIRONMENT_ENABLE_PRIVOXY} + - LAN_NETWORK=${_ENVIRONMENT_LAN_NETWORK} + - NAME_SERVERS=${_ENVIRONMENT_NAME_SERVERS} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - VPN_CLIENT=${${_APPNAME_}_ENVIRONMENT_VPN_CLIENT} - - VPN_ENABLED=${${_APPNAME_}_ENVIRONMENT_VPN_ENABLE} - - VPN_INPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_VPN_INPUT_PORTS} - - VPN_OPTIONS=${${_APPNAME_}_ENVIRONMENT_VPN_OPTIONS} - - VPN_OUTPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_VPN_OUTPUT_PORTS} - - VPN_PASS=${${_APPNAME_}_ENVIRONMENT_VPN_PASS} - - VPN_PROV=${${_APPNAME_}_ENVIRONMENT_VPN_PROV} - - VPN_USER=${${_APPNAME_}_ENVIRONMENT_VPN_USER} + - VPN_CLIENT=${_ENVIRONMENT_VPN_CLIENT} + - VPN_ENABLED=${_ENVIRONMENT_VPN_ENABLE} + - VPN_INPUT_PORTS=${_ENVIRONMENT_VPN_INPUT_PORTS} + - VPN_OPTIONS=${_ENVIRONMENT_VPN_OPTIONS} + - VPN_OUTPUT_PORTS=${_ENVIRONMENT_VPN_OUTPUT_PORTS} + - VPN_PASS=${_ENVIRONMENT_VPN_PASS} + - VPN_PROV=${_ENVIRONMENT_VPN_PROV} + - VPN_USER=${_ENVIRONMENT_VPN_USER} privileged: true - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} sysctls: - net.ipv4.conf.all.src_valid_mark=1 volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/doplarr/doplarr.aarch64.yml b/compose/.apps/doplarr/doplarr.aarch64.yml index 8921ae982c..a51c8f65f4 100644 --- a/compose/.apps/doplarr/doplarr.aarch64.yml +++ b/compose/.apps/doplarr/doplarr.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/doplarr:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/doplarr:${_TAG} diff --git a/compose/.apps/doplarr/doplarr.hostname.yml b/compose/.apps/doplarr/doplarr.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/doplarr/doplarr.hostname.yml +++ b/compose/.apps/doplarr/doplarr.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/doplarr/doplarr.labels.yml b/compose/.apps/doplarr/doplarr.labels.yml index 1f2fbf739b..a96f54d4aa 100644 --- a/compose/.apps/doplarr/doplarr.labels.yml +++ b/compose/.apps/doplarr/doplarr.labels.yml @@ -1,29 +1,29 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "An *arr request bot for Discord" com.dockstarter.appinfo.nicename: "Doplarr" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_discord__max_results: "25" - com.dockstarter.appvars.${_appname_}_environment_discord__requested_msg_style: ":plain" - com.dockstarter.appvars.${_appname_}_environment_discord__token: "" - com.dockstarter.appvars.${_appname_}_environment_java_opts: "" - com.dockstarter.appvars.${_appname_}_environment_log_level: ":info" - com.dockstarter.appvars.${_appname_}_environment_overseerr__api: "" - com.dockstarter.appvars.${_appname_}_environment_overseerr__default_id: "" - com.dockstarter.appvars.${_appname_}_environment_overseerr__url: "http://overseerr:5055" - com.dockstarter.appvars.${_appname_}_environment_partial_seasons: "true" - com.dockstarter.appvars.${_appname_}_environment_radarr__api: "" - com.dockstarter.appvars.${_appname_}_environment_radarr__quality_profile: "" - com.dockstarter.appvars.${_appname_}_environment_radarr__rootfolder: "" - com.dockstarter.appvars.${_appname_}_environment_radarr__url: "http://radarr:7878" - com.dockstarter.appvars.${_appname_}_environment_sonarr__api: "" - com.dockstarter.appvars.${_appname_}_environment_sonarr__language_profile: "" - com.dockstarter.appvars.${_appname_}_environment_sonarr__quality_profile: "" - com.dockstarter.appvars.${_appname_}_environment_sonarr__rootfolder: "" - com.dockstarter.appvars.${_appname_}_environment_sonarr__url: "http://sonarr:8989" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_discord__max_results: "25" + com.dockstarter.appvars._environment_discord__requested_msg_style: ":plain" + com.dockstarter.appvars._environment_discord__token: "" + com.dockstarter.appvars._environment_java_opts: "" + com.dockstarter.appvars._environment_log_level: ":info" + com.dockstarter.appvars._environment_overseerr__api: "" + com.dockstarter.appvars._environment_overseerr__default_id: "" + com.dockstarter.appvars._environment_overseerr__url: "http://overseerr:5055" + com.dockstarter.appvars._environment_partial_seasons: "true" + com.dockstarter.appvars._environment_radarr__api: "" + com.dockstarter.appvars._environment_radarr__quality_profile: "" + com.dockstarter.appvars._environment_radarr__rootfolder: "" + com.dockstarter.appvars._environment_radarr__url: "http://radarr:7878" + com.dockstarter.appvars._environment_sonarr__api: "" + com.dockstarter.appvars._environment_sonarr__language_profile: "" + com.dockstarter.appvars._environment_sonarr__quality_profile: "" + com.dockstarter.appvars._environment_sonarr__rootfolder: "" + com.dockstarter.appvars._environment_sonarr__url: "http://sonarr:8989" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/doplarr/doplarr.netmode.yml b/compose/.apps/doplarr/doplarr.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/doplarr/doplarr.netmode.yml +++ b/compose/.apps/doplarr/doplarr.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/doplarr/doplarr.x86_64.yml b/compose/.apps/doplarr/doplarr.x86_64.yml index 8921ae982c..a51c8f65f4 100644 --- a/compose/.apps/doplarr/doplarr.x86_64.yml +++ b/compose/.apps/doplarr/doplarr.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/doplarr:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/doplarr:${_TAG} diff --git a/compose/.apps/doplarr/doplarr.yml b/compose/.apps/doplarr/doplarr.yml index 62f62e1883..80068fd410 100644 --- a/compose/.apps/doplarr/doplarr.yml +++ b/compose/.apps/doplarr/doplarr.yml @@ -1,30 +1,30 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - DISCORD__MAX_RESULTS=${${_APPNAME_}_ENVIRONMENT_DISCORD__MAX_RESULTS} - - DISCORD__REQUESTED_MSG_STYLE=${${_APPNAME_}_ENVIRONMENT_DISCORD__REQUESTED_MSG_STYLE} - - DISCORD__TOKEN=${${_APPNAME_}_ENVIRONMENT_DISCORD__TOKEN} - - JAVA_OPTS=${${_APPNAME_}_ENVIRONMENT_JAVA_OPTS} - - LOG_LEVEL=${${_APPNAME_}_ENVIRONMENT_LOG_LEVEL} - - OVERSEERR__API=${${_APPNAME_}_ENVIRONMENT_OVERSEERR__API} - - OVERSEERR__DEFAULT_ID=${${_APPNAME_}_ENVIRONMENT_OVERSEERR__DEFAULT_ID} - - OVERSEERR__URL=${${_APPNAME_}_ENVIRONMENT_OVERSEERR__URL} - - PARTIAL_SEASONS=${${_APPNAME_}_ENVIRONMENT_PARTIAL_SEASONS} + - DISCORD__MAX_RESULTS=${_ENVIRONMENT_DISCORD__MAX_RESULTS} + - DISCORD__REQUESTED_MSG_STYLE=${_ENVIRONMENT_DISCORD__REQUESTED_MSG_STYLE} + - DISCORD__TOKEN=${_ENVIRONMENT_DISCORD__TOKEN} + - JAVA_OPTS=${_ENVIRONMENT_JAVA_OPTS} + - LOG_LEVEL=${_ENVIRONMENT_LOG_LEVEL} + - OVERSEERR__API=${_ENVIRONMENT_OVERSEERR__API} + - OVERSEERR__DEFAULT_ID=${_ENVIRONMENT_OVERSEERR__DEFAULT_ID} + - OVERSEERR__URL=${_ENVIRONMENT_OVERSEERR__URL} + - PARTIAL_SEASONS=${_ENVIRONMENT_PARTIAL_SEASONS} - PGID=${PGID} - PUID=${PUID} - - RADARR__API=${${_APPNAME_}_ENVIRONMENT_RADARR__API} - - RADARR__QUALITY_PROFILE=${${_APPNAME_}_ENVIRONMENT_RADARR__QUALITY_PROFILE} - - RADARR__ROOTFOLDER=${${_APPNAME_}_ENVIRONMENT_RADARR__ROOTFOLDER} - - RADARR__URL=${${_APPNAME_}_ENVIRONMENT_RADARR__URL} - - SONARR__API=${${_APPNAME_}_ENVIRONMENT_SONARR__API} - - SONARR__LANGUAGE_PROFILE=${${_APPNAME_}_ENVIRONMENT_SONARR__LANGUAGE_PROFILE} - - SONARR__QUALITY_PROFILE=${${_APPNAME_}_ENVIRONMENT_SONARR__QUALITY_PROFILE} - - SONARR__ROOTFOLDER=${${_APPNAME_}_ENVIRONMENT_SONARR__ROOTFOLDER} - - SONARR__URL=${${_APPNAME_}_ENVIRONMENT_SONARR__URL} + - RADARR__API=${_ENVIRONMENT_RADARR__API} + - RADARR__QUALITY_PROFILE=${_ENVIRONMENT_RADARR__QUALITY_PROFILE} + - RADARR__ROOTFOLDER=${_ENVIRONMENT_RADARR__ROOTFOLDER} + - RADARR__URL=${_ENVIRONMENT_RADARR__URL} + - SONARR__API=${_ENVIRONMENT_SONARR__API} + - SONARR__LANGUAGE_PROFILE=${_ENVIRONMENT_SONARR__LANGUAGE_PROFILE} + - SONARR__QUALITY_PROFILE=${_ENVIRONMENT_SONARR__QUALITY_PROFILE} + - SONARR__ROOTFOLDER=${_ENVIRONMENT_SONARR__ROOTFOLDER} + - SONARR__URL=${_ENVIRONMENT_SONARR__URL} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/dozzle/dozzle.aarch64.yml b/compose/.apps/dozzle/dozzle.aarch64.yml index feed1eced3..a28d510c5a 100644 --- a/compose/.apps/dozzle/dozzle.aarch64.yml +++ b/compose/.apps/dozzle/dozzle.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: amir20/dozzle:${${_APPNAME_}_TAG} + : + image: amir20/dozzle:${_TAG} diff --git a/compose/.apps/dozzle/dozzle.hostname.yml b/compose/.apps/dozzle/dozzle.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/dozzle/dozzle.hostname.yml +++ b/compose/.apps/dozzle/dozzle.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/dozzle/dozzle.labels.yml b/compose/.apps/dozzle/dozzle.labels.yml index a2f57fb6d7..d72df90998 100644 --- a/compose/.apps/dozzle/dozzle.labels.yml +++ b/compose/.apps/dozzle/dozzle.labels.yml @@ -1,17 +1,17 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Dozzle is a simple, lightweight application that provides you with a web based interface to monitor your Docker container logs live." com.dockstarter.appinfo.nicename: "Dozzle" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_base: "/" - com.dockstarter.appvars.${_appname_}_environment_filter: "" - com.dockstarter.appvars.${_appname_}_environment_level: "info" - com.dockstarter.appvars.${_appname_}_environment_tailsize: "300" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8080: "8080" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_base: "/" + com.dockstarter.appvars._environment_filter: "" + com.dockstarter.appvars._environment_level: "info" + com.dockstarter.appvars._environment_tailsize: "300" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8080: "8080" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/dozzle/dozzle.netmode.yml b/compose/.apps/dozzle/dozzle.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/dozzle/dozzle.netmode.yml +++ b/compose/.apps/dozzle/dozzle.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/dozzle/dozzle.ports.yml b/compose/.apps/dozzle/dozzle.ports.yml index 7d1c7e4455..f19f4867cd 100644 --- a/compose/.apps/dozzle/dozzle.ports.yml +++ b/compose/.apps/dozzle/dozzle.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8080}:8080 + - ${_PORT_8080}:8080 diff --git a/compose/.apps/dozzle/dozzle.x86_64.yml b/compose/.apps/dozzle/dozzle.x86_64.yml index feed1eced3..a28d510c5a 100644 --- a/compose/.apps/dozzle/dozzle.x86_64.yml +++ b/compose/.apps/dozzle/dozzle.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: amir20/dozzle:${${_APPNAME_}_TAG} + : + image: amir20/dozzle:${_TAG} diff --git a/compose/.apps/dozzle/dozzle.yml b/compose/.apps/dozzle/dozzle.yml index 5e34262c78..4cfb302ea0 100644 --- a/compose/.apps/dozzle/dozzle.yml +++ b/compose/.apps/dozzle/dozzle.yml @@ -1,16 +1,16 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - DOZZLE_BASE=${${_APPNAME_}_ENVIRONMENT_BASE} - - DOZZLE_FILTER=${${_APPNAME_}_ENVIRONMENT_FILTER} - - DOZZLE_LEVEL=${${_APPNAME_}_ENVIRONMENT_LEVEL} - - DOZZLE_TAILSIZE=${${_APPNAME_}_ENVIRONMENT_TAILSIZE} + - DOZZLE_BASE=${_ENVIRONMENT_BASE} + - DOZZLE_FILTER=${_ENVIRONMENT_FILTER} + - DOZZLE_LEVEL=${_ENVIRONMENT_LEVEL} + - DOZZLE_TAILSIZE=${_ENVIRONMENT_TAILSIZE} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock + - ${_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock diff --git a/compose/.apps/duckdns/duckdns.aarch64.yml b/compose/.apps/duckdns/duckdns.aarch64.yml index 72852b6cdc..e6a033439a 100644 --- a/compose/.apps/duckdns/duckdns.aarch64.yml +++ b/compose/.apps/duckdns/duckdns.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/duckdns:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/duckdns:${_TAG} diff --git a/compose/.apps/duckdns/duckdns.hostname.yml b/compose/.apps/duckdns/duckdns.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/duckdns/duckdns.hostname.yml +++ b/compose/.apps/duckdns/duckdns.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/duckdns/duckdns.labels.yml b/compose/.apps/duckdns/duckdns.labels.yml index b6ed1c845e..ab74499296 100644 --- a/compose/.apps/duckdns/duckdns.labels.yml +++ b/compose/.apps/duckdns/duckdns.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: 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: "DuckDNS" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_log_file: "true" - com.dockstarter.appvars.${_appname_}_environment_subdomains: "" - com.dockstarter.appvars.${_appname_}_environment_token: "" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_log_file: "true" + com.dockstarter.appvars._environment_subdomains: "" + com.dockstarter.appvars._environment_token: "" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/duckdns/duckdns.netmode.yml b/compose/.apps/duckdns/duckdns.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/duckdns/duckdns.netmode.yml +++ b/compose/.apps/duckdns/duckdns.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/duckdns/duckdns.x86_64.yml b/compose/.apps/duckdns/duckdns.x86_64.yml index 72852b6cdc..e6a033439a 100644 --- a/compose/.apps/duckdns/duckdns.x86_64.yml +++ b/compose/.apps/duckdns/duckdns.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/duckdns:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/duckdns:${_TAG} diff --git a/compose/.apps/duckdns/duckdns.yml b/compose/.apps/duckdns/duckdns.yml index 124f3d432b..dbe9b1f48c 100644 --- a/compose/.apps/duckdns/duckdns.yml +++ b/compose/.apps/duckdns/duckdns.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - LOG_FILE=${${_APPNAME_}_ENVIRONMENT_LOG_FILE} - - SUBDOMAINS=${${_APPNAME_}_ENVIRONMENT_SUBDOMAINS} - - TOKEN=${${_APPNAME_}_ENVIRONMENT_TOKEN} + - LOG_FILE=${_ENVIRONMENT_LOG_FILE} + - SUBDOMAINS=${_ENVIRONMENT_SUBDOMAINS} + - TOKEN=${_ENVIRONMENT_TOKEN} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/duplicacy/duplicacy.aarch64.yml b/compose/.apps/duplicacy/duplicacy.aarch64.yml index d85a613242..de09b12f9c 100644 --- a/compose/.apps/duplicacy/duplicacy.aarch64.yml +++ b/compose/.apps/duplicacy/duplicacy.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/hotio/duplicacy:${${_APPNAME_}_TAG} + : + image: ghcr.io/hotio/duplicacy:${_TAG} diff --git a/compose/.apps/duplicacy/duplicacy.hostname.yml b/compose/.apps/duplicacy/duplicacy.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/duplicacy/duplicacy.hostname.yml +++ b/compose/.apps/duplicacy/duplicacy.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/duplicacy/duplicacy.labels.yml b/compose/.apps/duplicacy/duplicacy.labels.yml index dcb9ac0f78..aa67ac23a4 100644 --- a/compose/.apps/duplicacy/duplicacy.labels.yml +++ b/compose/.apps/duplicacy/duplicacy.labels.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Duplicacy is built on top of a new idea called Lock-Free Deduplication" com.dockstarter.appinfo.nicename: "Duplicacy" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_3875: "3875" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_appdata_dir: "~/.config/appdata" - com.dockstarter.appvars.${_appname_}_volume_backup_dir: "~/backup" - com.dockstarter.appvars.${_appname_}_volume_docker_dir: "~/.docker/" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_3875: "3875" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_appdata_dir: "~/.config/appdata" + com.dockstarter.appvars._volume_backup_dir: "~/backup" + com.dockstarter.appvars._volume_docker_dir: "~/.docker/" diff --git a/compose/.apps/duplicacy/duplicacy.netmode.yml b/compose/.apps/duplicacy/duplicacy.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/duplicacy/duplicacy.netmode.yml +++ b/compose/.apps/duplicacy/duplicacy.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/duplicacy/duplicacy.ports.yml b/compose/.apps/duplicacy/duplicacy.ports.yml index 1e8f88728f..63a2314071 100644 --- a/compose/.apps/duplicacy/duplicacy.ports.yml +++ b/compose/.apps/duplicacy/duplicacy.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_3875}:3875 + - ${_PORT_3875}:3875 diff --git a/compose/.apps/duplicacy/duplicacy.x86_64.yml b/compose/.apps/duplicacy/duplicacy.x86_64.yml index d85a613242..de09b12f9c 100644 --- a/compose/.apps/duplicacy/duplicacy.x86_64.yml +++ b/compose/.apps/duplicacy/duplicacy.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/hotio/duplicacy:${${_APPNAME_}_TAG} + : + image: ghcr.io/hotio/duplicacy:${_TAG} diff --git a/compose/.apps/duplicacy/duplicacy.yml b/compose/.apps/duplicacy/duplicacy.yml index 0f2d2dc76d..0100db05db 100644 --- a/compose/.apps/duplicacy/duplicacy.yml +++ b/compose/.apps/duplicacy/duplicacy.yml @@ -1,17 +1,17 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/cache:/cache - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/config:/config - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/logs:/logs + - ${DOCKER_VOLUME_CONFIG}//cache:/cache + - ${DOCKER_VOLUME_CONFIG}//config:/config + - ${DOCKER_VOLUME_CONFIG}//logs:/logs - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_APPDATA_DIR}:/backuproot/appdata:ro - - ${${_APPNAME_}_VOLUME_BACKUP_DIR}:/backup - - ${${_APPNAME_}_VOLUME_DOCKER_DIR}:/backuproot/docker:ro + - ${_VOLUME_APPDATA_DIR}:/backuproot/appdata:ro + - ${_VOLUME_BACKUP_DIR}:/backup + - ${_VOLUME_DOCKER_DIR}:/backuproot/docker:ro diff --git a/compose/.apps/duplicati/duplicati.aarch64.yml b/compose/.apps/duplicati/duplicati.aarch64.yml index ae73b2cfd4..60bff7f9e4 100644 --- a/compose/.apps/duplicati/duplicati.aarch64.yml +++ b/compose/.apps/duplicati/duplicati.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/duplicati:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/duplicati:${_TAG} diff --git a/compose/.apps/duplicati/duplicati.hostname.yml b/compose/.apps/duplicati/duplicati.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/duplicati/duplicati.hostname.yml +++ b/compose/.apps/duplicati/duplicati.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/duplicati/duplicati.labels.yml b/compose/.apps/duplicati/duplicati.labels.yml index e03f321788..37c9b93a3e 100644 --- a/compose/.apps/duplicati/duplicati.labels.yml +++ b/compose/.apps/duplicati/duplicati.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Backup software to store backups online with strong encryption" com.dockstarter.appinfo.nicename: "Duplicati" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8200: "8200" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_backupsdir: "~/.config/appdata/backups" - com.dockstarter.appvars.${_appname_}_volume_sourcedir: "~/.config/appdata" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8200: "8200" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_backupsdir: "~/.config/appdata/backups" + com.dockstarter.appvars._volume_sourcedir: "~/.config/appdata" diff --git a/compose/.apps/duplicati/duplicati.netmode.yml b/compose/.apps/duplicati/duplicati.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/duplicati/duplicati.netmode.yml +++ b/compose/.apps/duplicati/duplicati.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/duplicati/duplicati.ports.yml b/compose/.apps/duplicati/duplicati.ports.yml index fa94b0a867..cafbd82c2b 100644 --- a/compose/.apps/duplicati/duplicati.ports.yml +++ b/compose/.apps/duplicati/duplicati.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8200}:8200 + - ${_PORT_8200}:8200 diff --git a/compose/.apps/duplicati/duplicati.x86_64.yml b/compose/.apps/duplicati/duplicati.x86_64.yml index ae73b2cfd4..60bff7f9e4 100644 --- a/compose/.apps/duplicati/duplicati.x86_64.yml +++ b/compose/.apps/duplicati/duplicati.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/duplicati:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/duplicati:${_TAG} diff --git a/compose/.apps/duplicati/duplicati.yml b/compose/.apps/duplicati/duplicati.yml index 3559cad3b4..199991e933 100644 --- a/compose/.apps/duplicati/duplicati.yml +++ b/compose/.apps/duplicati/duplicati.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_BACKUPSDIR}:/backups - - ${${_APPNAME_}_VOLUME_SOURCEDIR}:/source + - ${_VOLUME_BACKUPSDIR}:/backups + - ${_VOLUME_SOURCEDIR}:/source diff --git a/compose/.apps/emby/emby.aarch64.yml b/compose/.apps/emby/emby.aarch64.yml index 90124c8525..36440d66e2 100644 --- a/compose/.apps/emby/emby.aarch64.yml +++ b/compose/.apps/emby/emby.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/emby:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/emby:${_TAG} diff --git a/compose/.apps/emby/emby.hostname.yml b/compose/.apps/emby/emby.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/emby/emby.hostname.yml +++ b/compose/.apps/emby/emby.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/emby/emby.labels.yml b/compose/.apps/emby/emby.labels.yml index cebc67d83d..79e3a3e7f4 100644 --- a/compose/.apps/emby/emby.labels.yml +++ b/compose/.apps/emby/emby.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Organize, play, and stream audio and video" com.dockstarter.appinfo.nicename: "Emby" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8096: "8096" - com.dockstarter.appvars.${_appname_}_port_8920: "8920" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_transcodedir: "/tmp/emby_transcode" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8096: "8096" + com.dockstarter.appvars._port_8920: "8920" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_transcodedir: "/tmp/emby_transcode" diff --git a/compose/.apps/emby/emby.netmode.yml b/compose/.apps/emby/emby.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/emby/emby.netmode.yml +++ b/compose/.apps/emby/emby.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/emby/emby.ports.yml b/compose/.apps/emby/emby.ports.yml index aa8fa4bb5b..1b8e696dcd 100644 --- a/compose/.apps/emby/emby.ports.yml +++ b/compose/.apps/emby/emby.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8096}:8096 - - ${${_APPNAME_}_PORT_8920}:8920 + - ${_PORT_8096}:8096 + - ${_PORT_8920}:8920 diff --git a/compose/.apps/emby/emby.x86_64.yml b/compose/.apps/emby/emby.x86_64.yml index 90124c8525..36440d66e2 100644 --- a/compose/.apps/emby/emby.x86_64.yml +++ b/compose/.apps/emby/emby.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/emby:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/emby:${_TAG} diff --git a/compose/.apps/emby/emby.yml b/compose/.apps/emby/emby.yml index 18af6350da..50af244b39 100644 --- a/compose/.apps/emby/emby.yml +++ b/compose/.apps/emby/emby.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_TRANSCODEDIR}:/transcode + - ${_VOLUME_TRANSCODEDIR}:/transcode diff --git a/compose/.apps/fail2ban/fail2ban.aarch64.yml b/compose/.apps/fail2ban/fail2ban.aarch64.yml index 7a0295a8d3..16f99a28e8 100644 --- a/compose/.apps/fail2ban/fail2ban.aarch64.yml +++ b/compose/.apps/fail2ban/fail2ban.aarch64.yml @@ -1,3 +1,3 @@ services: fail2ban: - image: lscr.io/linuxserver/fail2ban:${${_APPNAME_}_TAG} + image: lscr.io/linuxserver/fail2ban:${_TAG} diff --git a/compose/.apps/fail2ban/fail2ban.labels.yml b/compose/.apps/fail2ban/fail2ban.labels.yml index d7655be144..7570eff6d6 100644 --- a/compose/.apps/fail2ban/fail2ban.labels.yml +++ b/compose/.apps/fail2ban/fail2ban.labels.yml @@ -4,8 +4,8 @@ services: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Daemon to ban hosts that cause multiple authentication errors" com.dockstarter.appinfo.nicename: "Fail2ban" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "host" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "host" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/fail2ban/fail2ban.netmode.yml b/compose/.apps/fail2ban/fail2ban.netmode.yml index d5349c9b34..31e401bfe1 100644 --- a/compose/.apps/fail2ban/fail2ban.netmode.yml +++ b/compose/.apps/fail2ban/fail2ban.netmode.yml @@ -1,3 +1,3 @@ services: fail2ban: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/fail2ban/fail2ban.x86_64.yml b/compose/.apps/fail2ban/fail2ban.x86_64.yml index 7a0295a8d3..16f99a28e8 100644 --- a/compose/.apps/fail2ban/fail2ban.x86_64.yml +++ b/compose/.apps/fail2ban/fail2ban.x86_64.yml @@ -1,3 +1,3 @@ services: fail2ban: - image: lscr.io/linuxserver/fail2ban:${${_APPNAME_}_TAG} + image: lscr.io/linuxserver/fail2ban:${_TAG} diff --git a/compose/.apps/fail2ban/fail2ban.yml b/compose/.apps/fail2ban/fail2ban.yml index 903068925b..30a529fb4e 100644 --- a/compose/.apps/fail2ban/fail2ban.yml +++ b/compose/.apps/fail2ban/fail2ban.yml @@ -3,14 +3,14 @@ services: cap_add: - NET_ADMIN - NET_RAW - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - /var/log:/var/log:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/filebot/filebot.hostname.yml b/compose/.apps/filebot/filebot.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/filebot/filebot.hostname.yml +++ b/compose/.apps/filebot/filebot.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/filebot/filebot.labels.yml b/compose/.apps/filebot/filebot.labels.yml index 7c55616a67..a0e03212a7 100644 --- a/compose/.apps/filebot/filebot.labels.yml +++ b/compose/.apps/filebot/filebot.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Tool for organizing your media" com.dockstarter.appinfo.nicename: "FileBot" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_5800: "5800" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_outputdir: "/mnt/filebot/output" - com.dockstarter.appvars.${_appname_}_volume_watchdir: "/mnt/filebot/watch" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_5800: "5800" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_outputdir: "/mnt/filebot/output" + com.dockstarter.appvars._volume_watchdir: "/mnt/filebot/watch" diff --git a/compose/.apps/filebot/filebot.netmode.yml b/compose/.apps/filebot/filebot.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/filebot/filebot.netmode.yml +++ b/compose/.apps/filebot/filebot.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/filebot/filebot.ports.yml b/compose/.apps/filebot/filebot.ports.yml index e628931935..d1f47bfc16 100644 --- a/compose/.apps/filebot/filebot.ports.yml +++ b/compose/.apps/filebot/filebot.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_5800}:5800 + - ${_PORT_5800}:5800 diff --git a/compose/.apps/filebot/filebot.x86_64.yml b/compose/.apps/filebot/filebot.x86_64.yml index e62eb208a2..04e4e4ef36 100644 --- a/compose/.apps/filebot/filebot.x86_64.yml +++ b/compose/.apps/filebot/filebot.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: jlesage/filebot:${${_APPNAME_}_TAG} + : + image: jlesage/filebot:${_TAG} diff --git a/compose/.apps/filebot/filebot.yml b/compose/.apps/filebot/filebot.yml index 3a600e2d5e..0033570eea 100644 --- a/compose/.apps/filebot/filebot.yml +++ b/compose/.apps/filebot/filebot.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - GROUP_ID=${PGID} - TZ=${TZ} - USER_ID=${PUID} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_OUTPUTDIR}:/output - - ${${_APPNAME_}_VOLUME_WATCHDIR}:/watch + - ${_VOLUME_OUTPUTDIR}:/output + - ${_VOLUME_WATCHDIR}:/watch diff --git a/compose/.apps/filebrowser/filebrowser.aarch64.yml b/compose/.apps/filebrowser/filebrowser.aarch64.yml index ae51546af4..740f569b4b 100644 --- a/compose/.apps/filebrowser/filebrowser.aarch64.yml +++ b/compose/.apps/filebrowser/filebrowser.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: filebrowser/filebrowser:${${_APPNAME_}_TAG} + : + image: filebrowser/filebrowser:${_TAG} diff --git a/compose/.apps/filebrowser/filebrowser.hostname.yml b/compose/.apps/filebrowser/filebrowser.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/filebrowser/filebrowser.hostname.yml +++ b/compose/.apps/filebrowser/filebrowser.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/filebrowser/filebrowser.labels.yml b/compose/.apps/filebrowser/filebrowser.labels.yml index d7c283a5cc..8e07e18e89 100644 --- a/compose/.apps/filebrowser/filebrowser.labels.yml +++ b/compose/.apps/filebrowser/filebrowser.labels.yml @@ -1,16 +1,16 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Filebrowser provides a file managing interface within a specified directory" com.dockstarter.appinfo.nicename: "Filebrowser" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_baseurl: "" - com.dockstarter.appvars.${_appname_}_environment_database: "/config/database.db" - com.dockstarter.appvars.${_appname_}_environment_log: "/config/filebrowser.log" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_80: "8080" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_share_dir: "~/.config/appdata/filebrowser/share" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_baseurl: "" + com.dockstarter.appvars._environment_database: "/config/database.db" + com.dockstarter.appvars._environment_log: "/config/filebrowser.log" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_80: "8080" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_share_dir: "~/.config/appdata/filebrowser/share" diff --git a/compose/.apps/filebrowser/filebrowser.netmode.yml b/compose/.apps/filebrowser/filebrowser.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/filebrowser/filebrowser.netmode.yml +++ b/compose/.apps/filebrowser/filebrowser.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/filebrowser/filebrowser.ports.yml b/compose/.apps/filebrowser/filebrowser.ports.yml index c37afbebb5..32f14e45fb 100644 --- a/compose/.apps/filebrowser/filebrowser.ports.yml +++ b/compose/.apps/filebrowser/filebrowser.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_80}:80 diff --git a/compose/.apps/filebrowser/filebrowser.x86_64.yml b/compose/.apps/filebrowser/filebrowser.x86_64.yml index ae51546af4..740f569b4b 100644 --- a/compose/.apps/filebrowser/filebrowser.x86_64.yml +++ b/compose/.apps/filebrowser/filebrowser.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: filebrowser/filebrowser:${${_APPNAME_}_TAG} + : + image: filebrowser/filebrowser:${_TAG} diff --git a/compose/.apps/filebrowser/filebrowser.yml b/compose/.apps/filebrowser/filebrowser.yml index d35ad17905..4aeae06c51 100644 --- a/compose/.apps/filebrowser/filebrowser.yml +++ b/compose/.apps/filebrowser/filebrowser.yml @@ -1,19 +1,19 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - FB_BASEURL=${${_APPNAME_}_ENVIRONMENT_BASEURL} - - FB_DATABASE=${${_APPNAME_}_ENVIRONMENT_DATABASE} - - FB_LOG=${${_APPNAME_}_ENVIRONMENT_LOG} + - FB_BASEURL=${_ENVIRONMENT_BASEURL} + - FB_DATABASE=${_ENVIRONMENT_DATABASE} + - FB_LOG=${_ENVIRONMENT_LOG} - TZ=${TZ} healthcheck: test: - CMD-SHELL - - curl -fs http://localhost:${${_APPNAME_}_PORT_80}/health || exit 1 - restart: ${${_APPNAME_}_RESTART} + - curl -fs http://localhost:${_PORT_80}/health || exit 1 + restart: ${_RESTART} user: ${PUID}:${PGID} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_SHARE_DIR}:/srv + - ${_VOLUME_SHARE_DIR}:/srv diff --git a/compose/.apps/fireflyiii/fireflyiii.aarch64.yml b/compose/.apps/fireflyiii/fireflyiii.aarch64.yml index 1cd393bdb5..ebfa807c4c 100644 --- a/compose/.apps/fireflyiii/fireflyiii.aarch64.yml +++ b/compose/.apps/fireflyiii/fireflyiii.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: fireflyiii/core:${${_APPNAME_}_TAG} + : + image: fireflyiii/core:${_TAG} diff --git a/compose/.apps/fireflyiii/fireflyiii.hostname.yml b/compose/.apps/fireflyiii/fireflyiii.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/fireflyiii/fireflyiii.hostname.yml +++ b/compose/.apps/fireflyiii/fireflyiii.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/fireflyiii/fireflyiii.labels.yml b/compose/.apps/fireflyiii/fireflyiii.labels.yml index f57c2e7886..de251e65dc 100644 --- a/compose/.apps/fireflyiii/fireflyiii.labels.yml +++ b/compose/.apps/fireflyiii/fireflyiii.labels.yml @@ -1,20 +1,20 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A personal finance manager" com.dockstarter.appinfo.nicename: "FireflyIII" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_app_key: "SomeRandomStringOf32CharsExactly" - com.dockstarter.appvars.${_appname_}_environment_db_connection: "mysql" - com.dockstarter.appvars.${_appname_}_environment_db_database: "fireflyiii_db" - com.dockstarter.appvars.${_appname_}_environment_db_host: "mariadb" - com.dockstarter.appvars.${_appname_}_environment_db_password: "fireflyiii_password" - com.dockstarter.appvars.${_appname_}_environment_db_port: "3306" - com.dockstarter.appvars.${_appname_}_environment_db_username: "fireflyiii_user" - com.dockstarter.appvars.${_appname_}_environment_trusted_proxies: "**" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8080: "8080" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_app_key: "SomeRandomStringOf32CharsExactly" + com.dockstarter.appvars._environment_db_connection: "mysql" + com.dockstarter.appvars._environment_db_database: "fireflyiii_db" + com.dockstarter.appvars._environment_db_host: "mariadb" + com.dockstarter.appvars._environment_db_password: "fireflyiii_password" + com.dockstarter.appvars._environment_db_port: "3306" + com.dockstarter.appvars._environment_db_username: "fireflyiii_user" + com.dockstarter.appvars._environment_trusted_proxies: "**" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8080: "8080" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/fireflyiii/fireflyiii.netmode.yml b/compose/.apps/fireflyiii/fireflyiii.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/fireflyiii/fireflyiii.netmode.yml +++ b/compose/.apps/fireflyiii/fireflyiii.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/fireflyiii/fireflyiii.ports.yml b/compose/.apps/fireflyiii/fireflyiii.ports.yml index 7d1c7e4455..f19f4867cd 100644 --- a/compose/.apps/fireflyiii/fireflyiii.ports.yml +++ b/compose/.apps/fireflyiii/fireflyiii.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8080}:8080 + - ${_PORT_8080}:8080 diff --git a/compose/.apps/fireflyiii/fireflyiii.x86_64.yml b/compose/.apps/fireflyiii/fireflyiii.x86_64.yml index 1cd393bdb5..ebfa807c4c 100644 --- a/compose/.apps/fireflyiii/fireflyiii.x86_64.yml +++ b/compose/.apps/fireflyiii/fireflyiii.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: fireflyiii/core:${${_APPNAME_}_TAG} + : + image: fireflyiii/core:${_TAG} diff --git a/compose/.apps/fireflyiii/fireflyiii.yml b/compose/.apps/fireflyiii/fireflyiii.yml index 6128b6714c..ec4523bfb1 100644 --- a/compose/.apps/fireflyiii/fireflyiii.yml +++ b/compose/.apps/fireflyiii/fireflyiii.yml @@ -1,19 +1,19 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - APP_KEY=${${_APPNAME_}_ENVIRONMENT_APP_KEY} - - DB_CONNECTION=${${_APPNAME_}_ENVIRONMENT_DB_CONNECTION} - - DB_DATABASE=${${_APPNAME_}_ENVIRONMENT_DB_DATABASE} - - DB_HOST=${${_APPNAME_}_ENVIRONMENT_DB_HOST} - - DB_PASSWORD=${${_APPNAME_}_ENVIRONMENT_DB_PASSWORD} - - DB_PORT=${${_APPNAME_}_ENVIRONMENT_DB_PORT} - - DB_USERNAME=${${_APPNAME_}_ENVIRONMENT_DB_USERNAME} - - TRUSTED_PROXIES=${${_APPNAME_}_ENVIRONMENT_TRUSTED_PROXIES} + - APP_KEY=${_ENVIRONMENT_APP_KEY} + - DB_CONNECTION=${_ENVIRONMENT_DB_CONNECTION} + - DB_DATABASE=${_ENVIRONMENT_DB_DATABASE} + - DB_HOST=${_ENVIRONMENT_DB_HOST} + - DB_PASSWORD=${_ENVIRONMENT_DB_PASSWORD} + - DB_PORT=${_ENVIRONMENT_DB_PORT} + - DB_USERNAME=${_ENVIRONMENT_DB_USERNAME} + - TRUSTED_PROXIES=${_ENVIRONMENT_TRUSTED_PROXIES} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/export:/var/www/html/storage/export - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/upload:/var/www/html/storage/upload + - ${DOCKER_VOLUME_CONFIG}//export:/var/www/html/storage/export + - ${DOCKER_VOLUME_CONFIG}//upload:/var/www/html/storage/upload - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/flame/flame.aarch64.yml b/compose/.apps/flame/flame.aarch64.yml index a420f155c0..48e9ec76cd 100644 --- a/compose/.apps/flame/flame.aarch64.yml +++ b/compose/.apps/flame/flame.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: pawelmalak/flame:${${_APPNAME_}_TAG} + : + image: pawelmalak/flame:${_TAG} diff --git a/compose/.apps/flame/flame.hostname.yml b/compose/.apps/flame/flame.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/flame/flame.hostname.yml +++ b/compose/.apps/flame/flame.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/flame/flame.labels.yml b/compose/.apps/flame/flame.labels.yml index 49ce1a0e36..c090a44d0d 100644 --- a/compose/.apps/flame/flame.labels.yml +++ b/compose/.apps/flame/flame.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A self-hosted startpage for your server. Easily manage your apps and bookmarks with built-in editors." com.dockstarter.appinfo.nicename: "Flame" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_password: "" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_5005: "5005" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "multiarch" - com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_password: "" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_5005: "5005" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "multiarch" + com.dockstarter.appvars._volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/flame/flame.netmode.yml b/compose/.apps/flame/flame.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/flame/flame.netmode.yml +++ b/compose/.apps/flame/flame.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/flame/flame.ports.yml b/compose/.apps/flame/flame.ports.yml index 93d781b848..eaa2b33820 100644 --- a/compose/.apps/flame/flame.ports.yml +++ b/compose/.apps/flame/flame.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_5005}:5005 + - ${_PORT_5005}:5005 diff --git a/compose/.apps/flame/flame.x86_64.yml b/compose/.apps/flame/flame.x86_64.yml index a420f155c0..48e9ec76cd 100644 --- a/compose/.apps/flame/flame.x86_64.yml +++ b/compose/.apps/flame/flame.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: pawelmalak/flame:${${_APPNAME_}_TAG} + : + image: pawelmalak/flame:${_TAG} diff --git a/compose/.apps/flame/flame.yml b/compose/.apps/flame/flame.yml index 3b040be1ba..21f85d6b3f 100644 --- a/compose/.apps/flame/flame.yml +++ b/compose/.apps/flame/flame.yml @@ -1,10 +1,10 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - PASSWORD=${${_APPNAME_}_ENVIRONMENT_PASSWORD} - restart: ${${_APPNAME_}_RESTART} + - PASSWORD=${_ENVIRONMENT_PASSWORD} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock + - ${_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock diff --git a/compose/.apps/flaresolverr/flaresolverr.aarch64.yml b/compose/.apps/flaresolverr/flaresolverr.aarch64.yml index 07549367bc..ea365ff0ef 100644 --- a/compose/.apps/flaresolverr/flaresolverr.aarch64.yml +++ b/compose/.apps/flaresolverr/flaresolverr.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/flaresolverr/flaresolverr:${${_APPNAME_}_TAG} + : + image: ghcr.io/flaresolverr/flaresolverr:${_TAG} diff --git a/compose/.apps/flaresolverr/flaresolverr.hostname.yml b/compose/.apps/flaresolverr/flaresolverr.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/flaresolverr/flaresolverr.hostname.yml +++ b/compose/.apps/flaresolverr/flaresolverr.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/flaresolverr/flaresolverr.labels.yml b/compose/.apps/flaresolverr/flaresolverr.labels.yml index 535ee8f4f6..ea1a1999f5 100644 --- a/compose/.apps/flaresolverr/flaresolverr.labels.yml +++ b/compose/.apps/flaresolverr/flaresolverr.labels.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "FlareSolverr is a proxy server to bypass Cloudflare protection" com.dockstarter.appinfo.nicename: "Flaresolverr" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_captcha_solver: "none" - com.dockstarter.appvars.${_appname_}_environment_log_html: "false" - com.dockstarter.appvars.${_appname_}_environment_log_level: "info" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8191: "8191" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_captcha_solver: "none" + com.dockstarter.appvars._environment_log_html: "false" + com.dockstarter.appvars._environment_log_level: "info" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8191: "8191" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/flaresolverr/flaresolverr.netmode.yml b/compose/.apps/flaresolverr/flaresolverr.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/flaresolverr/flaresolverr.netmode.yml +++ b/compose/.apps/flaresolverr/flaresolverr.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/flaresolverr/flaresolverr.ports.yml b/compose/.apps/flaresolverr/flaresolverr.ports.yml index 51f6a84e4b..0606566a84 100644 --- a/compose/.apps/flaresolverr/flaresolverr.ports.yml +++ b/compose/.apps/flaresolverr/flaresolverr.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8191}:${${_APPNAME_}_PORT_8191} + - ${_PORT_8191}:${_PORT_8191} diff --git a/compose/.apps/flaresolverr/flaresolverr.x86_64.yml b/compose/.apps/flaresolverr/flaresolverr.x86_64.yml index 07549367bc..ea365ff0ef 100644 --- a/compose/.apps/flaresolverr/flaresolverr.x86_64.yml +++ b/compose/.apps/flaresolverr/flaresolverr.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/flaresolverr/flaresolverr:${${_APPNAME_}_TAG} + : + image: ghcr.io/flaresolverr/flaresolverr:${_TAG} diff --git a/compose/.apps/flaresolverr/flaresolverr.yml b/compose/.apps/flaresolverr/flaresolverr.yml index 4b9ee456db..de0ab8be57 100644 --- a/compose/.apps/flaresolverr/flaresolverr.yml +++ b/compose/.apps/flaresolverr/flaresolverr.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - CAPTCHA_SOLVER=${${_APPNAME_}_ENVIRONMENT_CAPTCHA_SOLVER} - - LOG_HTML=${${_APPNAME_}_ENVIRONMENT_LOG_HTML} - - LOG_LEVEL=${${_APPNAME_}_ENVIRONMENT_LOG_LEVEL} - - PORT=${${_APPNAME_}_PORT_8191} + - CAPTCHA_SOLVER=${_ENVIRONMENT_CAPTCHA_SOLVER} + - LOG_HTML=${_ENVIRONMENT_LOG_HTML} + - LOG_LEVEL=${_ENVIRONMENT_LOG_LEVEL} + - PORT=${_PORT_8191} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/freshrss/freshrss.aarch64.yml b/compose/.apps/freshrss/freshrss.aarch64.yml index 1f981fe564..4b5227a184 100644 --- a/compose/.apps/freshrss/freshrss.aarch64.yml +++ b/compose/.apps/freshrss/freshrss.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/freshrss:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/freshrss:${_TAG} diff --git a/compose/.apps/freshrss/freshrss.hostname.yml b/compose/.apps/freshrss/freshrss.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/freshrss/freshrss.hostname.yml +++ b/compose/.apps/freshrss/freshrss.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/freshrss/freshrss.labels.yml b/compose/.apps/freshrss/freshrss.labels.yml index 354ca53916..dc8a93ecbc 100644 --- a/compose/.apps/freshrss/freshrss.labels.yml +++ b/compose/.apps/freshrss/freshrss.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Free, self-hostable aggregator for rss feeds" com.dockstarter.appinfo.nicename: "FreshRSS" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_80: "8012" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_80: "8012" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/freshrss/freshrss.netmode.yml b/compose/.apps/freshrss/freshrss.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/freshrss/freshrss.netmode.yml +++ b/compose/.apps/freshrss/freshrss.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/freshrss/freshrss.ports.yml b/compose/.apps/freshrss/freshrss.ports.yml index c37afbebb5..32f14e45fb 100644 --- a/compose/.apps/freshrss/freshrss.ports.yml +++ b/compose/.apps/freshrss/freshrss.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_80}:80 diff --git a/compose/.apps/freshrss/freshrss.x86_64.yml b/compose/.apps/freshrss/freshrss.x86_64.yml index 1f981fe564..4b5227a184 100644 --- a/compose/.apps/freshrss/freshrss.x86_64.yml +++ b/compose/.apps/freshrss/freshrss.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/freshrss:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/freshrss:${_TAG} diff --git a/compose/.apps/freshrss/freshrss.yml b/compose/.apps/freshrss/freshrss.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/freshrss/freshrss.yml +++ b/compose/.apps/freshrss/freshrss.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/gitea/gitea.hostname.yml b/compose/.apps/gitea/gitea.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/gitea/gitea.hostname.yml +++ b/compose/.apps/gitea/gitea.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/gitea/gitea.labels.yml b/compose/.apps/gitea/gitea.labels.yml index 184851ce75..3ed804d854 100644 --- a/compose/.apps/gitea/gitea.labels.yml +++ b/compose/.apps/gitea/gitea.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A painless self-hosted Git service" com.dockstarter.appinfo.nicename: "Gitea" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_3000: "3000" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_3000: "3000" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/gitea/gitea.netmode.yml b/compose/.apps/gitea/gitea.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/gitea/gitea.netmode.yml +++ b/compose/.apps/gitea/gitea.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/gitea/gitea.ports.yml b/compose/.apps/gitea/gitea.ports.yml index 40e1a7dee8..ba1bfa6d83 100644 --- a/compose/.apps/gitea/gitea.ports.yml +++ b/compose/.apps/gitea/gitea.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_3000}:3000 + - ${_PORT_3000}:3000 diff --git a/compose/.apps/gitea/gitea.x86_64.yml b/compose/.apps/gitea/gitea.x86_64.yml index b3826d4f5c..3f6f5f40da 100644 --- a/compose/.apps/gitea/gitea.x86_64.yml +++ b/compose/.apps/gitea/gitea.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: gitea/gitea:${${_APPNAME_}_TAG} + : + image: gitea/gitea:${_TAG} diff --git a/compose/.apps/gitea/gitea.yml b/compose/.apps/gitea/gitea.yml index fc7027294b..8662ec5f92 100644 --- a/compose/.apps/gitea/gitea.yml +++ b/compose/.apps/gitea/gitea.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - USER_UID=${PUID} - USER_GID=${PGID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/data + - ${DOCKER_VOLUME_CONFIG}/:/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/glances/glances.hostname.yml b/compose/.apps/glances/glances.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/glances/glances.hostname.yml +++ b/compose/.apps/glances/glances.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/glances/glances.labels.yml b/compose/.apps/glances/glances.labels.yml index 21f0e44b60..90020eaeb6 100644 --- a/compose/.apps/glances/glances.labels.yml +++ b/compose/.apps/glances/glances.labels.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Cross-platform system monitoring tool" com.dockstarter.appinfo.nicename: "Glances" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_opt: "-w" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_61208: "61208" - com.dockstarter.appvars.${_appname_}_port_61209: "61209" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_opt: "-w" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_61208: "61208" + com.dockstarter.appvars._port_61209: "61209" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/glances/glances.netmode.yml b/compose/.apps/glances/glances.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/glances/glances.netmode.yml +++ b/compose/.apps/glances/glances.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/glances/glances.ports.yml b/compose/.apps/glances/glances.ports.yml index 33638dea19..898c33520c 100644 --- a/compose/.apps/glances/glances.ports.yml +++ b/compose/.apps/glances/glances.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_61208}:61208 - - ${${_APPNAME_}_PORT_61209}:61209 + - ${_PORT_61208}:61208 + - ${_PORT_61209}:61209 diff --git a/compose/.apps/glances/glances.x86_64.yml b/compose/.apps/glances/glances.x86_64.yml index 249170c72c..b36fafdf1d 100644 --- a/compose/.apps/glances/glances.x86_64.yml +++ b/compose/.apps/glances/glances.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: nicolargo/glances:${${_APPNAME_}_TAG} + : + image: nicolargo/glances:${_TAG} diff --git a/compose/.apps/glances/glances.yml b/compose/.apps/glances/glances.yml index 2ac86f88a0..2c8cc22109 100644 --- a/compose/.apps/glances/glances.yml +++ b/compose/.apps/glances/glances.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - GLANCES_OPT=${${_APPNAME_}_ENVIRONMENT_OPT} + - GLANCES_OPT=${_ENVIRONMENT_OPT} - TZ=${TZ} pid: host - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/glances/conf + - ${DOCKER_VOLUME_CONFIG}/:/glances/conf - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock:ro + - ${_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock:ro diff --git a/compose/.apps/gluetun/gluetun.aarch64.yml b/compose/.apps/gluetun/gluetun.aarch64.yml index 4e2f9331e1..04b9ba9367 100644 --- a/compose/.apps/gluetun/gluetun.aarch64.yml +++ b/compose/.apps/gluetun/gluetun.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/qdm12/gluetun:${${_APPNAME_}_TAG} + : + image: ghcr.io/qdm12/gluetun:${_TAG} diff --git a/compose/.apps/gluetun/gluetun.hostname.yml b/compose/.apps/gluetun/gluetun.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/gluetun/gluetun.hostname.yml +++ b/compose/.apps/gluetun/gluetun.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/gluetun/gluetun.labels.yml b/compose/.apps/gluetun/gluetun.labels.yml index 112c84143e..a5374b1636 100644 --- a/compose/.apps/gluetun/gluetun.labels.yml +++ b/compose/.apps/gluetun/gluetun.labels.yml @@ -1,62 +1,62 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "VPN client in a thin Docker container for multiple VPN providers." com.dockstarter.appinfo.nicename: "Gluetun" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_firewall_debug: "off" - com.dockstarter.appvars.${_appname_}_environment_firewall_input_ports: "" - com.dockstarter.appvars.${_appname_}_environment_firewall_outbound_subnets: "" - com.dockstarter.appvars.${_appname_}_environment_firewall_vpn_input_ports: "" - com.dockstarter.appvars.${_appname_}_environment_free_only: "" - com.dockstarter.appvars.${_appname_}_environment_http_control_server_log: "on" - com.dockstarter.appvars.${_appname_}_environment_httpproxy: "off" - com.dockstarter.appvars.${_appname_}_environment_httpproxy_log: "off" - com.dockstarter.appvars.${_appname_}_environment_httpproxy_password: "" - com.dockstarter.appvars.${_appname_}_environment_httpproxy_stealth: "off" - com.dockstarter.appvars.${_appname_}_environment_httpproxy_user: "" - com.dockstarter.appvars.${_appname_}_environment_isp: "" - com.dockstarter.appvars.${_appname_}_environment_openvpn_custom_config: "/gluetun/custom.conf" - com.dockstarter.appvars.${_appname_}_environment_openvpn_password: "" - com.dockstarter.appvars.${_appname_}_environment_openvpn_user: "" - com.dockstarter.appvars.${_appname_}_environment_owned_only: "no" - com.dockstarter.appvars.${_appname_}_environment_premium_only: "no" - com.dockstarter.appvars.${_appname_}_environment_private_internet_access_openvpn_encryption_preset: "strong" - com.dockstarter.appvars.${_appname_}_environment_publicip_file: "/tmp/gluetun/ip" - com.dockstarter.appvars.${_appname_}_environment_publicip_period: "12h" - com.dockstarter.appvars.${_appname_}_environment_server_cities: "" - com.dockstarter.appvars.${_appname_}_environment_server_countries: "" - com.dockstarter.appvars.${_appname_}_environment_server_hostnames: "" - com.dockstarter.appvars.${_appname_}_environment_server_names: "" - com.dockstarter.appvars.${_appname_}_environment_server_regions: "" - com.dockstarter.appvars.${_appname_}_environment_shadowsocks: "off" - com.dockstarter.appvars.${_appname_}_environment_shadowsocks_cipher: "chacha20-ietf-poly1305" - com.dockstarter.appvars.${_appname_}_environment_shadowsocks_log: "off" - com.dockstarter.appvars.${_appname_}_environment_shadowsocks_password: "" - com.dockstarter.appvars.${_appname_}_environment_updater_min_ratio: "0.8" - com.dockstarter.appvars.${_appname_}_environment_updater_period: "" - com.dockstarter.appvars.${_appname_}_environment_updater_vpn_service_providers: "" - com.dockstarter.appvars.${_appname_}_environment_version_information: "on" - com.dockstarter.appvars.${_appname_}_environment_vpn_endpoint_ip: "" - com.dockstarter.appvars.${_appname_}_environment_vpn_endpoint_port: "" - com.dockstarter.appvars.${_appname_}_environment_vpn_interface: "tun0" - com.dockstarter.appvars.${_appname_}_environment_vpn_port_forwarding: "off" - com.dockstarter.appvars.${_appname_}_environment_vpn_port_forwarding_provider: "" - com.dockstarter.appvars.${_appname_}_environment_vpn_port_forwarding_status_file: "/tmp/gluetun/forwarded_port" - com.dockstarter.appvars.${_appname_}_environment_vpn_service_provider: "private internet access" - com.dockstarter.appvars.${_appname_}_environment_vpn_type: "openvpn" - com.dockstarter.appvars.${_appname_}_environment_wireguard_addresses: "" - com.dockstarter.appvars.${_appname_}_environment_wireguard_allowed_ips: "0.0.0.0/0,::/0" - com.dockstarter.appvars.${_appname_}_environment_wireguard_implementation: "auto" - com.dockstarter.appvars.${_appname_}_environment_wireguard_mtu: "1400" - com.dockstarter.appvars.${_appname_}_environment_wireguard_preshared_key: "" - com.dockstarter.appvars.${_appname_}_environment_wireguard_private_key: "" - com.dockstarter.appvars.${_appname_}_environment_wireguard_public_key: "" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8000: "8000" - com.dockstarter.appvars.${_appname_}_port_8388: "8388" - com.dockstarter.appvars.${_appname_}_port_8888: "8888" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_firewall_debug: "off" + com.dockstarter.appvars._environment_firewall_input_ports: "" + com.dockstarter.appvars._environment_firewall_outbound_subnets: "" + com.dockstarter.appvars._environment_firewall_vpn_input_ports: "" + com.dockstarter.appvars._environment_free_only: "" + com.dockstarter.appvars._environment_http_control_server_log: "on" + com.dockstarter.appvars._environment_httpproxy: "off" + com.dockstarter.appvars._environment_httpproxy_log: "off" + com.dockstarter.appvars._environment_httpproxy_password: "" + com.dockstarter.appvars._environment_httpproxy_stealth: "off" + com.dockstarter.appvars._environment_httpproxy_user: "" + com.dockstarter.appvars._environment_isp: "" + com.dockstarter.appvars._environment_openvpn_custom_config: "/gluetun/custom.conf" + com.dockstarter.appvars._environment_openvpn_password: "" + com.dockstarter.appvars._environment_openvpn_user: "" + com.dockstarter.appvars._environment_owned_only: "no" + com.dockstarter.appvars._environment_premium_only: "no" + com.dockstarter.appvars._environment_private_internet_access_openvpn_encryption_preset: "strong" + com.dockstarter.appvars._environment_publicip_file: "/tmp/gluetun/ip" + com.dockstarter.appvars._environment_publicip_period: "12h" + com.dockstarter.appvars._environment_server_cities: "" + com.dockstarter.appvars._environment_server_countries: "" + com.dockstarter.appvars._environment_server_hostnames: "" + com.dockstarter.appvars._environment_server_names: "" + com.dockstarter.appvars._environment_server_regions: "" + com.dockstarter.appvars._environment_shadowsocks: "off" + com.dockstarter.appvars._environment_shadowsocks_cipher: "chacha20-ietf-poly1305" + com.dockstarter.appvars._environment_shadowsocks_log: "off" + com.dockstarter.appvars._environment_shadowsocks_password: "" + com.dockstarter.appvars._environment_updater_min_ratio: "0.8" + com.dockstarter.appvars._environment_updater_period: "" + com.dockstarter.appvars._environment_updater_vpn_service_providers: "" + com.dockstarter.appvars._environment_version_information: "on" + com.dockstarter.appvars._environment_vpn_endpoint_ip: "" + com.dockstarter.appvars._environment_vpn_endpoint_port: "" + com.dockstarter.appvars._environment_vpn_interface: "tun0" + com.dockstarter.appvars._environment_vpn_port_forwarding: "off" + com.dockstarter.appvars._environment_vpn_port_forwarding_provider: "" + com.dockstarter.appvars._environment_vpn_port_forwarding_status_file: "/tmp/gluetun/forwarded_port" + com.dockstarter.appvars._environment_vpn_service_provider: "private internet access" + com.dockstarter.appvars._environment_vpn_type: "openvpn" + com.dockstarter.appvars._environment_wireguard_addresses: "" + com.dockstarter.appvars._environment_wireguard_allowed_ips: "0.0.0.0/0,::/0" + com.dockstarter.appvars._environment_wireguard_implementation: "auto" + com.dockstarter.appvars._environment_wireguard_mtu: "1400" + com.dockstarter.appvars._environment_wireguard_preshared_key: "" + com.dockstarter.appvars._environment_wireguard_private_key: "" + com.dockstarter.appvars._environment_wireguard_public_key: "" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8000: "8000" + com.dockstarter.appvars._port_8388: "8388" + com.dockstarter.appvars._port_8888: "8888" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/gluetun/gluetun.netmode.yml b/compose/.apps/gluetun/gluetun.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/gluetun/gluetun.netmode.yml +++ b/compose/.apps/gluetun/gluetun.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/gluetun/gluetun.ports.yml b/compose/.apps/gluetun/gluetun.ports.yml index 3fa66e0b28..a410cec8d1 100644 --- a/compose/.apps/gluetun/gluetun.ports.yml +++ b/compose/.apps/gluetun/gluetun.ports.yml @@ -1,7 +1,7 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8000}:8000 - - ${${_APPNAME_}_PORT_8388}:8388 - - ${${_APPNAME_}_PORT_8388}:8388/udp - - ${${_APPNAME_}_PORT_8888}:8888 + - ${_PORT_8000}:8000 + - ${_PORT_8388}:8388 + - ${_PORT_8388}:8388/udp + - ${_PORT_8888}:8888 diff --git a/compose/.apps/gluetun/gluetun.x86_64.yml b/compose/.apps/gluetun/gluetun.x86_64.yml index 4e2f9331e1..04b9ba9367 100644 --- a/compose/.apps/gluetun/gluetun.x86_64.yml +++ b/compose/.apps/gluetun/gluetun.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/qdm12/gluetun:${${_APPNAME_}_TAG} + : + image: ghcr.io/qdm12/gluetun:${_TAG} diff --git a/compose/.apps/gluetun/gluetun.yml b/compose/.apps/gluetun/gluetun.yml index 38e2b4b25c..5916097627 100644 --- a/compose/.apps/gluetun/gluetun.yml +++ b/compose/.apps/gluetun/gluetun.yml @@ -1,61 +1,61 @@ services: - ${_appname_}: + : cap_add: - NET_ADMIN - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} devices: - /dev/net/tun environment: - - FIREWALL_DEBUG=${${_APPNAME_}_ENVIRONMENT_FIREWALL_DEBUG} - - FIREWALL_INPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_FIREWALL_INPUT_PORTS} - - FIREWALL_OUTBOUND_SUBNETS=${${_APPNAME_}_ENVIRONMENT_FIREWALL_OUTBOUND_SUBNETS} - - FIREWALL_VPN_INPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_FIREWALL_VPN_INPUT_PORTS} - - FREE_ONLY=${${_APPNAME_}_ENVIRONMENT_FREE_ONLY} - - HTTPPROXY=${${_APPNAME_}_ENVIRONMENT_HTTPPROXY} - - HTTPPROXY_LOG=${${_APPNAME_}_ENVIRONMENT_HTTPPROXY_LOG} - - HTTPPROXY_PASSWORD=${${_APPNAME_}_ENVIRONMENT_HTTPPROXY_PASSWORD} - - HTTPPROXY_STEALTH=${${_APPNAME_}_ENVIRONMENT_HTTPPROXY_STEALTH} - - HTTPPROXY_USER=${${_APPNAME_}_ENVIRONMENT_HTTPPROXY_USER} - - HTTP_CONTROL_SERVER_LOG=${${_APPNAME_}_ENVIRONMENT_HTTP_CONTROL_SERVER_LOG} - - ISP=${${_APPNAME_}_ENVIRONMENT_ISP} - - OPENVPN_CUSTOM_CONFIG=${${_APPNAME_}_ENVIRONMENT_OPENVPN_CUSTOM_CONFIG} - - OPENVPN_PASSWORD=${${_APPNAME_}_ENVIRONMENT_OPENVPN_PASSWORD} - - OPENVPN_USER=${${_APPNAME_}_ENVIRONMENT_OPENVPN_USER} - - OWNED_ONLY=${${_APPNAME_}_ENVIRONMENT_OWNED_ONLY} - - PREMIUM_ONLY=${${_APPNAME_}_ENVIRONMENT_PREMIUM_ONLY} - - PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET=${${_APPNAME_}_ENVIRONMENT_PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET} - - PUBLICIP_FILE=${${_APPNAME_}_ENVIRONMENT_PUBLICIP_FILE} - - PUBLICIP_PERIOD=${${_APPNAME_}_ENVIRONMENT_PUBLICIP_PERIOD} - - SERVER_CITIES=${${_APPNAME_}_ENVIRONMENT_SERVER_CITIES} - - SERVER_COUNTRIES=${${_APPNAME_}_ENVIRONMENT_SERVER_COUNTRIES} - - SERVER_HOSTNAMES=${${_APPNAME_}_ENVIRONMENT_SERVER_HOSTNAMES} - - SERVER_NAMES=${${_APPNAME_}_ENVIRONMENT_SERVER_NAMES} - - SERVER_REGIONS=${${_APPNAME_}_ENVIRONMENT_SERVER_REGIONS} - - SHADOWSOCKS=${${_APPNAME_}_ENVIRONMENT_SHADOWSOCKS} - - SHADOWSOCKS_CIPHER=${${_APPNAME_}_ENVIRONMENT_SHADOWSOCKS_CIPHER} - - SHADOWSOCKS_LOG=${${_APPNAME_}_ENVIRONMENT_SHADOWSOCKS_LOG} - - SHADOWSOCKS_PASSWORD=${${_APPNAME_}_ENVIRONMENT_SHADOWSOCKS_PASSWORD} + - FIREWALL_DEBUG=${_ENVIRONMENT_FIREWALL_DEBUG} + - FIREWALL_INPUT_PORTS=${_ENVIRONMENT_FIREWALL_INPUT_PORTS} + - FIREWALL_OUTBOUND_SUBNETS=${_ENVIRONMENT_FIREWALL_OUTBOUND_SUBNETS} + - FIREWALL_VPN_INPUT_PORTS=${_ENVIRONMENT_FIREWALL_VPN_INPUT_PORTS} + - FREE_ONLY=${_ENVIRONMENT_FREE_ONLY} + - HTTPPROXY=${_ENVIRONMENT_HTTPPROXY} + - HTTPPROXY_LOG=${_ENVIRONMENT_HTTPPROXY_LOG} + - HTTPPROXY_PASSWORD=${_ENVIRONMENT_HTTPPROXY_PASSWORD} + - HTTPPROXY_STEALTH=${_ENVIRONMENT_HTTPPROXY_STEALTH} + - HTTPPROXY_USER=${_ENVIRONMENT_HTTPPROXY_USER} + - HTTP_CONTROL_SERVER_LOG=${_ENVIRONMENT_HTTP_CONTROL_SERVER_LOG} + - ISP=${_ENVIRONMENT_ISP} + - OPENVPN_CUSTOM_CONFIG=${_ENVIRONMENT_OPENVPN_CUSTOM_CONFIG} + - OPENVPN_PASSWORD=${_ENVIRONMENT_OPENVPN_PASSWORD} + - OPENVPN_USER=${_ENVIRONMENT_OPENVPN_USER} + - OWNED_ONLY=${_ENVIRONMENT_OWNED_ONLY} + - PREMIUM_ONLY=${_ENVIRONMENT_PREMIUM_ONLY} + - PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET=${_ENVIRONMENT_PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET} + - PUBLICIP_FILE=${_ENVIRONMENT_PUBLICIP_FILE} + - PUBLICIP_PERIOD=${_ENVIRONMENT_PUBLICIP_PERIOD} + - SERVER_CITIES=${_ENVIRONMENT_SERVER_CITIES} + - SERVER_COUNTRIES=${_ENVIRONMENT_SERVER_COUNTRIES} + - SERVER_HOSTNAMES=${_ENVIRONMENT_SERVER_HOSTNAMES} + - SERVER_NAMES=${_ENVIRONMENT_SERVER_NAMES} + - SERVER_REGIONS=${_ENVIRONMENT_SERVER_REGIONS} + - SHADOWSOCKS=${_ENVIRONMENT_SHADOWSOCKS} + - SHADOWSOCKS_CIPHER=${_ENVIRONMENT_SHADOWSOCKS_CIPHER} + - SHADOWSOCKS_LOG=${_ENVIRONMENT_SHADOWSOCKS_LOG} + - SHADOWSOCKS_PASSWORD=${_ENVIRONMENT_SHADOWSOCKS_PASSWORD} - TZ=${TZ} - - UPDATER_MIN_RATIO=${${_APPNAME_}_ENVIRONMENT_UPDATER_MIN_RATIO} - - UPDATER_PERIOD=${${_APPNAME_}_ENVIRONMENT_UPDATER_PERIOD} - - UPDATER_VPN_SERVICE_PROVIDERS=${${_APPNAME_}_ENVIRONMENT_UPDATER_VPN_SERVICE_PROVIDERS} - - VERSION_INFORMATION=${${_APPNAME_}_ENVIRONMENT_VERSION_INFORMATION} - - VPN_ENDPOINT_IP=${${_APPNAME_}_ENVIRONMENT_VPN_ENDPOINT_IP} - - VPN_ENDPOINT_PORT=${${_APPNAME_}_ENVIRONMENT_VPN_ENDPOINT_PORT} - - VPN_INTERFACE=${${_APPNAME_}_ENVIRONMENT_VPN_INTERFACE} - - VPN_PORT_FORWARDING=${${_APPNAME_}_ENVIRONMENT_VPN_PORT_FORWARDING} - - VPN_PORT_FORWARDING_STATUS_FILE=${${_APPNAME_}_ENVIRONMENT_VPN_PORT_FORWARDING_STATUS_FILE} - - VPN_SERVICE_PROVIDER=${${_APPNAME_}_ENVIRONMENT_VPN_SERVICE_PROVIDER} - - VPN_TYPE=${${_APPNAME_}_ENVIRONMENT_VPN_TYPE} - - WIREGUARD_ADDRESSES=${${_APPNAME_}_ENVIRONMENT_WIREGUARD_ADDRESSES} - - WIREGUARD_ALLOWED_IPS=${${_APPNAME_}_ENVIRONMENT_WIREGUARD_ALLOWED_IPS} - - WIREGUARD_IMPLEMENTATION=${${_APPNAME_}_ENVIRONMENT_WIREGUARD_IMPLEMENTATION} - - WIREGUARD_MTU=${${_APPNAME_}_ENVIRONMENT_WIREGUARD_MTU} - - WIREGUARD_PRESHARED_KEY=${${_APPNAME_}_ENVIRONMENT_WIREGUARD_PRESHARED_KEY} - - WIREGUARD_PRIVATE_KEY=${${_APPNAME_}_ENVIRONMENT_WIREGUARD_PRIVATE_KEY} - - WIREGUARD_PUBLIC_KEY=${${_APPNAME_}_ENVIRONMENT_WIREGUARD_PUBLIC_KEY} - restart: ${${_APPNAME_}_RESTART} + - UPDATER_MIN_RATIO=${_ENVIRONMENT_UPDATER_MIN_RATIO} + - UPDATER_PERIOD=${_ENVIRONMENT_UPDATER_PERIOD} + - UPDATER_VPN_SERVICE_PROVIDERS=${_ENVIRONMENT_UPDATER_VPN_SERVICE_PROVIDERS} + - VERSION_INFORMATION=${_ENVIRONMENT_VERSION_INFORMATION} + - VPN_ENDPOINT_IP=${_ENVIRONMENT_VPN_ENDPOINT_IP} + - VPN_ENDPOINT_PORT=${_ENVIRONMENT_VPN_ENDPOINT_PORT} + - VPN_INTERFACE=${_ENVIRONMENT_VPN_INTERFACE} + - VPN_PORT_FORWARDING=${_ENVIRONMENT_VPN_PORT_FORWARDING} + - VPN_PORT_FORWARDING_STATUS_FILE=${_ENVIRONMENT_VPN_PORT_FORWARDING_STATUS_FILE} + - VPN_SERVICE_PROVIDER=${_ENVIRONMENT_VPN_SERVICE_PROVIDER} + - VPN_TYPE=${_ENVIRONMENT_VPN_TYPE} + - WIREGUARD_ADDRESSES=${_ENVIRONMENT_WIREGUARD_ADDRESSES} + - WIREGUARD_ALLOWED_IPS=${_ENVIRONMENT_WIREGUARD_ALLOWED_IPS} + - WIREGUARD_IMPLEMENTATION=${_ENVIRONMENT_WIREGUARD_IMPLEMENTATION} + - WIREGUARD_MTU=${_ENVIRONMENT_WIREGUARD_MTU} + - WIREGUARD_PRESHARED_KEY=${_ENVIRONMENT_WIREGUARD_PRESHARED_KEY} + - WIREGUARD_PRIVATE_KEY=${_ENVIRONMENT_WIREGUARD_PRIVATE_KEY} + - WIREGUARD_PUBLIC_KEY=${_ENVIRONMENT_WIREGUARD_PUBLIC_KEY} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/gluetun + - ${DOCKER_VOLUME_CONFIG}/:/gluetun - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/goaccess/goaccess.hostname.yml b/compose/.apps/goaccess/goaccess.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/goaccess/goaccess.hostname.yml +++ b/compose/.apps/goaccess/goaccess.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/goaccess/goaccess.labels.yml b/compose/.apps/goaccess/goaccess.labels.yml index e7dd41631b..0d04506f7b 100644 --- a/compose/.apps/goaccess/goaccess.labels.yml +++ b/compose/.apps/goaccess/goaccess.labels.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Real-time web log analyzer" com.dockstarter.appinfo.nicename: "GoAccess" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_7889: "7889" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_logsdir: "~/.config/appdata/swag/log/nginx" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_7889: "7889" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_logsdir: "~/.config/appdata/swag/log/nginx" diff --git a/compose/.apps/goaccess/goaccess.netmode.yml b/compose/.apps/goaccess/goaccess.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/goaccess/goaccess.netmode.yml +++ b/compose/.apps/goaccess/goaccess.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/goaccess/goaccess.ports.yml b/compose/.apps/goaccess/goaccess.ports.yml index 7ee8f42a20..73d3198191 100644 --- a/compose/.apps/goaccess/goaccess.ports.yml +++ b/compose/.apps/goaccess/goaccess.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_7889}:7889 + - ${_PORT_7889}:7889 diff --git a/compose/.apps/goaccess/goaccess.x86_64.yml b/compose/.apps/goaccess/goaccess.x86_64.yml index 539a867e40..2c8bc3030b 100644 --- a/compose/.apps/goaccess/goaccess.x86_64.yml +++ b/compose/.apps/goaccess/goaccess.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: gregyankovoy/goaccess:${${_APPNAME_}_TAG} + : + image: gregyankovoy/goaccess:${_TAG} diff --git a/compose/.apps/goaccess/goaccess.yml b/compose/.apps/goaccess/goaccess.yml index 4519e40524..ed28371886 100644 --- a/compose/.apps/goaccess/goaccess.yml +++ b/compose/.apps/goaccess/goaccess.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} security_opt: - apparmor:unconfined volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_LOGSDIR}:/opt/log:ro + - ${_VOLUME_LOGSDIR}:/opt/log:ro diff --git a/compose/.apps/grafana/grafana.aarch64.yml b/compose/.apps/grafana/grafana.aarch64.yml index 0afbfbd517..e50dcd8aa4 100644 --- a/compose/.apps/grafana/grafana.aarch64.yml +++ b/compose/.apps/grafana/grafana.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: grafana/grafana:${${_APPNAME_}_TAG} + : + image: grafana/grafana:${_TAG} diff --git a/compose/.apps/grafana/grafana.hostname.yml b/compose/.apps/grafana/grafana.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/grafana/grafana.hostname.yml +++ b/compose/.apps/grafana/grafana.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/grafana/grafana.labels.yml b/compose/.apps/grafana/grafana.labels.yml index 773e184f93..b66e012799 100644 --- a/compose/.apps/grafana/grafana.labels.yml +++ b/compose/.apps/grafana/grafana.labels.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Metrics dashboard and graph editor" com.dockstarter.appinfo.nicename: "Grafana" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_gf_install_plugins: "grafana-piechart-panel,grafana-worldmap-panel" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_3000: "3000" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_gf_install_plugins: "grafana-piechart-panel,grafana-worldmap-panel" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_3000: "3000" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/grafana/grafana.netmode.yml b/compose/.apps/grafana/grafana.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/grafana/grafana.netmode.yml +++ b/compose/.apps/grafana/grafana.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/grafana/grafana.ports.yml b/compose/.apps/grafana/grafana.ports.yml index 40e1a7dee8..ba1bfa6d83 100644 --- a/compose/.apps/grafana/grafana.ports.yml +++ b/compose/.apps/grafana/grafana.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_3000}:3000 + - ${_PORT_3000}:3000 diff --git a/compose/.apps/grafana/grafana.x86_64.yml b/compose/.apps/grafana/grafana.x86_64.yml index 0afbfbd517..e50dcd8aa4 100644 --- a/compose/.apps/grafana/grafana.x86_64.yml +++ b/compose/.apps/grafana/grafana.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: grafana/grafana:${${_APPNAME_}_TAG} + : + image: grafana/grafana:${_TAG} diff --git a/compose/.apps/grafana/grafana.yml b/compose/.apps/grafana/grafana.yml index 70cf4802cd..44689fac06 100644 --- a/compose/.apps/grafana/grafana.yml +++ b/compose/.apps/grafana/grafana.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - GF_INSTALL_PLUGINS=${${_APPNAME_}_ENVIRONMENT_GF_INSTALL_PLUGINS} + - GF_INSTALL_PLUGINS=${_ENVIRONMENT_GF_INSTALL_PLUGINS} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} user: ${PUID}:${PGID} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/var/lib/grafana + - ${DOCKER_VOLUME_CONFIG}/:/var/lib/grafana - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/grocy/grocy.aarch64.yml b/compose/.apps/grocy/grocy.aarch64.yml index 7ac948a58b..eb248d07c1 100644 --- a/compose/.apps/grocy/grocy.aarch64.yml +++ b/compose/.apps/grocy/grocy.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/grocy:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/grocy:${_TAG} diff --git a/compose/.apps/grocy/grocy.hostname.yml b/compose/.apps/grocy/grocy.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/grocy/grocy.hostname.yml +++ b/compose/.apps/grocy/grocy.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/grocy/grocy.labels.yml b/compose/.apps/grocy/grocy.labels.yml index 066e95abf7..4b966df1f8 100644 --- a/compose/.apps/grocy/grocy.labels.yml +++ b/compose/.apps/grocy/grocy.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Groceries & household management" com.dockstarter.appinfo.nicename: "grocy" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_80: "8001" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_80: "8001" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/grocy/grocy.netmode.yml b/compose/.apps/grocy/grocy.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/grocy/grocy.netmode.yml +++ b/compose/.apps/grocy/grocy.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/grocy/grocy.ports.yml b/compose/.apps/grocy/grocy.ports.yml index c37afbebb5..32f14e45fb 100644 --- a/compose/.apps/grocy/grocy.ports.yml +++ b/compose/.apps/grocy/grocy.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_80}:80 diff --git a/compose/.apps/grocy/grocy.x86_64.yml b/compose/.apps/grocy/grocy.x86_64.yml index 7ac948a58b..eb248d07c1 100644 --- a/compose/.apps/grocy/grocy.x86_64.yml +++ b/compose/.apps/grocy/grocy.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/grocy:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/grocy:${_TAG} diff --git a/compose/.apps/grocy/grocy.yml b/compose/.apps/grocy/grocy.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/grocy/grocy.yml +++ b/compose/.apps/grocy/grocy.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/guacamole/guacamole.aarch64.yml b/compose/.apps/guacamole/guacamole.aarch64.yml index dea4fa209a..2b0ae48294 100644 --- a/compose/.apps/guacamole/guacamole.aarch64.yml +++ b/compose/.apps/guacamole/guacamole.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: flcontainers/guacamole:${${_APPNAME_}_TAG} + : + image: flcontainers/guacamole:${_TAG} diff --git a/compose/.apps/guacamole/guacamole.hostname.yml b/compose/.apps/guacamole/guacamole.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/guacamole/guacamole.hostname.yml +++ b/compose/.apps/guacamole/guacamole.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/guacamole/guacamole.labels.yml b/compose/.apps/guacamole/guacamole.labels.yml index f16f56b7e9..f3a2781375 100644 --- a/compose/.apps/guacamole/guacamole.labels.yml +++ b/compose/.apps/guacamole/guacamole.labels.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Web application to remote desktop" com.dockstarter.appinfo.nicename: "Guacamole" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_extensions: "" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8080: "8080" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_extensions: "" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8080: "8080" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/guacamole/guacamole.netmode.yml b/compose/.apps/guacamole/guacamole.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/guacamole/guacamole.netmode.yml +++ b/compose/.apps/guacamole/guacamole.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/guacamole/guacamole.ports.yml b/compose/.apps/guacamole/guacamole.ports.yml index 7d1c7e4455..f19f4867cd 100644 --- a/compose/.apps/guacamole/guacamole.ports.yml +++ b/compose/.apps/guacamole/guacamole.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8080}:8080 + - ${_PORT_8080}:8080 diff --git a/compose/.apps/guacamole/guacamole.x86_64.yml b/compose/.apps/guacamole/guacamole.x86_64.yml index dea4fa209a..2b0ae48294 100644 --- a/compose/.apps/guacamole/guacamole.x86_64.yml +++ b/compose/.apps/guacamole/guacamole.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: flcontainers/guacamole:${${_APPNAME_}_TAG} + : + image: flcontainers/guacamole:${_TAG} diff --git a/compose/.apps/guacamole/guacamole.yml b/compose/.apps/guacamole/guacamole.yml index ef34360ec0..3abaf01b88 100644 --- a/compose/.apps/guacamole/guacamole.yml +++ b/compose/.apps/guacamole/guacamole.yml @@ -1,11 +1,11 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - EXTENSIONS=${${_APPNAME_}_ENVIRONMENT_EXTENSIONS} + - EXTENSIONS=${_ENVIRONMENT_EXTENSIONS} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/h5ai/h5ai.labels.yml b/compose/.apps/h5ai/h5ai.labels.yml index 5e0309cf02..925900c5e9 100644 --- a/compose/.apps/h5ai/h5ai.labels.yml +++ b/compose/.apps/h5ai/h5ai.labels.yml @@ -4,10 +4,10 @@ services: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Modern file indexer" com.dockstarter.appinfo.nicename: "h5ai" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8080: "8080" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_indexdir: "/mnt/h5ai" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8080: "8080" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_indexdir: "/mnt/h5ai" diff --git a/compose/.apps/h5ai/h5ai.netmode.yml b/compose/.apps/h5ai/h5ai.netmode.yml index 4ecd36ec9b..e5b08b39b4 100644 --- a/compose/.apps/h5ai/h5ai.netmode.yml +++ b/compose/.apps/h5ai/h5ai.netmode.yml @@ -1,3 +1,3 @@ services: h5ai: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/h5ai/h5ai.ports.yml b/compose/.apps/h5ai/h5ai.ports.yml index 5cd97d16f1..5d4550f126 100644 --- a/compose/.apps/h5ai/h5ai.ports.yml +++ b/compose/.apps/h5ai/h5ai.ports.yml @@ -1,4 +1,4 @@ services: h5ai: ports: - - ${${_APPNAME_}_PORT_8080}:8080 + - ${_PORT_8080}:8080 diff --git a/compose/.apps/h5ai/h5ai.x86_64.yml b/compose/.apps/h5ai/h5ai.x86_64.yml index 5c713928cd..4364eb2d59 100644 --- a/compose/.apps/h5ai/h5ai.x86_64.yml +++ b/compose/.apps/h5ai/h5ai.x86_64.yml @@ -1,3 +1,3 @@ services: h5ai: - image: bixidock/h5ai:${${_APPNAME_}_TAG} + image: bixidock/h5ai:${_TAG} diff --git a/compose/.apps/h5ai/h5ai.yml b/compose/.apps/h5ai/h5ai.yml index 33214d8c5d..87b1504fe8 100644 --- a/compose/.apps/h5ai/h5ai.yml +++ b/compose/.apps/h5ai/h5ai.yml @@ -1,10 +1,10 @@ services: h5ai: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_INDEXDIR}:/var/www + - ${_VOLUME_INDEXDIR}:/var/www diff --git a/compose/.apps/handbrake/handbrake.hostname.yml b/compose/.apps/handbrake/handbrake.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/handbrake/handbrake.hostname.yml +++ b/compose/.apps/handbrake/handbrake.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/handbrake/handbrake.labels.yml b/compose/.apps/handbrake/handbrake.labels.yml index 66b1902a6c..dc24114fb8 100644 --- a/compose/.apps/handbrake/handbrake.labels.yml +++ b/compose/.apps/handbrake/handbrake.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Tool for converting video" com.dockstarter.appinfo.nicename: "HandBrake" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_5800: "5800" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_outputdir: "/mnt/handbrake/output" - com.dockstarter.appvars.${_appname_}_volume_watchdir: "/mnt/handbrake/watch" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_5800: "5800" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_outputdir: "/mnt/handbrake/output" + com.dockstarter.appvars._volume_watchdir: "/mnt/handbrake/watch" diff --git a/compose/.apps/handbrake/handbrake.netmode.yml b/compose/.apps/handbrake/handbrake.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/handbrake/handbrake.netmode.yml +++ b/compose/.apps/handbrake/handbrake.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/handbrake/handbrake.ports.yml b/compose/.apps/handbrake/handbrake.ports.yml index e628931935..d1f47bfc16 100644 --- a/compose/.apps/handbrake/handbrake.ports.yml +++ b/compose/.apps/handbrake/handbrake.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_5800}:5800 + - ${_PORT_5800}:5800 diff --git a/compose/.apps/handbrake/handbrake.x86_64.yml b/compose/.apps/handbrake/handbrake.x86_64.yml index b2c5727935..cdd7324bc5 100644 --- a/compose/.apps/handbrake/handbrake.x86_64.yml +++ b/compose/.apps/handbrake/handbrake.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: jlesage/handbrake:${${_APPNAME_}_TAG} + : + image: jlesage/handbrake:${_TAG} diff --git a/compose/.apps/handbrake/handbrake.yml b/compose/.apps/handbrake/handbrake.yml index 497c4e3bd1..8af96baede 100644 --- a/compose/.apps/handbrake/handbrake.yml +++ b/compose/.apps/handbrake/handbrake.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - GROUP_ID=${PGID} - USER_ID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_OUTPUTDIR}:/output - - ${${_APPNAME_}_VOLUME_WATCHDIR}:/watch + - ${_VOLUME_OUTPUTDIR}:/output + - ${_VOLUME_WATCHDIR}:/watch diff --git a/compose/.apps/headphones/headphones.aarch64.yml b/compose/.apps/headphones/headphones.aarch64.yml index d628062d7c..b802b013ed 100644 --- a/compose/.apps/headphones/headphones.aarch64.yml +++ b/compose/.apps/headphones/headphones.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/headphones:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/headphones:${_TAG} diff --git a/compose/.apps/headphones/headphones.hostname.yml b/compose/.apps/headphones/headphones.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/headphones/headphones.hostname.yml +++ b/compose/.apps/headphones/headphones.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/headphones/headphones.labels.yml b/compose/.apps/headphones/headphones.labels.yml index b0d3c468c3..0949a87e52 100644 --- a/compose/.apps/headphones/headphones.labels.yml +++ b/compose/.apps/headphones/headphones.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Music PVR Client" com.dockstarter.appinfo.nicename: "Headphones" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8181: "8181" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8181: "8181" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/headphones/headphones.netmode.yml b/compose/.apps/headphones/headphones.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/headphones/headphones.netmode.yml +++ b/compose/.apps/headphones/headphones.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/headphones/headphones.ports.yml b/compose/.apps/headphones/headphones.ports.yml index be7c543d2e..c2eae44bc8 100644 --- a/compose/.apps/headphones/headphones.ports.yml +++ b/compose/.apps/headphones/headphones.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8181}:8181 + - ${_PORT_8181}:8181 diff --git a/compose/.apps/headphones/headphones.x86_64.yml b/compose/.apps/headphones/headphones.x86_64.yml index d628062d7c..b802b013ed 100644 --- a/compose/.apps/headphones/headphones.x86_64.yml +++ b/compose/.apps/headphones/headphones.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/headphones:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/headphones:${_TAG} diff --git a/compose/.apps/headphones/headphones.yml b/compose/.apps/headphones/headphones.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/headphones/headphones.yml +++ b/compose/.apps/headphones/headphones.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/heimdall/heimdall.aarch64.yml b/compose/.apps/heimdall/heimdall.aarch64.yml index fd3908df04..d7d9bbe3ca 100644 --- a/compose/.apps/heimdall/heimdall.aarch64.yml +++ b/compose/.apps/heimdall/heimdall.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/heimdall:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/heimdall:${_TAG} diff --git a/compose/.apps/heimdall/heimdall.hostname.yml b/compose/.apps/heimdall/heimdall.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/heimdall/heimdall.hostname.yml +++ b/compose/.apps/heimdall/heimdall.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/heimdall/heimdall.labels.yml b/compose/.apps/heimdall/heimdall.labels.yml index 97d26afd5e..be7c2da473 100644 --- a/compose/.apps/heimdall/heimdall.labels.yml +++ b/compose/.apps/heimdall/heimdall.labels.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Application dashboard and launcher" com.dockstarter.appinfo.nicename: "Heimdall" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_443: "447" - com.dockstarter.appvars.${_appname_}_port_80: "8002" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_443: "447" + com.dockstarter.appvars._port_80: "8002" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/heimdall/heimdall.netmode.yml b/compose/.apps/heimdall/heimdall.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/heimdall/heimdall.netmode.yml +++ b/compose/.apps/heimdall/heimdall.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/heimdall/heimdall.ports.yml b/compose/.apps/heimdall/heimdall.ports.yml index b90d412fbb..120e3121a3 100644 --- a/compose/.apps/heimdall/heimdall.ports.yml +++ b/compose/.apps/heimdall/heimdall.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_443}:443 - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_443}:443 + - ${_PORT_80}:80 diff --git a/compose/.apps/heimdall/heimdall.x86_64.yml b/compose/.apps/heimdall/heimdall.x86_64.yml index fd3908df04..d7d9bbe3ca 100644 --- a/compose/.apps/heimdall/heimdall.x86_64.yml +++ b/compose/.apps/heimdall/heimdall.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/heimdall:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/heimdall:${_TAG} diff --git a/compose/.apps/heimdall/heimdall.yml b/compose/.apps/heimdall/heimdall.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/heimdall/heimdall.yml +++ b/compose/.apps/heimdall/heimdall.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/homeassistant/homeassistant.aarch64.yml b/compose/.apps/homeassistant/homeassistant.aarch64.yml index dead196a5f..00b102e9c9 100644 --- a/compose/.apps/homeassistant/homeassistant.aarch64.yml +++ b/compose/.apps/homeassistant/homeassistant.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: homeassistant/home-assistant:${${_APPNAME_}_TAG} + : + image: homeassistant/home-assistant:${_TAG} diff --git a/compose/.apps/homeassistant/homeassistant.hostname.yml b/compose/.apps/homeassistant/homeassistant.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/homeassistant/homeassistant.hostname.yml +++ b/compose/.apps/homeassistant/homeassistant.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/homeassistant/homeassistant.labels.yml b/compose/.apps/homeassistant/homeassistant.labels.yml index 08a757e7b4..1b172d9604 100644 --- a/compose/.apps/homeassistant/homeassistant.labels.yml +++ b/compose/.apps/homeassistant/homeassistant.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Track and control all devices at home and automate control" com.dockstarter.appinfo.nicename: "HomeAssistant" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8123: "8123" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8123: "8123" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/homeassistant/homeassistant.netmode.yml b/compose/.apps/homeassistant/homeassistant.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/homeassistant/homeassistant.netmode.yml +++ b/compose/.apps/homeassistant/homeassistant.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/homeassistant/homeassistant.ports.yml b/compose/.apps/homeassistant/homeassistant.ports.yml index a75ad8e00c..4ed9c06395 100644 --- a/compose/.apps/homeassistant/homeassistant.ports.yml +++ b/compose/.apps/homeassistant/homeassistant.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8123}:8123 + - ${_PORT_8123}:8123 diff --git a/compose/.apps/homeassistant/homeassistant.x86_64.yml b/compose/.apps/homeassistant/homeassistant.x86_64.yml index dead196a5f..00b102e9c9 100644 --- a/compose/.apps/homeassistant/homeassistant.x86_64.yml +++ b/compose/.apps/homeassistant/homeassistant.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: homeassistant/home-assistant:${${_APPNAME_}_TAG} + : + image: homeassistant/home-assistant:${_TAG} diff --git a/compose/.apps/homeassistant/homeassistant.yml b/compose/.apps/homeassistant/homeassistant.yml index 52df9aac13..cb21f7d616 100644 --- a/compose/.apps/homeassistant/homeassistant.yml +++ b/compose/.apps/homeassistant/homeassistant.yml @@ -1,10 +1,10 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/homebridge/homebridge.aarch64.yml b/compose/.apps/homebridge/homebridge.aarch64.yml index 32590271eb..bca1d3b1a4 100644 --- a/compose/.apps/homebridge/homebridge.aarch64.yml +++ b/compose/.apps/homebridge/homebridge.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: homebridge/homebridge:${${_APPNAME_}_TAG} + : + image: homebridge/homebridge:${_TAG} diff --git a/compose/.apps/homebridge/homebridge.hostname.yml b/compose/.apps/homebridge/homebridge.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/homebridge/homebridge.hostname.yml +++ b/compose/.apps/homebridge/homebridge.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/homebridge/homebridge.labels.yml b/compose/.apps/homebridge/homebridge.labels.yml index 07e7f97805..2d5e89aeff 100644 --- a/compose/.apps/homebridge/homebridge.labels.yml +++ b/compose/.apps/homebridge/homebridge.labels.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Homebridge is a lightweight NodeJS server you can run on your home network that emulates the iOS HomeKit API" com.dockstarter.appinfo.nicename: "Homebridge" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_enable_avahi: "0" - com.dockstarter.appvars.${_appname_}_network_mode: "host" - com.dockstarter.appvars.${_appname_}_port_8581: "8581" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_enable_avahi: "0" + com.dockstarter.appvars._network_mode: "host" + com.dockstarter.appvars._port_8581: "8581" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/homebridge/homebridge.netmode.yml b/compose/.apps/homebridge/homebridge.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/homebridge/homebridge.netmode.yml +++ b/compose/.apps/homebridge/homebridge.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/homebridge/homebridge.ports.yml b/compose/.apps/homebridge/homebridge.ports.yml index 036ad7cb27..b5c2601217 100644 --- a/compose/.apps/homebridge/homebridge.ports.yml +++ b/compose/.apps/homebridge/homebridge.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8581}:8581 + - ${_PORT_8581}:8581 diff --git a/compose/.apps/homebridge/homebridge.x86_64.yml b/compose/.apps/homebridge/homebridge.x86_64.yml index 32590271eb..bca1d3b1a4 100644 --- a/compose/.apps/homebridge/homebridge.x86_64.yml +++ b/compose/.apps/homebridge/homebridge.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: homebridge/homebridge:${${_APPNAME_}_TAG} + : + image: homebridge/homebridge:${_TAG} diff --git a/compose/.apps/homebridge/homebridge.yml b/compose/.apps/homebridge/homebridge.yml index 1b44080bd6..b6573e72f9 100644 --- a/compose/.apps/homebridge/homebridge.yml +++ b/compose/.apps/homebridge/homebridge.yml @@ -1,11 +1,11 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - ENABLE_AVAHI=${${_APPNAME_}_ENVIRONMENT_ENABLE_AVAHI} + - ENABLE_AVAHI=${_ENVIRONMENT_ENABLE_AVAHI} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/homebridge + - ${DOCKER_VOLUME_CONFIG}/:/homebridge - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/homepage/homepage.aarch64.yml b/compose/.apps/homepage/homepage.aarch64.yml index 5b4d0ea2d4..943f04924d 100644 --- a/compose/.apps/homepage/homepage.aarch64.yml +++ b/compose/.apps/homepage/homepage.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/gethomepage/homepage:${${_APPNAME_}_TAG} + : + image: ghcr.io/gethomepage/homepage:${_TAG} diff --git a/compose/.apps/homepage/homepage.hostname.yml b/compose/.apps/homepage/homepage.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/homepage/homepage.hostname.yml +++ b/compose/.apps/homepage/homepage.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/homepage/homepage.labels.yml b/compose/.apps/homepage/homepage.labels.yml index 783ca83a37..fa3a79a8b7 100644 --- a/compose/.apps/homepage/homepage.labels.yml +++ b/compose/.apps/homepage/homepage.labels.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A highly customizable application dashboard with integrations for over 100 services" com.dockstarter.appinfo.nicename: "homepage" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "host" - com.dockstarter.appvars.${_appname_}_port_3000: "3000" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "host" + com.dockstarter.appvars._port_3000: "3000" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/homepage/homepage.netmode.yml b/compose/.apps/homepage/homepage.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/homepage/homepage.netmode.yml +++ b/compose/.apps/homepage/homepage.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/homepage/homepage.ports.yml b/compose/.apps/homepage/homepage.ports.yml index 40e1a7dee8..ba1bfa6d83 100644 --- a/compose/.apps/homepage/homepage.ports.yml +++ b/compose/.apps/homepage/homepage.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_3000}:3000 + - ${_PORT_3000}:3000 diff --git a/compose/.apps/homepage/homepage.x86_64.yml b/compose/.apps/homepage/homepage.x86_64.yml index 5b4d0ea2d4..943f04924d 100644 --- a/compose/.apps/homepage/homepage.x86_64.yml +++ b/compose/.apps/homepage/homepage.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/gethomepage/homepage:${${_APPNAME_}_TAG} + : + image: ghcr.io/gethomepage/homepage:${_TAG} diff --git a/compose/.apps/homepage/homepage.yml b/compose/.apps/homepage/homepage.yml index a2aa237bdc..5f643adf67 100644 --- a/compose/.apps/homepage/homepage.yml +++ b/compose/.apps/homepage/homepage.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/app/config + - ${DOCKER_VOLUME_CONFIG}/:/app/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock + - ${_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock diff --git a/compose/.apps/homer/homer.aarch64.yml b/compose/.apps/homer/homer.aarch64.yml index 28e6fdccc6..b06c2b6f67 100644 --- a/compose/.apps/homer/homer.aarch64.yml +++ b/compose/.apps/homer/homer.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: b4bz/homer:${${_APPNAME_}_TAG} + : + image: b4bz/homer:${_TAG} diff --git a/compose/.apps/homer/homer.hostname.yml b/compose/.apps/homer/homer.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/homer/homer.hostname.yml +++ b/compose/.apps/homer/homer.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/homer/homer.labels.yml b/compose/.apps/homer/homer.labels.yml index 5d37f820a3..b580ddb5af 100644 --- a/compose/.apps/homer/homer.labels.yml +++ b/compose/.apps/homer/homer.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A dead simple static HOMepage for your servER" com.dockstarter.appinfo.nicename: "Homer" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_init_assets: "1" - com.dockstarter.appvars.${_appname_}_environment_subfolder: "" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8080: "8080" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_init_assets: "1" + com.dockstarter.appvars._environment_subfolder: "" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8080: "8080" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/homer/homer.netmode.yml b/compose/.apps/homer/homer.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/homer/homer.netmode.yml +++ b/compose/.apps/homer/homer.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/homer/homer.ports.yml b/compose/.apps/homer/homer.ports.yml index 7d1c7e4455..f19f4867cd 100644 --- a/compose/.apps/homer/homer.ports.yml +++ b/compose/.apps/homer/homer.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8080}:8080 + - ${_PORT_8080}:8080 diff --git a/compose/.apps/homer/homer.x86_64.yml b/compose/.apps/homer/homer.x86_64.yml index 28e6fdccc6..b06c2b6f67 100644 --- a/compose/.apps/homer/homer.x86_64.yml +++ b/compose/.apps/homer/homer.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: b4bz/homer:${${_APPNAME_}_TAG} + : + image: b4bz/homer:${_TAG} diff --git a/compose/.apps/homer/homer.yml b/compose/.apps/homer/homer.yml index febf72cc5b..205d442b20 100644 --- a/compose/.apps/homer/homer.yml +++ b/compose/.apps/homer/homer.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - INIT_ASSETS=${${_APPNAME_}_ENVIRONMENT_INIT_ASSETS} + - INIT_ASSETS=${_ENVIRONMENT_INIT_ASSETS} - PGID=${PGID} - PUID=${PUID} - - SUBFOLDER=${${_APPNAME_}_ENVIRONMENT_SUBFOLDER} + - SUBFOLDER=${_ENVIRONMENT_SUBFOLDER} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/www/assets + - ${DOCKER_VOLUME_CONFIG}/:/www/assets diff --git a/compose/.apps/htpcmanager/htpcmanager.aarch64.yml b/compose/.apps/htpcmanager/htpcmanager.aarch64.yml index 31e1a1fd0a..871a04c216 100644 --- a/compose/.apps/htpcmanager/htpcmanager.aarch64.yml +++ b/compose/.apps/htpcmanager/htpcmanager.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/htpcmanager:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/htpcmanager:${_TAG} diff --git a/compose/.apps/htpcmanager/htpcmanager.hostname.yml b/compose/.apps/htpcmanager/htpcmanager.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/htpcmanager/htpcmanager.hostname.yml +++ b/compose/.apps/htpcmanager/htpcmanager.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/htpcmanager/htpcmanager.labels.yml b/compose/.apps/htpcmanager/htpcmanager.labels.yml index dfdead93b7..07e04aa067 100644 --- a/compose/.apps/htpcmanager/htpcmanager.labels.yml +++ b/compose/.apps/htpcmanager/htpcmanager.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Front end for many htpc related applications" com.dockstarter.appinfo.nicename: "HTPCManager" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8085: "8085" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8085: "8085" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/htpcmanager/htpcmanager.netmode.yml b/compose/.apps/htpcmanager/htpcmanager.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/htpcmanager/htpcmanager.netmode.yml +++ b/compose/.apps/htpcmanager/htpcmanager.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/htpcmanager/htpcmanager.ports.yml b/compose/.apps/htpcmanager/htpcmanager.ports.yml index 39ae5a919a..a47a29ef65 100644 --- a/compose/.apps/htpcmanager/htpcmanager.ports.yml +++ b/compose/.apps/htpcmanager/htpcmanager.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8085}:8085 + - ${_PORT_8085}:8085 diff --git a/compose/.apps/htpcmanager/htpcmanager.x86_64.yml b/compose/.apps/htpcmanager/htpcmanager.x86_64.yml index 31e1a1fd0a..871a04c216 100644 --- a/compose/.apps/htpcmanager/htpcmanager.x86_64.yml +++ b/compose/.apps/htpcmanager/htpcmanager.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/htpcmanager:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/htpcmanager:${_TAG} diff --git a/compose/.apps/htpcmanager/htpcmanager.yml b/compose/.apps/htpcmanager/htpcmanager.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/htpcmanager/htpcmanager.yml +++ b/compose/.apps/htpcmanager/htpcmanager.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/httpserver/httpserver.hostname.yml b/compose/.apps/httpserver/httpserver.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/httpserver/httpserver.hostname.yml +++ b/compose/.apps/httpserver/httpserver.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/httpserver/httpserver.labels.yml b/compose/.apps/httpserver/httpserver.labels.yml index e3e1e430f4..4ab3052cae 100644 --- a/compose/.apps/httpserver/httpserver.labels.yml +++ b/compose/.apps/httpserver/httpserver.labels.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "http-server is a simple binary to provide a static http server from a given folder." com.dockstarter.appinfo.nicename: "httpserver" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_file_server_color_set: "indigo-red" - com.dockstarter.appvars.${_appname_}_environment_file_server_title: "DockSTARTer" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_5000: "5000" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_html: "/mnt/html" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_file_server_color_set: "indigo-red" + com.dockstarter.appvars._environment_file_server_title: "DockSTARTer" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_5000: "5000" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_html: "/mnt/html" diff --git a/compose/.apps/httpserver/httpserver.netmode.yml b/compose/.apps/httpserver/httpserver.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/httpserver/httpserver.netmode.yml +++ b/compose/.apps/httpserver/httpserver.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/httpserver/httpserver.ports.yml b/compose/.apps/httpserver/httpserver.ports.yml index ecb732db51..fae38bc07e 100644 --- a/compose/.apps/httpserver/httpserver.ports.yml +++ b/compose/.apps/httpserver/httpserver.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_5000}:5000 + - ${_PORT_5000}:5000 diff --git a/compose/.apps/httpserver/httpserver.x86_64.yml b/compose/.apps/httpserver/httpserver.x86_64.yml index c4a0233093..2b78cb567f 100644 --- a/compose/.apps/httpserver/httpserver.x86_64.yml +++ b/compose/.apps/httpserver/httpserver.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/patrickdappollonio/docker-http-server:${${_APPNAME_}_TAG} + : + image: ghcr.io/patrickdappollonio/docker-http-server:${_TAG} diff --git a/compose/.apps/httpserver/httpserver.yml b/compose/.apps/httpserver/httpserver.yml index 75a533520c..2b4b0a55a2 100644 --- a/compose/.apps/httpserver/httpserver.yml +++ b/compose/.apps/httpserver/httpserver.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - FILE_SERVER_COLOR_SET=${${_APPNAME_}_ENVIRONMENT_FILE_SERVER_COLOR_SET} - - FILE_SERVER_TITLE=${${_APPNAME_}_ENVIRONMENT_FILE_SERVER_TITLE} + - FILE_SERVER_COLOR_SET=${_ENVIRONMENT_FILE_SERVER_COLOR_SET} + - FILE_SERVER_TITLE=${_ENVIRONMENT_FILE_SERVER_TITLE} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_HTML}:/html + - ${_VOLUME_HTML}:/html diff --git a/compose/.apps/huginn/huginn.hostname.yml b/compose/.apps/huginn/huginn.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/huginn/huginn.hostname.yml +++ b/compose/.apps/huginn/huginn.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/huginn/huginn.labels.yml b/compose/.apps/huginn/huginn.labels.yml index 758306ea72..a24964be21 100644 --- a/compose/.apps/huginn/huginn.labels.yml +++ b/compose/.apps/huginn/huginn.labels.yml @@ -1,17 +1,17 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Huginn is a system for building agents that perform automated tasks for you online." com.dockstarter.appinfo.nicename: "Huginn" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_database_host: "mariadb" - com.dockstarter.appvars.${_appname_}_environment_database_name: "huginn" - com.dockstarter.appvars.${_appname_}_environment_database_password: "" - com.dockstarter.appvars.${_appname_}_environment_database_port: "3306" - com.dockstarter.appvars.${_appname_}_environment_database_username: "huginn" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_3000: "3000" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_database_host: "mariadb" + com.dockstarter.appvars._environment_database_name: "huginn" + com.dockstarter.appvars._environment_database_password: "" + com.dockstarter.appvars._environment_database_port: "3306" + com.dockstarter.appvars._environment_database_username: "huginn" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_3000: "3000" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/huginn/huginn.netmode.yml b/compose/.apps/huginn/huginn.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/huginn/huginn.netmode.yml +++ b/compose/.apps/huginn/huginn.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/huginn/huginn.ports.yml b/compose/.apps/huginn/huginn.ports.yml index 40e1a7dee8..ba1bfa6d83 100644 --- a/compose/.apps/huginn/huginn.ports.yml +++ b/compose/.apps/huginn/huginn.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_3000}:3000 + - ${_PORT_3000}:3000 diff --git a/compose/.apps/huginn/huginn.x86_64.yml b/compose/.apps/huginn/huginn.x86_64.yml index 26d0a6fa62..b139abf545 100644 --- a/compose/.apps/huginn/huginn.x86_64.yml +++ b/compose/.apps/huginn/huginn.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: huginn/huginn:${${_APPNAME_}_TAG} + : + image: huginn/huginn:${_TAG} diff --git a/compose/.apps/huginn/huginn.yml b/compose/.apps/huginn/huginn.yml index eba583eed9..e31caaf389 100644 --- a/compose/.apps/huginn/huginn.yml +++ b/compose/.apps/huginn/huginn.yml @@ -1,16 +1,16 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - HUGINN_DATABASE_HOST=${${_APPNAME_}_ENVIRONMENT_DATABASE_HOST} - - HUGINN_DATABASE_NAME=${${_APPNAME_}_ENVIRONMENT_DATABASE_NAME} - - HUGINN_DATABASE_PASSWORD=${${_APPNAME_}_ENVIRONMENT_DATABASE_PASSWORD} - - HUGINN_DATABASE_PORT=${${_APPNAME_}_ENVIRONMENT_DATABASE_PORT} - - HUGINN_DATABASE_USERNAME=${${_APPNAME_}_ENVIRONMENT_DATABASE_USERNAME} + - HUGINN_DATABASE_HOST=${_ENVIRONMENT_DATABASE_HOST} + - HUGINN_DATABASE_NAME=${_ENVIRONMENT_DATABASE_NAME} + - HUGINN_DATABASE_PASSWORD=${_ENVIRONMENT_DATABASE_PASSWORD} + - HUGINN_DATABASE_PORT=${_ENVIRONMENT_DATABASE_PORT} + - HUGINN_DATABASE_USERNAME=${_ENVIRONMENT_DATABASE_USERNAME} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/hydra2/hydra2.aarch64.yml b/compose/.apps/hydra2/hydra2.aarch64.yml index 07cd128f98..0e7c36d3c9 100644 --- a/compose/.apps/hydra2/hydra2.aarch64.yml +++ b/compose/.apps/hydra2/hydra2.aarch64.yml @@ -1,3 +1,3 @@ services: hydra2: - image: lscr.io/linuxserver/hydra2:${${_APPNAME_}_TAG} + image: lscr.io/linuxserver/hydra2:${_TAG} diff --git a/compose/.apps/hydra2/hydra2.netmode.yml b/compose/.apps/hydra2/hydra2.netmode.yml index 46a79c72c7..6989eb8062 100644 --- a/compose/.apps/hydra2/hydra2.netmode.yml +++ b/compose/.apps/hydra2/hydra2.netmode.yml @@ -1,3 +1,3 @@ services: hydra2: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/hydra2/hydra2.ports.yml b/compose/.apps/hydra2/hydra2.ports.yml index 4ed3fe1fa6..472f3a7719 100644 --- a/compose/.apps/hydra2/hydra2.ports.yml +++ b/compose/.apps/hydra2/hydra2.ports.yml @@ -1,4 +1,4 @@ services: hydra2: ports: - - ${${_APPNAME_}_PORT_5076}:5076 + - ${_PORT_5076}:5076 diff --git a/compose/.apps/hydra2/hydra2.x86_64.yml b/compose/.apps/hydra2/hydra2.x86_64.yml index 07cd128f98..0e7c36d3c9 100644 --- a/compose/.apps/hydra2/hydra2.x86_64.yml +++ b/compose/.apps/hydra2/hydra2.x86_64.yml @@ -1,3 +1,3 @@ services: hydra2: - image: lscr.io/linuxserver/hydra2:${${_APPNAME_}_TAG} + image: lscr.io/linuxserver/hydra2:${_TAG} diff --git a/compose/.apps/hydra2/hydra2.yml b/compose/.apps/hydra2/hydra2.yml index 59409eacc0..6a7f0e911e 100644 --- a/compose/.apps/hydra2/hydra2.yml +++ b/compose/.apps/hydra2/hydra2.yml @@ -1,12 +1,12 @@ services: hydra2: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/influxdb/influxdb.aarch64.yml b/compose/.apps/influxdb/influxdb.aarch64.yml index d5e56d79c4..b2d85e4b50 100644 --- a/compose/.apps/influxdb/influxdb.aarch64.yml +++ b/compose/.apps/influxdb/influxdb.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: influxdb:${${_APPNAME_}_TAG} + : + image: influxdb:${_TAG} diff --git a/compose/.apps/influxdb/influxdb.hostname.yml b/compose/.apps/influxdb/influxdb.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/influxdb/influxdb.hostname.yml +++ b/compose/.apps/influxdb/influxdb.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/influxdb/influxdb.labels.yml b/compose/.apps/influxdb/influxdb.labels.yml index c70a073f44..62cf20c34c 100644 --- a/compose/.apps/influxdb/influxdb.labels.yml +++ b/compose/.apps/influxdb/influxdb.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Time series database for recording metrics, events, and analytics" com.dockstarter.appinfo.nicename: "InfluxDB" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8086: "8086" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "1.8" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8086: "8086" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "1.8" diff --git a/compose/.apps/influxdb/influxdb.netmode.yml b/compose/.apps/influxdb/influxdb.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/influxdb/influxdb.netmode.yml +++ b/compose/.apps/influxdb/influxdb.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/influxdb/influxdb.ports.yml b/compose/.apps/influxdb/influxdb.ports.yml index c11c0f0b5c..da2a12eed1 100644 --- a/compose/.apps/influxdb/influxdb.ports.yml +++ b/compose/.apps/influxdb/influxdb.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8086}:8086 + - ${_PORT_8086}:8086 diff --git a/compose/.apps/influxdb/influxdb.x86_64.yml b/compose/.apps/influxdb/influxdb.x86_64.yml index d5e56d79c4..b2d85e4b50 100644 --- a/compose/.apps/influxdb/influxdb.x86_64.yml +++ b/compose/.apps/influxdb/influxdb.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: influxdb:${${_APPNAME_}_TAG} + : + image: influxdb:${_TAG} diff --git a/compose/.apps/influxdb/influxdb.yml b/compose/.apps/influxdb/influxdb.yml index 686bb48562..d07fe28102 100644 --- a/compose/.apps/influxdb/influxdb.yml +++ b/compose/.apps/influxdb/influxdb.yml @@ -1,10 +1,10 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/var/lib/influxdb + - ${DOCKER_VOLUME_CONFIG}/:/var/lib/influxdb - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/jackett/jackett.aarch64.yml b/compose/.apps/jackett/jackett.aarch64.yml index a00bb83324..0093b088ff 100644 --- a/compose/.apps/jackett/jackett.aarch64.yml +++ b/compose/.apps/jackett/jackett.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/jackett:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/jackett:${_TAG} diff --git a/compose/.apps/jackett/jackett.hostname.yml b/compose/.apps/jackett/jackett.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/jackett/jackett.hostname.yml +++ b/compose/.apps/jackett/jackett.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/jackett/jackett.labels.yml b/compose/.apps/jackett/jackett.labels.yml index be0ee99bda..f53a96b327 100644 --- a/compose/.apps/jackett/jackett.labels.yml +++ b/compose/.apps/jackett/jackett.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "API Support for your favorite private trackers" com.dockstarter.appinfo.nicename: "Jackett" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_9117: "9117" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_9117: "9117" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/jackett/jackett.netmode.yml b/compose/.apps/jackett/jackett.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/jackett/jackett.netmode.yml +++ b/compose/.apps/jackett/jackett.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/jackett/jackett.ports.yml b/compose/.apps/jackett/jackett.ports.yml index 01b72573f5..5db0c2c254 100644 --- a/compose/.apps/jackett/jackett.ports.yml +++ b/compose/.apps/jackett/jackett.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_9117}:9117 + - ${_PORT_9117}:9117 diff --git a/compose/.apps/jackett/jackett.x86_64.yml b/compose/.apps/jackett/jackett.x86_64.yml index a00bb83324..0093b088ff 100644 --- a/compose/.apps/jackett/jackett.x86_64.yml +++ b/compose/.apps/jackett/jackett.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/jackett:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/jackett:${_TAG} diff --git a/compose/.apps/jackett/jackett.yml b/compose/.apps/jackett/jackett.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/jackett/jackett.yml +++ b/compose/.apps/jackett/jackett.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/jellyfin/jellyfin.aarch64.yml b/compose/.apps/jellyfin/jellyfin.aarch64.yml index 243042b538..7e765cf29c 100644 --- a/compose/.apps/jellyfin/jellyfin.aarch64.yml +++ b/compose/.apps/jellyfin/jellyfin.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/jellyfin:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/jellyfin:${_TAG} diff --git a/compose/.apps/jellyfin/jellyfin.hostname.yml b/compose/.apps/jellyfin/jellyfin.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/jellyfin/jellyfin.hostname.yml +++ b/compose/.apps/jellyfin/jellyfin.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/jellyfin/jellyfin.labels.yml b/compose/.apps/jellyfin/jellyfin.labels.yml index adc45035cb..2500ec39a5 100644 --- a/compose/.apps/jellyfin/jellyfin.labels.yml +++ b/compose/.apps/jellyfin/jellyfin.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Free Software Media Browser" com.dockstarter.appinfo.nicename: "Jellyfin" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8096: "8096" - com.dockstarter.appvars.${_appname_}_port_8920: "8920" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_transcodedir: "/tmp/jellyfin_transcode" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8096: "8096" + com.dockstarter.appvars._port_8920: "8920" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_transcodedir: "/tmp/jellyfin_transcode" diff --git a/compose/.apps/jellyfin/jellyfin.netmode.yml b/compose/.apps/jellyfin/jellyfin.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/jellyfin/jellyfin.netmode.yml +++ b/compose/.apps/jellyfin/jellyfin.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/jellyfin/jellyfin.ports.yml b/compose/.apps/jellyfin/jellyfin.ports.yml index aa8fa4bb5b..1b8e696dcd 100644 --- a/compose/.apps/jellyfin/jellyfin.ports.yml +++ b/compose/.apps/jellyfin/jellyfin.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8096}:8096 - - ${${_APPNAME_}_PORT_8920}:8920 + - ${_PORT_8096}:8096 + - ${_PORT_8920}:8920 diff --git a/compose/.apps/jellyfin/jellyfin.x86_64.yml b/compose/.apps/jellyfin/jellyfin.x86_64.yml index 243042b538..7e765cf29c 100644 --- a/compose/.apps/jellyfin/jellyfin.x86_64.yml +++ b/compose/.apps/jellyfin/jellyfin.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/jellyfin:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/jellyfin:${_TAG} diff --git a/compose/.apps/jellyfin/jellyfin.yml b/compose/.apps/jellyfin/jellyfin.yml index 18af6350da..50af244b39 100644 --- a/compose/.apps/jellyfin/jellyfin.yml +++ b/compose/.apps/jellyfin/jellyfin.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_TRANSCODEDIR}:/transcode + - ${_VOLUME_TRANSCODEDIR}:/transcode diff --git a/compose/.apps/jfago/jfago.aarch64.yml b/compose/.apps/jfago/jfago.aarch64.yml index efb9a618b6..5c927367ca 100644 --- a/compose/.apps/jfago/jfago.aarch64.yml +++ b/compose/.apps/jfago/jfago.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: hrfee/jfa-go:${${_APPNAME_}_TAG} + : + image: hrfee/jfa-go:${_TAG} diff --git a/compose/.apps/jfago/jfago.hostname.yml b/compose/.apps/jfago/jfago.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/jfago/jfago.hostname.yml +++ b/compose/.apps/jfago/jfago.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/jfago/jfago.labels.yml b/compose/.apps/jfago/jfago.labels.yml index 3f9baa6766..06d6839a0b 100644 --- a/compose/.apps/jfago/jfago.labels.yml +++ b/compose/.apps/jfago/jfago.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "User management app for Jellyfin" com.dockstarter.appinfo.nicename: "jfago" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8056: "8056" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8056: "8056" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/jfago/jfago.netmode.yml b/compose/.apps/jfago/jfago.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/jfago/jfago.netmode.yml +++ b/compose/.apps/jfago/jfago.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/jfago/jfago.ports.yml b/compose/.apps/jfago/jfago.ports.yml index 0b698991f6..1315ff5f14 100644 --- a/compose/.apps/jfago/jfago.ports.yml +++ b/compose/.apps/jfago/jfago.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8056}:8056 + - ${_PORT_8056}:8056 diff --git a/compose/.apps/jfago/jfago.x86_64.yml b/compose/.apps/jfago/jfago.x86_64.yml index efb9a618b6..5c927367ca 100644 --- a/compose/.apps/jfago/jfago.x86_64.yml +++ b/compose/.apps/jfago/jfago.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: hrfee/jfa-go:${${_APPNAME_}_TAG} + : + image: hrfee/jfa-go:${_TAG} diff --git a/compose/.apps/jfago/jfago.yml b/compose/.apps/jfago/jfago.yml index d03247fd6a..8f07846072 100644 --- a/compose/.apps/jfago/jfago.yml +++ b/compose/.apps/jfago/jfago.yml @@ -1,11 +1,11 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/app:/jf - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/:/data + - ${DOCKER_VOLUME_CONFIG}//app:/jf + - ${DOCKER_VOLUME_CONFIG}//:/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/kanboard/kanboard.aarch64.yml b/compose/.apps/kanboard/kanboard.aarch64.yml index e792bba141..1d276ee939 100644 --- a/compose/.apps/kanboard/kanboard.aarch64.yml +++ b/compose/.apps/kanboard/kanboard.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: webhippie/kanboard:${${_APPNAME_}_TAG} + : + image: webhippie/kanboard:${_TAG} diff --git a/compose/.apps/kanboard/kanboard.hostname.yml b/compose/.apps/kanboard/kanboard.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/kanboard/kanboard.hostname.yml +++ b/compose/.apps/kanboard/kanboard.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/kanboard/kanboard.labels.yml b/compose/.apps/kanboard/kanboard.labels.yml index 4a5b0afd25..6c8f095b0e 100644 --- a/compose/.apps/kanboard/kanboard.labels.yml +++ b/compose/.apps/kanboard/kanboard.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Kanboard is a free and open source Kanban project management software." com.dockstarter.appinfo.nicename: "Kanboard" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8080: "8080" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8080: "8080" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/kanboard/kanboard.netmode.yml b/compose/.apps/kanboard/kanboard.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/kanboard/kanboard.netmode.yml +++ b/compose/.apps/kanboard/kanboard.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/kanboard/kanboard.ports.yml b/compose/.apps/kanboard/kanboard.ports.yml index 7d1c7e4455..f19f4867cd 100644 --- a/compose/.apps/kanboard/kanboard.ports.yml +++ b/compose/.apps/kanboard/kanboard.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8080}:8080 + - ${_PORT_8080}:8080 diff --git a/compose/.apps/kanboard/kanboard.x86_64.yml b/compose/.apps/kanboard/kanboard.x86_64.yml index e792bba141..1d276ee939 100644 --- a/compose/.apps/kanboard/kanboard.x86_64.yml +++ b/compose/.apps/kanboard/kanboard.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: webhippie/kanboard:${${_APPNAME_}_TAG} + : + image: webhippie/kanboard:${_TAG} diff --git a/compose/.apps/kanboard/kanboard.yml b/compose/.apps/kanboard/kanboard.yml index 38f70bd240..3298df375b 100644 --- a/compose/.apps/kanboard/kanboard.yml +++ b/compose/.apps/kanboard/kanboard.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/var/www/app + - ${DOCKER_VOLUME_CONFIG}/:/var/www/app - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/kitana/kitana.aarch64.yml b/compose/.apps/kitana/kitana.aarch64.yml index 2801442139..b4ff727127 100644 --- a/compose/.apps/kitana/kitana.aarch64.yml +++ b/compose/.apps/kitana/kitana.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: pannal/kitana:${${_APPNAME_}_TAG} + : + image: pannal/kitana:${_TAG} diff --git a/compose/.apps/kitana/kitana.hostname.yml b/compose/.apps/kitana/kitana.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/kitana/kitana.hostname.yml +++ b/compose/.apps/kitana/kitana.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/kitana/kitana.labels.yml b/compose/.apps/kitana/kitana.labels.yml index 88a613e495..09528da1d8 100644 --- a/compose/.apps/kitana/kitana.labels.yml +++ b/compose/.apps/kitana/kitana.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A Plex plugin web frontend" com.dockstarter.appinfo.nicename: "Kitana" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_31337: "31337" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_31337: "31337" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/kitana/kitana.netmode.yml b/compose/.apps/kitana/kitana.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/kitana/kitana.netmode.yml +++ b/compose/.apps/kitana/kitana.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/kitana/kitana.ports.yml b/compose/.apps/kitana/kitana.ports.yml index 99a3c6c894..c63c6426fc 100644 --- a/compose/.apps/kitana/kitana.ports.yml +++ b/compose/.apps/kitana/kitana.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_31337}:31337 + - ${_PORT_31337}:31337 diff --git a/compose/.apps/kitana/kitana.x86_64.yml b/compose/.apps/kitana/kitana.x86_64.yml index 2801442139..b4ff727127 100644 --- a/compose/.apps/kitana/kitana.x86_64.yml +++ b/compose/.apps/kitana/kitana.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: pannal/kitana:${${_APPNAME_}_TAG} + : + image: pannal/kitana:${_TAG} diff --git a/compose/.apps/kitana/kitana.yml b/compose/.apps/kitana/kitana.yml index a254ee3b53..65bcdc98c5 100644 --- a/compose/.apps/kitana/kitana.yml +++ b/compose/.apps/kitana/kitana.yml @@ -1,11 +1,11 @@ services: - ${_appname_}: + : command: -B 0.0.0.0:31337 -P - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/app/data + - ${DOCKER_VOLUME_CONFIG}/:/app/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/kiwixserve/kiwixserve.aarch64.yml b/compose/.apps/kiwixserve/kiwixserve.aarch64.yml index 1c2b599a7f..afb7b93d89 100644 --- a/compose/.apps/kiwixserve/kiwixserve.aarch64.yml +++ b/compose/.apps/kiwixserve/kiwixserve.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/kiwix/kiwix-serve:${${_APPNAME_}_TAG} + : + image: ghcr.io/kiwix/kiwix-serve:${_TAG} diff --git a/compose/.apps/kiwixserve/kiwixserve.hostname.yml b/compose/.apps/kiwixserve/kiwixserve.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/kiwixserve/kiwixserve.hostname.yml +++ b/compose/.apps/kiwixserve/kiwixserve.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/kiwixserve/kiwixserve.labels.yml b/compose/.apps/kiwixserve/kiwixserve.labels.yml index d88eca116b..054e5a27f0 100644 --- a/compose/.apps/kiwixserve/kiwixserve.labels.yml +++ b/compose/.apps/kiwixserve/kiwixserve.labels.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Kiwix HTTP daemon" com.dockstarter.appinfo.nicename: "Kiwixserve" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_downloads: "https://download.kiwix.org/zim/wikipedia_en_all_maxi.zim" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_80: "80" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_downloads: "https://download.kiwix.org/zim/wikipedia_en_all_maxi.zim" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_80: "80" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/kiwixserve/kiwixserve.netmode.yml b/compose/.apps/kiwixserve/kiwixserve.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/kiwixserve/kiwixserve.netmode.yml +++ b/compose/.apps/kiwixserve/kiwixserve.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/kiwixserve/kiwixserve.ports.yml b/compose/.apps/kiwixserve/kiwixserve.ports.yml index c37afbebb5..32f14e45fb 100644 --- a/compose/.apps/kiwixserve/kiwixserve.ports.yml +++ b/compose/.apps/kiwixserve/kiwixserve.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_80}:80 diff --git a/compose/.apps/kiwixserve/kiwixserve.x86_64.yml b/compose/.apps/kiwixserve/kiwixserve.x86_64.yml index 1c2b599a7f..afb7b93d89 100644 --- a/compose/.apps/kiwixserve/kiwixserve.x86_64.yml +++ b/compose/.apps/kiwixserve/kiwixserve.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/kiwix/kiwix-serve:${${_APPNAME_}_TAG} + : + image: ghcr.io/kiwix/kiwix-serve:${_TAG} diff --git a/compose/.apps/kiwixserve/kiwixserve.yml b/compose/.apps/kiwixserve/kiwixserve.yml index 6a287f59d0..ab5533836a 100644 --- a/compose/.apps/kiwixserve/kiwixserve.yml +++ b/compose/.apps/kiwixserve/kiwixserve.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - DOWNLOAD=${${_APPNAME_}_ENVIRONMENT_DOWNLOADS} + - DOWNLOAD=${_ENVIRONMENT_DOWNLOADS} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/data + - ${DOCKER_VOLUME_CONFIG}/:/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/komga/komga.aarch64.yml b/compose/.apps/komga/komga.aarch64.yml index 29ca07fa81..73f66f953a 100644 --- a/compose/.apps/komga/komga.aarch64.yml +++ b/compose/.apps/komga/komga.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: gotson/komga:${${_APPNAME_}_TAG} + : + image: gotson/komga:${_TAG} diff --git a/compose/.apps/komga/komga.hostname.yml b/compose/.apps/komga/komga.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/komga/komga.hostname.yml +++ b/compose/.apps/komga/komga.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/komga/komga.labels.yml b/compose/.apps/komga/komga.labels.yml index bf70d97119..3e71c8758c 100644 --- a/compose/.apps/komga/komga.labels.yml +++ b/compose/.apps/komga/komga.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A media server for your comics, mangas, BDs and magazines" com.dockstarter.appinfo.nicename: "Komga" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_baseurl: "" - com.dockstarter.appvars.${_appname_}_environment_scan_cron: "0 0 */8 * * ?" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_25600: "25600" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_baseurl: "" + com.dockstarter.appvars._environment_scan_cron: "0 0 */8 * * ?" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_25600: "25600" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/komga/komga.netmode.yml b/compose/.apps/komga/komga.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/komga/komga.netmode.yml +++ b/compose/.apps/komga/komga.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/komga/komga.ports.yml b/compose/.apps/komga/komga.ports.yml index 5df5538b1a..1b2501dc1e 100644 --- a/compose/.apps/komga/komga.ports.yml +++ b/compose/.apps/komga/komga.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_25600}:25600 + - ${_PORT_25600}:25600 diff --git a/compose/.apps/komga/komga.x86_64.yml b/compose/.apps/komga/komga.x86_64.yml index 29ca07fa81..73f66f953a 100644 --- a/compose/.apps/komga/komga.x86_64.yml +++ b/compose/.apps/komga/komga.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: gotson/komga:${${_APPNAME_}_TAG} + : + image: gotson/komga:${_TAG} diff --git a/compose/.apps/komga/komga.yml b/compose/.apps/komga/komga.yml index 832c35b599..a57ff8e749 100644 --- a/compose/.apps/komga/komga.yml +++ b/compose/.apps/komga/komga.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - SERVER_SERVLET_CONTEXT_PATH=${${_APPNAME_}_ENVIRONMENT_BASEURL} - - KOMGA_LIBRARIES_SCAN_CRON=${${_APPNAME_}_ENVIRONMENT_SCAN_CRON} + - SERVER_SERVLET_CONTEXT_PATH=${_ENVIRONMENT_BASEURL} + - KOMGA_LIBRARIES_SCAN_CRON=${_ENVIRONMENT_SCAN_CRON} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} user: ${PUID}:${PGID} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/lazylibrarian/lazylibrarian.aarch64.yml b/compose/.apps/lazylibrarian/lazylibrarian.aarch64.yml index 0867b40163..b1b7420dc2 100644 --- a/compose/.apps/lazylibrarian/lazylibrarian.aarch64.yml +++ b/compose/.apps/lazylibrarian/lazylibrarian.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/lazylibrarian:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/lazylibrarian:${_TAG} diff --git a/compose/.apps/lazylibrarian/lazylibrarian.hostname.yml b/compose/.apps/lazylibrarian/lazylibrarian.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/lazylibrarian/lazylibrarian.hostname.yml +++ b/compose/.apps/lazylibrarian/lazylibrarian.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/lazylibrarian/lazylibrarian.labels.yml b/compose/.apps/lazylibrarian/lazylibrarian.labels.yml index 9f4f42295b..d180cd07ff 100644 --- a/compose/.apps/lazylibrarian/lazylibrarian.labels.yml +++ b/compose/.apps/lazylibrarian/lazylibrarian.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Book PVR Client" com.dockstarter.appinfo.nicename: "LazyLibrarian" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_5299: "5299" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_5299: "5299" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/lazylibrarian/lazylibrarian.netmode.yml b/compose/.apps/lazylibrarian/lazylibrarian.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/lazylibrarian/lazylibrarian.netmode.yml +++ b/compose/.apps/lazylibrarian/lazylibrarian.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/lazylibrarian/lazylibrarian.ports.yml b/compose/.apps/lazylibrarian/lazylibrarian.ports.yml index 6dc1692194..a71ed5b19a 100644 --- a/compose/.apps/lazylibrarian/lazylibrarian.ports.yml +++ b/compose/.apps/lazylibrarian/lazylibrarian.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_5299}:5299 + - ${_PORT_5299}:5299 diff --git a/compose/.apps/lazylibrarian/lazylibrarian.x86_64.yml b/compose/.apps/lazylibrarian/lazylibrarian.x86_64.yml index 0867b40163..b1b7420dc2 100644 --- a/compose/.apps/lazylibrarian/lazylibrarian.x86_64.yml +++ b/compose/.apps/lazylibrarian/lazylibrarian.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/lazylibrarian:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/lazylibrarian:${_TAG} diff --git a/compose/.apps/lazylibrarian/lazylibrarian.yml b/compose/.apps/lazylibrarian/lazylibrarian.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/lazylibrarian/lazylibrarian.yml +++ b/compose/.apps/lazylibrarian/lazylibrarian.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/ldapauth/ldapauth.aarch64.yml b/compose/.apps/ldapauth/ldapauth.aarch64.yml index d4bddf038c..7faad4b5a3 100644 --- a/compose/.apps/ldapauth/ldapauth.aarch64.yml +++ b/compose/.apps/ldapauth/ldapauth.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/ldap-auth:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/ldap-auth:${_TAG} diff --git a/compose/.apps/ldapauth/ldapauth.hostname.yml b/compose/.apps/ldapauth/ldapauth.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/ldapauth/ldapauth.hostname.yml +++ b/compose/.apps/ldapauth/ldapauth.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/ldapauth/ldapauth.labels.yml b/compose/.apps/ldapauth/ldapauth.labels.yml index 36d8bc54ee..b001006bfd 100644 --- a/compose/.apps/ldapauth/ldapauth.labels.yml +++ b/compose/.apps/ldapauth/ldapauth.labels.yml @@ -1,16 +1,16 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Ldap-auth software is for authenticating users who request protected resources from servers proxied by nginx." com.dockstarter.appinfo.nicename: "ldapauth" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_certfile: "" - com.dockstarter.appvars.${_appname_}_environment_fernetkey: "" - com.dockstarter.appvars.${_appname_}_environment_keyfile: "" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8888: "8888" - com.dockstarter.appvars.${_appname_}_port_9000: "9000" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_certfile: "" + com.dockstarter.appvars._environment_fernetkey: "" + com.dockstarter.appvars._environment_keyfile: "" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8888: "8888" + com.dockstarter.appvars._port_9000: "9000" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/ldapauth/ldapauth.netmode.yml b/compose/.apps/ldapauth/ldapauth.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/ldapauth/ldapauth.netmode.yml +++ b/compose/.apps/ldapauth/ldapauth.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/ldapauth/ldapauth.ports.yml b/compose/.apps/ldapauth/ldapauth.ports.yml index 4999480ff7..99acfd3159 100644 --- a/compose/.apps/ldapauth/ldapauth.ports.yml +++ b/compose/.apps/ldapauth/ldapauth.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8888}:8888 - - ${${_APPNAME_}_PORT_9000}:9000 + - ${_PORT_8888}:8888 + - ${_PORT_9000}:9000 diff --git a/compose/.apps/ldapauth/ldapauth.x86_64.yml b/compose/.apps/ldapauth/ldapauth.x86_64.yml index d4bddf038c..7faad4b5a3 100644 --- a/compose/.apps/ldapauth/ldapauth.x86_64.yml +++ b/compose/.apps/ldapauth/ldapauth.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/ldap-auth:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/ldap-auth:${_TAG} diff --git a/compose/.apps/ldapauth/ldapauth.yml b/compose/.apps/ldapauth/ldapauth.yml index ff1e454793..5ed1a4e4be 100644 --- a/compose/.apps/ldapauth/ldapauth.yml +++ b/compose/.apps/ldapauth/ldapauth.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - CERTFILE=${${_APPNAME_}_ENVIRONMENT_CERTFILE} - - FERNETKEY=${${_APPNAME_}_ENVIRONMENT_FERNETKEY} - - KEYFILE=${${_APPNAME_}_ENVIRONMENT_KEYFILE} + - CERTFILE=${_ENVIRONMENT_CERTFILE} + - FERNETKEY=${_ENVIRONMENT_FERNETKEY} + - KEYFILE=${_ENVIRONMENT_KEYFILE} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/letsencrypt/letsencrypt.aarch64.yml b/compose/.apps/letsencrypt/letsencrypt.aarch64.yml index 7b52412fe1..cfab9a634a 100644 --- a/compose/.apps/letsencrypt/letsencrypt.aarch64.yml +++ b/compose/.apps/letsencrypt/letsencrypt.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/letsencrypt:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/letsencrypt:${_TAG} diff --git a/compose/.apps/letsencrypt/letsencrypt.hostname.yml b/compose/.apps/letsencrypt/letsencrypt.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/letsencrypt/letsencrypt.hostname.yml +++ b/compose/.apps/letsencrypt/letsencrypt.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/letsencrypt/letsencrypt.labels.yml b/compose/.apps/letsencrypt/letsencrypt.labels.yml index 918a2f712a..cff0b1e563 100644 --- a/compose/.apps/letsencrypt/letsencrypt.labels.yml +++ b/compose/.apps/letsencrypt/letsencrypt.labels.yml @@ -1,21 +1,21 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) Use SWAG" com.dockstarter.appinfo.nicename: "LetsEncrypt" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_dnsplugin: "" - com.dockstarter.appvars.${_appname_}_environment_duckdnstoken: "" - com.dockstarter.appvars.${_appname_}_environment_email: "" - com.dockstarter.appvars.${_appname_}_environment_extra_domains: "" - com.dockstarter.appvars.${_appname_}_environment_only_subdomains: "false" - com.dockstarter.appvars.${_appname_}_environment_subdomains: "www" - com.dockstarter.appvars.${_appname_}_environment_url: "" - com.dockstarter.appvars.${_appname_}_environment_validation: "http" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_443: "443" - com.dockstarter.appvars.${_appname_}_port_80: "80" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_dnsplugin: "" + com.dockstarter.appvars._environment_duckdnstoken: "" + com.dockstarter.appvars._environment_email: "" + com.dockstarter.appvars._environment_extra_domains: "" + com.dockstarter.appvars._environment_only_subdomains: "false" + com.dockstarter.appvars._environment_subdomains: "www" + com.dockstarter.appvars._environment_url: "" + com.dockstarter.appvars._environment_validation: "http" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_443: "443" + com.dockstarter.appvars._port_80: "80" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/letsencrypt/letsencrypt.netmode.yml b/compose/.apps/letsencrypt/letsencrypt.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/letsencrypt/letsencrypt.netmode.yml +++ b/compose/.apps/letsencrypt/letsencrypt.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/letsencrypt/letsencrypt.ports.yml b/compose/.apps/letsencrypt/letsencrypt.ports.yml index b90d412fbb..120e3121a3 100644 --- a/compose/.apps/letsencrypt/letsencrypt.ports.yml +++ b/compose/.apps/letsencrypt/letsencrypt.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_443}:443 - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_443}:443 + - ${_PORT_80}:80 diff --git a/compose/.apps/letsencrypt/letsencrypt.x86_64.yml b/compose/.apps/letsencrypt/letsencrypt.x86_64.yml index 7b52412fe1..cfab9a634a 100644 --- a/compose/.apps/letsencrypt/letsencrypt.x86_64.yml +++ b/compose/.apps/letsencrypt/letsencrypt.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/letsencrypt:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/letsencrypt:${_TAG} diff --git a/compose/.apps/letsencrypt/letsencrypt.yml b/compose/.apps/letsencrypt/letsencrypt.yml index 1325d14f1a..292bb14bba 100644 --- a/compose/.apps/letsencrypt/letsencrypt.yml +++ b/compose/.apps/letsencrypt/letsencrypt.yml @@ -1,22 +1,22 @@ services: - ${_appname_}: + : cap_add: - NET_ADMIN - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} environment: - - DNSPLUGIN=${${_APPNAME_}_ENVIRONMENT_DNSPLUGIN} - - DUCKDNSTOKEN=${${_APPNAME_}_ENVIRONMENT_DUCKDNSTOKEN} - - EMAIL=${${_APPNAME_}_ENVIRONMENT_EMAIL} - - EXTRA_DOMAINS=${${_APPNAME_}_ENVIRONMENT_EXTRA_DOMAINS} - - ONLY_SUBDOMAINS=${${_APPNAME_}_ENVIRONMENT_ONLY_SUBDOMAINS} + - DNSPLUGIN=${_ENVIRONMENT_DNSPLUGIN} + - DUCKDNSTOKEN=${_ENVIRONMENT_DUCKDNSTOKEN} + - EMAIL=${_ENVIRONMENT_EMAIL} + - EXTRA_DOMAINS=${_ENVIRONMENT_EXTRA_DOMAINS} + - ONLY_SUBDOMAINS=${_ENVIRONMENT_ONLY_SUBDOMAINS} - PGID=${PGID} - PUID=${PUID} - - SUBDOMAINS=${${_APPNAME_}_ENVIRONMENT_SUBDOMAINS} + - SUBDOMAINS=${_ENVIRONMENT_SUBDOMAINS} - TZ=${TZ} - - URL=${${_APPNAME_}_ENVIRONMENT_URL} - - VALIDATION=${${_APPNAME_}_ENVIRONMENT_VALIDATION} - restart: ${${_APPNAME_}_RESTART} + - URL=${_ENVIRONMENT_URL} + - VALIDATION=${_ENVIRONMENT_VALIDATION} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/librespeed/librespeed.aarch64.yml b/compose/.apps/librespeed/librespeed.aarch64.yml index fc3a5f2cac..e56bd3feaa 100644 --- a/compose/.apps/librespeed/librespeed.aarch64.yml +++ b/compose/.apps/librespeed/librespeed.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/librespeed:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/librespeed:${_TAG} diff --git a/compose/.apps/librespeed/librespeed.hostname.yml b/compose/.apps/librespeed/librespeed.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/librespeed/librespeed.hostname.yml +++ b/compose/.apps/librespeed/librespeed.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/librespeed/librespeed.labels.yml b/compose/.apps/librespeed/librespeed.labels.yml index 71247ec8f0..372d0322f2 100644 --- a/compose/.apps/librespeed/librespeed.labels.yml +++ b/compose/.apps/librespeed/librespeed.labels.yml @@ -1,18 +1,18 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Lightweight Speedtest implementation" com.dockstarter.appinfo.nicename: "LibreSpeed" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_db_hostname: "" - com.dockstarter.appvars.${_appname_}_environment_db_name: "" - com.dockstarter.appvars.${_appname_}_environment_db_password: "" - com.dockstarter.appvars.${_appname_}_environment_db_type: "sqlite" - com.dockstarter.appvars.${_appname_}_environment_db_username: "" - com.dockstarter.appvars.${_appname_}_environment_password: "" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_80: "8013" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_db_hostname: "" + com.dockstarter.appvars._environment_db_name: "" + com.dockstarter.appvars._environment_db_password: "" + com.dockstarter.appvars._environment_db_type: "sqlite" + com.dockstarter.appvars._environment_db_username: "" + com.dockstarter.appvars._environment_password: "" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_80: "8013" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/librespeed/librespeed.netmode.yml b/compose/.apps/librespeed/librespeed.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/librespeed/librespeed.netmode.yml +++ b/compose/.apps/librespeed/librespeed.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/librespeed/librespeed.ports.yml b/compose/.apps/librespeed/librespeed.ports.yml index c37afbebb5..32f14e45fb 100644 --- a/compose/.apps/librespeed/librespeed.ports.yml +++ b/compose/.apps/librespeed/librespeed.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_80}:80 diff --git a/compose/.apps/librespeed/librespeed.x86_64.yml b/compose/.apps/librespeed/librespeed.x86_64.yml index fc3a5f2cac..e56bd3feaa 100644 --- a/compose/.apps/librespeed/librespeed.x86_64.yml +++ b/compose/.apps/librespeed/librespeed.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/librespeed:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/librespeed:${_TAG} diff --git a/compose/.apps/librespeed/librespeed.yml b/compose/.apps/librespeed/librespeed.yml index 545cf1704b..6967adfbe3 100644 --- a/compose/.apps/librespeed/librespeed.yml +++ b/compose/.apps/librespeed/librespeed.yml @@ -1,18 +1,18 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - DB_HOSTNAME=${${_APPNAME_}_ENVIRONMENT_DB_HOSTNAME} - - DB_NAME=${${_APPNAME_}_ENVIRONMENT_DB_NAME} - - DB_PASSWORD=${${_APPNAME_}_ENVIRONMENT_DB_PASSWORD} - - DB_TYPE=${${_APPNAME_}_ENVIRONMENT_DB_TYPE} - - DB_USERNAME=${${_APPNAME_}_ENVIRONMENT_DB_USERNAME} - - PASSWORD=${${_APPNAME_}_ENVIRONMENT_PASSWORD} + - DB_HOSTNAME=${_ENVIRONMENT_DB_HOSTNAME} + - DB_NAME=${_ENVIRONMENT_DB_NAME} + - DB_PASSWORD=${_ENVIRONMENT_DB_PASSWORD} + - DB_TYPE=${_ENVIRONMENT_DB_TYPE} + - DB_USERNAME=${_ENVIRONMENT_DB_USERNAME} + - PASSWORD=${_ENVIRONMENT_PASSWORD} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/lidarr/lidarr.aarch64.yml b/compose/.apps/lidarr/lidarr.aarch64.yml index da99a08cce..9c87861540 100644 --- a/compose/.apps/lidarr/lidarr.aarch64.yml +++ b/compose/.apps/lidarr/lidarr.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/lidarr:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/lidarr:${_TAG} diff --git a/compose/.apps/lidarr/lidarr.hostname.yml b/compose/.apps/lidarr/lidarr.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/lidarr/lidarr.hostname.yml +++ b/compose/.apps/lidarr/lidarr.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/lidarr/lidarr.labels.yml b/compose/.apps/lidarr/lidarr.labels.yml index 7c7252baac..ac032da4f4 100644 --- a/compose/.apps/lidarr/lidarr.labels.yml +++ b/compose/.apps/lidarr/lidarr.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Music download manager for Usenet and BitTorrent users" com.dockstarter.appinfo.nicename: "Lidarr" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8686: "8686" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8686: "8686" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/lidarr/lidarr.netmode.yml b/compose/.apps/lidarr/lidarr.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/lidarr/lidarr.netmode.yml +++ b/compose/.apps/lidarr/lidarr.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/lidarr/lidarr.ports.yml b/compose/.apps/lidarr/lidarr.ports.yml index ee44d1ed7d..69a60f5852 100644 --- a/compose/.apps/lidarr/lidarr.ports.yml +++ b/compose/.apps/lidarr/lidarr.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8686}:8686 + - ${_PORT_8686}:8686 diff --git a/compose/.apps/lidarr/lidarr.x86_64.yml b/compose/.apps/lidarr/lidarr.x86_64.yml index da99a08cce..9c87861540 100644 --- a/compose/.apps/lidarr/lidarr.x86_64.yml +++ b/compose/.apps/lidarr/lidarr.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/lidarr:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/lidarr:${_TAG} diff --git a/compose/.apps/lidarr/lidarr.yml b/compose/.apps/lidarr/lidarr.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/lidarr/lidarr.yml +++ b/compose/.apps/lidarr/lidarr.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/limnoria/limnoria.aarch64.yml b/compose/.apps/limnoria/limnoria.aarch64.yml index 812350188a..421a247f55 100644 --- a/compose/.apps/limnoria/limnoria.aarch64.yml +++ b/compose/.apps/limnoria/limnoria.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/limnoria:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/limnoria:${_TAG} diff --git a/compose/.apps/limnoria/limnoria.hostname.yml b/compose/.apps/limnoria/limnoria.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/limnoria/limnoria.hostname.yml +++ b/compose/.apps/limnoria/limnoria.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/limnoria/limnoria.labels.yml b/compose/.apps/limnoria/limnoria.labels.yml index 7fa3d81f5b..2b607b7cb7 100644 --- a/compose/.apps/limnoria/limnoria.labels.yml +++ b/compose/.apps/limnoria/limnoria.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "User/programmer-friendly IRC bot" com.dockstarter.appinfo.nicename: "Limnoria" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8080: "8080" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8080: "8080" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/limnoria/limnoria.netmode.yml b/compose/.apps/limnoria/limnoria.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/limnoria/limnoria.netmode.yml +++ b/compose/.apps/limnoria/limnoria.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/limnoria/limnoria.ports.yml b/compose/.apps/limnoria/limnoria.ports.yml index 7d1c7e4455..f19f4867cd 100644 --- a/compose/.apps/limnoria/limnoria.ports.yml +++ b/compose/.apps/limnoria/limnoria.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8080}:8080 + - ${_PORT_8080}:8080 diff --git a/compose/.apps/limnoria/limnoria.x86_64.yml b/compose/.apps/limnoria/limnoria.x86_64.yml index 812350188a..421a247f55 100644 --- a/compose/.apps/limnoria/limnoria.x86_64.yml +++ b/compose/.apps/limnoria/limnoria.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/limnoria:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/limnoria:${_TAG} diff --git a/compose/.apps/limnoria/limnoria.yml b/compose/.apps/limnoria/limnoria.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/limnoria/limnoria.yml +++ b/compose/.apps/limnoria/limnoria.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/logarr/logarr.hostname.yml b/compose/.apps/logarr/logarr.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/logarr/logarr.hostname.yml +++ b/compose/.apps/logarr/logarr.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/logarr/logarr.labels.yml b/compose/.apps/logarr/logarr.labels.yml index c8cd50573d..55ce8a33b9 100644 --- a/compose/.apps/logarr/logarr.labels.yml +++ b/compose/.apps/logarr/logarr.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Self-hosted, single-page, log consolidation tool" com.dockstarter.appinfo.nicename: "Logarr" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_80: "8003" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_80: "8003" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/logarr/logarr.netmode.yml b/compose/.apps/logarr/logarr.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/logarr/logarr.netmode.yml +++ b/compose/.apps/logarr/logarr.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/logarr/logarr.ports.yml b/compose/.apps/logarr/logarr.ports.yml index c37afbebb5..32f14e45fb 100644 --- a/compose/.apps/logarr/logarr.ports.yml +++ b/compose/.apps/logarr/logarr.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_80}:80 diff --git a/compose/.apps/logarr/logarr.x86_64.yml b/compose/.apps/logarr/logarr.x86_64.yml index 8fad4f4d36..9ddb2acdb0 100644 --- a/compose/.apps/logarr/logarr.x86_64.yml +++ b/compose/.apps/logarr/logarr.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: monitorr/logarr:${${_APPNAME_}_TAG} + : + image: monitorr/logarr:${_TAG} diff --git a/compose/.apps/logarr/logarr.yml b/compose/.apps/logarr/logarr.yml index 1400b8ff07..d2ca52920c 100644 --- a/compose/.apps/logarr/logarr.yml +++ b/compose/.apps/logarr/logarr.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_CONFIG}:/var/log/logarrlogs:ro - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/logitechmediaserver/logitechmediaserver.aarch64.yml b/compose/.apps/logitechmediaserver/logitechmediaserver.aarch64.yml index c64fbda26f..399ed37d82 100644 --- a/compose/.apps/logitechmediaserver/logitechmediaserver.aarch64.yml +++ b/compose/.apps/logitechmediaserver/logitechmediaserver.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lmscommunity/logitechmediaserver:${${_APPNAME_}_TAG} + : + image: lmscommunity/logitechmediaserver:${_TAG} diff --git a/compose/.apps/logitechmediaserver/logitechmediaserver.hostname.yml b/compose/.apps/logitechmediaserver/logitechmediaserver.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/logitechmediaserver/logitechmediaserver.hostname.yml +++ b/compose/.apps/logitechmediaserver/logitechmediaserver.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/logitechmediaserver/logitechmediaserver.labels.yml b/compose/.apps/logitechmediaserver/logitechmediaserver.labels.yml index 2e9b6965b1..b8de427c77 100644 --- a/compose/.apps/logitechmediaserver/logitechmediaserver.labels.yml +++ b/compose/.apps/logitechmediaserver/logitechmediaserver.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "LogitechMediaServer(SqueezeBox)" com.dockstarter.appinfo.nicename: "LogitechMediaServer" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_3483: "3483" - com.dockstarter.appvars.${_appname_}_port_9000: "9000" - com.dockstarter.appvars.${_appname_}_port_9090: "9090" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_3483: "3483" + com.dockstarter.appvars._port_9000: "9000" + com.dockstarter.appvars._port_9090: "9090" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/logitechmediaserver/logitechmediaserver.netmode.yml b/compose/.apps/logitechmediaserver/logitechmediaserver.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/logitechmediaserver/logitechmediaserver.netmode.yml +++ b/compose/.apps/logitechmediaserver/logitechmediaserver.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/logitechmediaserver/logitechmediaserver.ports.yml b/compose/.apps/logitechmediaserver/logitechmediaserver.ports.yml index 0838244555..0c166fbf2b 100644 --- a/compose/.apps/logitechmediaserver/logitechmediaserver.ports.yml +++ b/compose/.apps/logitechmediaserver/logitechmediaserver.ports.yml @@ -1,7 +1,7 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_3483}:3483 - - ${${_APPNAME_}_PORT_3483}:3483/udp - - ${${_APPNAME_}_PORT_9000}:9000 - - ${${_APPNAME_}_PORT_9090}:9090 + - ${_PORT_3483}:3483 + - ${_PORT_3483}:3483/udp + - ${_PORT_9000}:9000 + - ${_PORT_9090}:9090 diff --git a/compose/.apps/logitechmediaserver/logitechmediaserver.x86_64.yml b/compose/.apps/logitechmediaserver/logitechmediaserver.x86_64.yml index c64fbda26f..399ed37d82 100644 --- a/compose/.apps/logitechmediaserver/logitechmediaserver.x86_64.yml +++ b/compose/.apps/logitechmediaserver/logitechmediaserver.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lmscommunity/logitechmediaserver:${${_APPNAME_}_TAG} + : + image: lmscommunity/logitechmediaserver:${_TAG} diff --git a/compose/.apps/logitechmediaserver/logitechmediaserver.yml b/compose/.apps/logitechmediaserver/logitechmediaserver.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/logitechmediaserver/logitechmediaserver.yml +++ b/compose/.apps/logitechmediaserver/logitechmediaserver.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/makemkv/makemkv.hostname.yml b/compose/.apps/makemkv/makemkv.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/makemkv/makemkv.hostname.yml +++ b/compose/.apps/makemkv/makemkv.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/makemkv/makemkv.labels.yml b/compose/.apps/makemkv/makemkv.labels.yml index 80619c7f76..bd9d81f308 100644 --- a/compose/.apps/makemkv/makemkv.labels.yml +++ b/compose/.apps/makemkv/makemkv.labels.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Convert video that you own into free and patents-unencumbered format" com.dockstarter.appinfo.nicename: "MakeMKV" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_5800: "5800" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_outputdir: "/mnt/makemkv/output" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_5800: "5800" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_outputdir: "/mnt/makemkv/output" diff --git a/compose/.apps/makemkv/makemkv.netmode.yml b/compose/.apps/makemkv/makemkv.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/makemkv/makemkv.netmode.yml +++ b/compose/.apps/makemkv/makemkv.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/makemkv/makemkv.ports.yml b/compose/.apps/makemkv/makemkv.ports.yml index e628931935..d1f47bfc16 100644 --- a/compose/.apps/makemkv/makemkv.ports.yml +++ b/compose/.apps/makemkv/makemkv.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_5800}:5800 + - ${_PORT_5800}:5800 diff --git a/compose/.apps/makemkv/makemkv.x86_64.yml b/compose/.apps/makemkv/makemkv.x86_64.yml index c106500515..5d3111ca65 100644 --- a/compose/.apps/makemkv/makemkv.x86_64.yml +++ b/compose/.apps/makemkv/makemkv.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: jlesage/makemkv:${${_APPNAME_}_TAG} + : + image: jlesage/makemkv:${_TAG} diff --git a/compose/.apps/makemkv/makemkv.yml b/compose/.apps/makemkv/makemkv.yml index a5ca0990ed..7ad886e5a7 100644 --- a/compose/.apps/makemkv/makemkv.yml +++ b/compose/.apps/makemkv/makemkv.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - GROUP_ID=${PGID} - USER_ID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_OUTPUTDIR}:/output + - ${_VOLUME_OUTPUTDIR}:/output diff --git a/compose/.apps/mariadb/mariadb.aarch64.yml b/compose/.apps/mariadb/mariadb.aarch64.yml index 6b52ed3b07..dbf637a314 100644 --- a/compose/.apps/mariadb/mariadb.aarch64.yml +++ b/compose/.apps/mariadb/mariadb.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/mariadb:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/mariadb:${_TAG} diff --git a/compose/.apps/mariadb/mariadb.hostname.yml b/compose/.apps/mariadb/mariadb.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/mariadb/mariadb.hostname.yml +++ b/compose/.apps/mariadb/mariadb.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/mariadb/mariadb.labels.yml b/compose/.apps/mariadb/mariadb.labels.yml index b61c5d85b7..dfc7a20006 100644 --- a/compose/.apps/mariadb/mariadb.labels.yml +++ b/compose/.apps/mariadb/mariadb.labels.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "One of the most popular database servers" com.dockstarter.appinfo.nicename: "MariaDB" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_mysql_root_password: "" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_3306: "3306" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_mysql_root_password: "" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_3306: "3306" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/mariadb/mariadb.netmode.yml b/compose/.apps/mariadb/mariadb.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/mariadb/mariadb.netmode.yml +++ b/compose/.apps/mariadb/mariadb.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/mariadb/mariadb.ports.yml b/compose/.apps/mariadb/mariadb.ports.yml index 19490f3d1c..128eadf0d5 100644 --- a/compose/.apps/mariadb/mariadb.ports.yml +++ b/compose/.apps/mariadb/mariadb.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_3306}:3306 + - ${_PORT_3306}:3306 diff --git a/compose/.apps/mariadb/mariadb.x86_64.yml b/compose/.apps/mariadb/mariadb.x86_64.yml index 6b52ed3b07..dbf637a314 100644 --- a/compose/.apps/mariadb/mariadb.x86_64.yml +++ b/compose/.apps/mariadb/mariadb.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/mariadb:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/mariadb:${_TAG} diff --git a/compose/.apps/mariadb/mariadb.yml b/compose/.apps/mariadb/mariadb.yml index 1c796584ad..e821331ddc 100644 --- a/compose/.apps/mariadb/mariadb.yml +++ b/compose/.apps/mariadb/mariadb.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - MYSQL_ROOT_PASSWORD=${${_APPNAME_}_ENVIRONMENT_MYSQL_ROOT_PASSWORD} + - MYSQL_ROOT_PASSWORD=${_ENVIRONMENT_MYSQL_ROOT_PASSWORD} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/mcmyadmin2/mcmyadmin2.netmode.yml b/compose/.apps/mcmyadmin2/mcmyadmin2.netmode.yml index 5e949eeccf..8d2e142fa4 100644 --- a/compose/.apps/mcmyadmin2/mcmyadmin2.netmode.yml +++ b/compose/.apps/mcmyadmin2/mcmyadmin2.netmode.yml @@ -1,3 +1,3 @@ services: mcmyadmin2: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/mcmyadmin2/mcmyadmin2.ports.yml b/compose/.apps/mcmyadmin2/mcmyadmin2.ports.yml index 742bd0c3e8..132198f45c 100644 --- a/compose/.apps/mcmyadmin2/mcmyadmin2.ports.yml +++ b/compose/.apps/mcmyadmin2/mcmyadmin2.ports.yml @@ -1,5 +1,5 @@ services: mcmyadmin2: ports: - - ${${_APPNAME_}_PORT_25565}:25565 - - ${${_APPNAME_}_PORT_8080}:8080 + - ${_PORT_25565}:25565 + - ${_PORT_8080}:8080 diff --git a/compose/.apps/mcmyadmin2/mcmyadmin2.x86_64.yml b/compose/.apps/mcmyadmin2/mcmyadmin2.x86_64.yml index 9a7f45e9c6..907b4849b5 100644 --- a/compose/.apps/mcmyadmin2/mcmyadmin2.x86_64.yml +++ b/compose/.apps/mcmyadmin2/mcmyadmin2.x86_64.yml @@ -1,3 +1,3 @@ services: mcmyadmin2: - image: lscr.io/linuxserver/mcmyadmin2:${${_APPNAME_}_TAG} + image: lscr.io/linuxserver/mcmyadmin2:${_TAG} diff --git a/compose/.apps/mcmyadmin2/mcmyadmin2.yml b/compose/.apps/mcmyadmin2/mcmyadmin2.yml index af145fd62e..192ec0db36 100644 --- a/compose/.apps/mcmyadmin2/mcmyadmin2.yml +++ b/compose/.apps/mcmyadmin2/mcmyadmin2.yml @@ -1,12 +1,12 @@ services: mcmyadmin2: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/minecraft + - ${DOCKER_VOLUME_CONFIG}/:/minecraft - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/medusa/medusa.aarch64.yml b/compose/.apps/medusa/medusa.aarch64.yml index 65e886cfac..a3d9b3a41e 100644 --- a/compose/.apps/medusa/medusa.aarch64.yml +++ b/compose/.apps/medusa/medusa.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/medusa:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/medusa:${_TAG} diff --git a/compose/.apps/medusa/medusa.hostname.yml b/compose/.apps/medusa/medusa.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/medusa/medusa.hostname.yml +++ b/compose/.apps/medusa/medusa.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/medusa/medusa.labels.yml b/compose/.apps/medusa/medusa.labels.yml index 0aa6758566..3a64223d87 100644 --- a/compose/.apps/medusa/medusa.labels.yml +++ b/compose/.apps/medusa/medusa.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Automatic Video Library Manager for TV Shows" com.dockstarter.appinfo.nicename: "Medusa" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8081: "8081" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8081: "8081" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/medusa/medusa.netmode.yml b/compose/.apps/medusa/medusa.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/medusa/medusa.netmode.yml +++ b/compose/.apps/medusa/medusa.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/medusa/medusa.ports.yml b/compose/.apps/medusa/medusa.ports.yml index b70b0fc494..52e7bd8a46 100644 --- a/compose/.apps/medusa/medusa.ports.yml +++ b/compose/.apps/medusa/medusa.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8081}:8081 + - ${_PORT_8081}:8081 diff --git a/compose/.apps/medusa/medusa.x86_64.yml b/compose/.apps/medusa/medusa.x86_64.yml index 65e886cfac..a3d9b3a41e 100644 --- a/compose/.apps/medusa/medusa.x86_64.yml +++ b/compose/.apps/medusa/medusa.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/medusa:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/medusa:${_TAG} diff --git a/compose/.apps/medusa/medusa.yml b/compose/.apps/medusa/medusa.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/medusa/medusa.yml +++ b/compose/.apps/medusa/medusa.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.hostname.yml b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.hostname.yml +++ b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.labels.yml b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.labels.yml index fb0ede289e..e5877d1071 100644 --- a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.labels.yml +++ b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Minecraft Bedrock Server" com.dockstarter.appinfo.nicename: "MinecraftBedrockServer" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_eula: "TRUE" - com.dockstarter.appvars.${_appname_}_environment_version: "LATEST" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_19132: "19132" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_eula: "TRUE" + com.dockstarter.appvars._environment_version: "LATEST" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_19132: "19132" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.netmode.yml b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.netmode.yml +++ b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.ports.yml b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.ports.yml index 9034cc977d..2909ccdb18 100644 --- a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.ports.yml +++ b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_19132}:19132/udp + - ${_PORT_19132}:19132/udp diff --git a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.x86_64.yml b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.x86_64.yml index c15956af44..18db699408 100644 --- a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.x86_64.yml +++ b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: itzg/minecraft-bedrock-server:${${_APPNAME_}_TAG} + : + image: itzg/minecraft-bedrock-server:${_TAG} diff --git a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.yml b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.yml index dcd90fa040..c3bc1a6a88 100644 --- a/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.yml +++ b/compose/.apps/minecraftbedrockserver/minecraftbedrockserver.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - EULA=${${_APPNAME_}_ENVIRONMENT_EULA} + - EULA=${_ENVIRONMENT_EULA} - GID=${PGID} - TZ=${TZ} - UID=${PUID} - - VERSION=${${_APPNAME_}_ENVIRONMENT_VERSION} - restart: ${${_APPNAME_}_RESTART} + - VERSION=${_ENVIRONMENT_VERSION} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/data + - ${DOCKER_VOLUME_CONFIG}/:/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/minecraftserver/minecraftserver.aarch64.yml b/compose/.apps/minecraftserver/minecraftserver.aarch64.yml index 4799fb995e..617884d2eb 100644 --- a/compose/.apps/minecraftserver/minecraftserver.aarch64.yml +++ b/compose/.apps/minecraftserver/minecraftserver.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: itzg/minecraft-server:${${_APPNAME_}_TAG} + : + image: itzg/minecraft-server:${_TAG} diff --git a/compose/.apps/minecraftserver/minecraftserver.hostname.yml b/compose/.apps/minecraftserver/minecraftserver.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/minecraftserver/minecraftserver.hostname.yml +++ b/compose/.apps/minecraftserver/minecraftserver.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/minecraftserver/minecraftserver.labels.yml b/compose/.apps/minecraftserver/minecraftserver.labels.yml index 3a62ca5121..2a4b387bb2 100644 --- a/compose/.apps/minecraftserver/minecraftserver.labels.yml +++ b/compose/.apps/minecraftserver/minecraftserver.labels.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Minecraft Java Edition Server" com.dockstarter.appinfo.nicename: "MinecraftServer" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_eula: "TRUE" - com.dockstarter.appvars.${_appname_}_environment_type: "VANILLA" - com.dockstarter.appvars.${_appname_}_environment_version: "LATEST" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_25565: "25565" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_eula: "TRUE" + com.dockstarter.appvars._environment_type: "VANILLA" + com.dockstarter.appvars._environment_version: "LATEST" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_25565: "25565" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/minecraftserver/minecraftserver.netmode.yml b/compose/.apps/minecraftserver/minecraftserver.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/minecraftserver/minecraftserver.netmode.yml +++ b/compose/.apps/minecraftserver/minecraftserver.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/minecraftserver/minecraftserver.ports.yml b/compose/.apps/minecraftserver/minecraftserver.ports.yml index e8c16ce0d1..66965b4b0a 100644 --- a/compose/.apps/minecraftserver/minecraftserver.ports.yml +++ b/compose/.apps/minecraftserver/minecraftserver.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_25565}:25565 + - ${_PORT_25565}:25565 diff --git a/compose/.apps/minecraftserver/minecraftserver.x86_64.yml b/compose/.apps/minecraftserver/minecraftserver.x86_64.yml index 4799fb995e..617884d2eb 100644 --- a/compose/.apps/minecraftserver/minecraftserver.x86_64.yml +++ b/compose/.apps/minecraftserver/minecraftserver.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: itzg/minecraft-server:${${_APPNAME_}_TAG} + : + image: itzg/minecraft-server:${_TAG} diff --git a/compose/.apps/minecraftserver/minecraftserver.yml b/compose/.apps/minecraftserver/minecraftserver.yml index bb5bbc197b..ff1e8389bc 100644 --- a/compose/.apps/minecraftserver/minecraftserver.yml +++ b/compose/.apps/minecraftserver/minecraftserver.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - EULA=${${_APPNAME_}_ENVIRONMENT_EULA} + - EULA=${_ENVIRONMENT_EULA} - GID=${PGID} - - TYPE=${${_APPNAME_}_ENVIRONMENT_TYPE} + - TYPE=${_ENVIRONMENT_TYPE} - TZ=${TZ} - UID=${PUID} - - VERSION=${${_APPNAME_}_ENVIRONMENT_VERSION} - restart: ${${_APPNAME_}_RESTART} + - VERSION=${_ENVIRONMENT_VERSION} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/data + - ${DOCKER_VOLUME_CONFIG}/:/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/monitorr/monitorr.hostname.yml b/compose/.apps/monitorr/monitorr.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/monitorr/monitorr.hostname.yml +++ b/compose/.apps/monitorr/monitorr.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/monitorr/monitorr.labels.yml b/compose/.apps/monitorr/monitorr.labels.yml index ca3ae3e5d4..fa7b79fe2d 100644 --- a/compose/.apps/monitorr/monitorr.labels.yml +++ b/compose/.apps/monitorr/monitorr.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Webfront to live display the status of any webapp or service" com.dockstarter.appinfo.nicename: "Monitorr" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_80: "8004" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_80: "8004" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/monitorr/monitorr.netmode.yml b/compose/.apps/monitorr/monitorr.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/monitorr/monitorr.netmode.yml +++ b/compose/.apps/monitorr/monitorr.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/monitorr/monitorr.ports.yml b/compose/.apps/monitorr/monitorr.ports.yml index c37afbebb5..32f14e45fb 100644 --- a/compose/.apps/monitorr/monitorr.ports.yml +++ b/compose/.apps/monitorr/monitorr.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_80}:80 diff --git a/compose/.apps/monitorr/monitorr.x86_64.yml b/compose/.apps/monitorr/monitorr.x86_64.yml index 907a98bb78..9265001be5 100644 --- a/compose/.apps/monitorr/monitorr.x86_64.yml +++ b/compose/.apps/monitorr/monitorr.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: monitorr/monitorr:${${_APPNAME_}_TAG} + : + image: monitorr/monitorr:${_TAG} diff --git a/compose/.apps/monitorr/monitorr.yml b/compose/.apps/monitorr/monitorr.yml index bff36b5c0f..b5bf7ecdbb 100644 --- a/compose/.apps/monitorr/monitorr.yml +++ b/compose/.apps/monitorr/monitorr.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/app + - ${DOCKER_VOLUME_CONFIG}/:/app - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/mosquitto/mosquitto.aarch64.yml b/compose/.apps/mosquitto/mosquitto.aarch64.yml index f2f90644c2..36c3fbb29f 100644 --- a/compose/.apps/mosquitto/mosquitto.aarch64.yml +++ b/compose/.apps/mosquitto/mosquitto.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: eclipse-mosquitto:${${_APPNAME_}_TAG} + : + image: eclipse-mosquitto:${_TAG} diff --git a/compose/.apps/mosquitto/mosquitto.hostname.yml b/compose/.apps/mosquitto/mosquitto.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/mosquitto/mosquitto.hostname.yml +++ b/compose/.apps/mosquitto/mosquitto.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/mosquitto/mosquitto.labels.yml b/compose/.apps/mosquitto/mosquitto.labels.yml index fcaff84550..ef449e7503 100644 --- a/compose/.apps/mosquitto/mosquitto.labels.yml +++ b/compose/.apps/mosquitto/mosquitto.labels.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Open source implementation of a server for version 5.0, 3.1.1, and 3.1 of the MQTT protocol" com.dockstarter.appinfo.nicename: "Mosquitto" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_1883: "1883" - com.dockstarter.appvars.${_appname_}_port_9001: "9001" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_1883: "1883" + com.dockstarter.appvars._port_9001: "9001" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/mosquitto/mosquitto.netmode.yml b/compose/.apps/mosquitto/mosquitto.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/mosquitto/mosquitto.netmode.yml +++ b/compose/.apps/mosquitto/mosquitto.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/mosquitto/mosquitto.ports.yml b/compose/.apps/mosquitto/mosquitto.ports.yml index d94621f307..235da813be 100644 --- a/compose/.apps/mosquitto/mosquitto.ports.yml +++ b/compose/.apps/mosquitto/mosquitto.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_1883}:1883 - - ${${_APPNAME_}_PORT_9001}:9001 + - ${_PORT_1883}:1883 + - ${_PORT_9001}:9001 diff --git a/compose/.apps/mosquitto/mosquitto.x86_64.yml b/compose/.apps/mosquitto/mosquitto.x86_64.yml index f2f90644c2..36c3fbb29f 100644 --- a/compose/.apps/mosquitto/mosquitto.x86_64.yml +++ b/compose/.apps/mosquitto/mosquitto.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: eclipse-mosquitto:${${_APPNAME_}_TAG} + : + image: eclipse-mosquitto:${_TAG} diff --git a/compose/.apps/mosquitto/mosquitto.yml b/compose/.apps/mosquitto/mosquitto.yml index 84f6a1a9a6..9758b5a7cf 100644 --- a/compose/.apps/mosquitto/mosquitto.yml +++ b/compose/.apps/mosquitto/mosquitto.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/mosquitto/config - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/data:/mosquitto/data - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/log:/mosquitto/log + - ${DOCKER_VOLUME_CONFIG}/:/mosquitto/config + - ${DOCKER_VOLUME_CONFIG}//data:/mosquitto/data + - ${DOCKER_VOLUME_CONFIG}//log:/mosquitto/log - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/moviematch/moviematch.aarch64.yml b/compose/.apps/moviematch/moviematch.aarch64.yml index 39c691fe27..8931303486 100644 --- a/compose/.apps/moviematch/moviematch.aarch64.yml +++ b/compose/.apps/moviematch/moviematch.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lukechannings/moviematch:${${_APPNAME_}_TAG} + : + image: lukechannings/moviematch:${_TAG} diff --git a/compose/.apps/moviematch/moviematch.hostname.yml b/compose/.apps/moviematch/moviematch.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/moviematch/moviematch.hostname.yml +++ b/compose/.apps/moviematch/moviematch.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/moviematch/moviematch.labels.yml b/compose/.apps/moviematch/moviematch.labels.yml index 649adbeb68..1fb9416f02 100644 --- a/compose/.apps/moviematch/moviematch.labels.yml +++ b/compose/.apps/moviematch/moviematch.labels.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Have you ever spent longer deciding on a movie than it'd take to juwatch a random movie? This is an app that helps you and your frienpick a movie to watch from a Plex server." com.dockstarter.appinfo.nicename: "Moviematch" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_log_level: "INFO" - com.dockstarter.appvars.${_appname_}_environment_plex_token: "" - com.dockstarter.appvars.${_appname_}_environment_plex_url: "" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8000: "8000" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_log_level: "INFO" + com.dockstarter.appvars._environment_plex_token: "" + com.dockstarter.appvars._environment_plex_url: "" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8000: "8000" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/moviematch/moviematch.netmode.yml b/compose/.apps/moviematch/moviematch.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/moviematch/moviematch.netmode.yml +++ b/compose/.apps/moviematch/moviematch.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/moviematch/moviematch.ports.yml b/compose/.apps/moviematch/moviematch.ports.yml index 33070f8cee..384ad2ee98 100644 --- a/compose/.apps/moviematch/moviematch.ports.yml +++ b/compose/.apps/moviematch/moviematch.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8000}:8000 + - ${_PORT_8000}:8000 diff --git a/compose/.apps/moviematch/moviematch.x86_64.yml b/compose/.apps/moviematch/moviematch.x86_64.yml index 39c691fe27..8931303486 100644 --- a/compose/.apps/moviematch/moviematch.x86_64.yml +++ b/compose/.apps/moviematch/moviematch.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lukechannings/moviematch:${${_APPNAME_}_TAG} + : + image: lukechannings/moviematch:${_TAG} diff --git a/compose/.apps/moviematch/moviematch.yml b/compose/.apps/moviematch/moviematch.yml index 1af452a000..b0b9e43319 100644 --- a/compose/.apps/moviematch/moviematch.yml +++ b/compose/.apps/moviematch/moviematch.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - LOG_LEVEL=${${_APPNAME_}_ENVIRONMENT_LOG_LEVEL} + - LOG_LEVEL=${_ENVIRONMENT_LOG_LEVEL} - PGID=${PGID} - - PLEX_TOKEN=${${_APPNAME_}_ENVIRONMENT_PLEX_TOKEN} - - PLEX_URL=${${_APPNAME_}_ENVIRONMENT_PLEX_URL} + - PLEX_TOKEN=${_ENVIRONMENT_PLEX_TOKEN} + - PLEX_URL=${_ENVIRONMENT_PLEX_URL} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/murmur/murmur.hostname.yml b/compose/.apps/murmur/murmur.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/murmur/murmur.hostname.yml +++ b/compose/.apps/murmur/murmur.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/murmur/murmur.labels.yml b/compose/.apps/murmur/murmur.labels.yml index 9c2cbcc209..9e72425c23 100644 --- a/compose/.apps/murmur/murmur.labels.yml +++ b/compose/.apps/murmur/murmur.labels.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Murmur is the server for Mumble, a voice over IP application" com.dockstarter.appinfo.nicename: "Murmur" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_supw: "" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_64738: "64738" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_supw: "" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_64738: "64738" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/murmur/murmur.netmode.yml b/compose/.apps/murmur/murmur.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/murmur/murmur.netmode.yml +++ b/compose/.apps/murmur/murmur.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/murmur/murmur.ports.yml b/compose/.apps/murmur/murmur.ports.yml index 607f115065..0becc352ae 100644 --- a/compose/.apps/murmur/murmur.ports.yml +++ b/compose/.apps/murmur/murmur.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_64738}:64738 - - ${${_APPNAME_}_PORT_64738}:64738/udp + - ${_PORT_64738}:64738 + - ${_PORT_64738}:64738/udp diff --git a/compose/.apps/murmur/murmur.x86_64.yml b/compose/.apps/murmur/murmur.x86_64.yml index 31629e4139..1fcd0d63e9 100644 --- a/compose/.apps/murmur/murmur.x86_64.yml +++ b/compose/.apps/murmur/murmur.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: goofball222/murmur:${${_APPNAME_}_TAG} + : + image: goofball222/murmur:${_TAG} diff --git a/compose/.apps/murmur/murmur.yml b/compose/.apps/murmur/murmur.yml index eaaacceb09..17582df813 100644 --- a/compose/.apps/murmur/murmur.yml +++ b/compose/.apps/murmur/murmur.yml @@ -1,16 +1,16 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - MURMUR_SUPW=${${_APPNAME_}_ENVIRONMENT_SUPW} + - MURMUR_SUPW=${_ENVIRONMENT_SUPW} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/cert:/opt/murmur/cert - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/config:/opt/murmur/config - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/data:/opt/murmur/data - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/log:/opt/murmur/log + - ${DOCKER_VOLUME_CONFIG}//cert:/opt/murmur/cert + - ${DOCKER_VOLUME_CONFIG}//config:/opt/murmur/config + - ${DOCKER_VOLUME_CONFIG}//data:/opt/murmur/data + - ${DOCKER_VOLUME_CONFIG}//log:/opt/murmur/log - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/muximux/muximux.aarch64.yml b/compose/.apps/muximux/muximux.aarch64.yml index 7df2be186e..55897d0933 100644 --- a/compose/.apps/muximux/muximux.aarch64.yml +++ b/compose/.apps/muximux/muximux.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/muximux:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/muximux:${_TAG} diff --git a/compose/.apps/muximux/muximux.hostname.yml b/compose/.apps/muximux/muximux.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/muximux/muximux.hostname.yml +++ b/compose/.apps/muximux/muximux.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/muximux/muximux.labels.yml b/compose/.apps/muximux/muximux.labels.yml index 48a7089619..954c89af57 100644 --- a/compose/.apps/muximux/muximux.labels.yml +++ b/compose/.apps/muximux/muximux.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) Use Heimdall or Organizr" com.dockstarter.appinfo.nicename: "Muximux" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_80: "8005" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_80: "8005" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/muximux/muximux.netmode.yml b/compose/.apps/muximux/muximux.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/muximux/muximux.netmode.yml +++ b/compose/.apps/muximux/muximux.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/muximux/muximux.ports.yml b/compose/.apps/muximux/muximux.ports.yml index c37afbebb5..32f14e45fb 100644 --- a/compose/.apps/muximux/muximux.ports.yml +++ b/compose/.apps/muximux/muximux.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_80}:80 diff --git a/compose/.apps/muximux/muximux.x86_64.yml b/compose/.apps/muximux/muximux.x86_64.yml index 7df2be186e..55897d0933 100644 --- a/compose/.apps/muximux/muximux.x86_64.yml +++ b/compose/.apps/muximux/muximux.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/muximux:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/muximux:${_TAG} diff --git a/compose/.apps/muximux/muximux.yml b/compose/.apps/muximux/muximux.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/muximux/muximux.yml +++ b/compose/.apps/muximux/muximux.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/mylar/mylar.aarch64.yml b/compose/.apps/mylar/mylar.aarch64.yml index 47b54ba190..d43c5f9454 100644 --- a/compose/.apps/mylar/mylar.aarch64.yml +++ b/compose/.apps/mylar/mylar.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/mylar:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/mylar:${_TAG} diff --git a/compose/.apps/mylar/mylar.hostname.yml b/compose/.apps/mylar/mylar.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/mylar/mylar.hostname.yml +++ b/compose/.apps/mylar/mylar.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/mylar/mylar.labels.yml b/compose/.apps/mylar/mylar.labels.yml index 6096c00056..03957a3421 100644 --- a/compose/.apps/mylar/mylar.labels.yml +++ b/compose/.apps/mylar/mylar.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) Use Mylar3" com.dockstarter.appinfo.nicename: "Mylar" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8090: "8090" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8090: "8090" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/mylar/mylar.netmode.yml b/compose/.apps/mylar/mylar.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/mylar/mylar.netmode.yml +++ b/compose/.apps/mylar/mylar.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/mylar/mylar.ports.yml b/compose/.apps/mylar/mylar.ports.yml index a15055b16a..b66cabf90a 100644 --- a/compose/.apps/mylar/mylar.ports.yml +++ b/compose/.apps/mylar/mylar.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8090}:8090 + - ${_PORT_8090}:8090 diff --git a/compose/.apps/mylar/mylar.x86_64.yml b/compose/.apps/mylar/mylar.x86_64.yml index 47b54ba190..d43c5f9454 100644 --- a/compose/.apps/mylar/mylar.x86_64.yml +++ b/compose/.apps/mylar/mylar.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/mylar:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/mylar:${_TAG} diff --git a/compose/.apps/mylar/mylar.yml b/compose/.apps/mylar/mylar.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/mylar/mylar.yml +++ b/compose/.apps/mylar/mylar.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/mylar3/mylar3.aarch64.yml b/compose/.apps/mylar3/mylar3.aarch64.yml index b63cd11b11..74da2b2173 100644 --- a/compose/.apps/mylar3/mylar3.aarch64.yml +++ b/compose/.apps/mylar3/mylar3.aarch64.yml @@ -1,3 +1,3 @@ services: mylar3: - image: lscr.io/linuxserver/mylar3:${${_APPNAME_}_TAG} + image: lscr.io/linuxserver/mylar3:${_TAG} diff --git a/compose/.apps/mylar3/mylar3.labels.yml b/compose/.apps/mylar3/mylar3.labels.yml index 2cf35e4b05..3de073a617 100644 --- a/compose/.apps/mylar3/mylar3.labels.yml +++ b/compose/.apps/mylar3/mylar3.labels.yml @@ -4,9 +4,9 @@ services: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Comic book PVR client" com.dockstarter.appinfo.nicename: "Mylar3" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8090: "8090" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8090: "8090" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/mylar3/mylar3.netmode.yml b/compose/.apps/mylar3/mylar3.netmode.yml index cad798e5bc..a027246bca 100644 --- a/compose/.apps/mylar3/mylar3.netmode.yml +++ b/compose/.apps/mylar3/mylar3.netmode.yml @@ -1,3 +1,3 @@ services: mylar3: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/mylar3/mylar3.ports.yml b/compose/.apps/mylar3/mylar3.ports.yml index f1df618d85..ac7f9179ef 100644 --- a/compose/.apps/mylar3/mylar3.ports.yml +++ b/compose/.apps/mylar3/mylar3.ports.yml @@ -1,4 +1,4 @@ services: mylar3: ports: - - ${${_APPNAME_}_PORT_8090}:8090 + - ${_PORT_8090}:8090 diff --git a/compose/.apps/mylar3/mylar3.x86_64.yml b/compose/.apps/mylar3/mylar3.x86_64.yml index b63cd11b11..74da2b2173 100644 --- a/compose/.apps/mylar3/mylar3.x86_64.yml +++ b/compose/.apps/mylar3/mylar3.x86_64.yml @@ -1,3 +1,3 @@ services: mylar3: - image: lscr.io/linuxserver/mylar3:${${_APPNAME_}_TAG} + image: lscr.io/linuxserver/mylar3:${_TAG} diff --git a/compose/.apps/mylar3/mylar3.yml b/compose/.apps/mylar3/mylar3.yml index 63d53329a4..ffec4a3e31 100644 --- a/compose/.apps/mylar3/mylar3.yml +++ b/compose/.apps/mylar3/mylar3.yml @@ -1,12 +1,12 @@ services: mylar3: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/netdata/netdata.aarch64.yml b/compose/.apps/netdata/netdata.aarch64.yml index ccc9e6c92b..949455a25d 100644 --- a/compose/.apps/netdata/netdata.aarch64.yml +++ b/compose/.apps/netdata/netdata.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: netdata/netdata:${${_APPNAME_}_TAG} + : + image: netdata/netdata:${_TAG} diff --git a/compose/.apps/netdata/netdata.hostname.yml b/compose/.apps/netdata/netdata.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/netdata/netdata.hostname.yml +++ b/compose/.apps/netdata/netdata.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/netdata/netdata.labels.yml b/compose/.apps/netdata/netdata.labels.yml index facd743292..41b03b8599 100644 --- a/compose/.apps/netdata/netdata.labels.yml +++ b/compose/.apps/netdata/netdata.labels.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Distributed real-time performance and health monitoring" com.dockstarter.appinfo.nicename: "Netdata" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_19999: "19999" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_19999: "19999" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/netdata/netdata.netmode.yml b/compose/.apps/netdata/netdata.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/netdata/netdata.netmode.yml +++ b/compose/.apps/netdata/netdata.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/netdata/netdata.ports.yml b/compose/.apps/netdata/netdata.ports.yml index ff0c707985..d5946b6b33 100644 --- a/compose/.apps/netdata/netdata.ports.yml +++ b/compose/.apps/netdata/netdata.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_19999}:19999 + - ${_PORT_19999}:19999 diff --git a/compose/.apps/netdata/netdata.x86_64.yml b/compose/.apps/netdata/netdata.x86_64.yml index ccc9e6c92b..949455a25d 100644 --- a/compose/.apps/netdata/netdata.x86_64.yml +++ b/compose/.apps/netdata/netdata.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: netdata/netdata:${${_APPNAME_}_TAG} + : + image: netdata/netdata:${_TAG} diff --git a/compose/.apps/netdata/netdata.yml b/compose/.apps/netdata/netdata.yml index 69db90be96..b45bbe6cae 100644 --- a/compose/.apps/netdata/netdata.yml +++ b/compose/.apps/netdata/netdata.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : cap_add: - SYS_PTRACE - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} environment: - PGID=${DOCKER_GID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} security_opt: - apparmor:unconfined volumes: @@ -18,4 +18,4 @@ services: - /proc:/host/proc:ro - /sys:/host/sys:ro - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock:ro + - ${_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock:ro diff --git a/compose/.apps/nextcloud/nextcloud.aarch64.yml b/compose/.apps/nextcloud/nextcloud.aarch64.yml index 9cc559223c..1eafcef728 100644 --- a/compose/.apps/nextcloud/nextcloud.aarch64.yml +++ b/compose/.apps/nextcloud/nextcloud.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/nextcloud:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/nextcloud:${_TAG} diff --git a/compose/.apps/nextcloud/nextcloud.hostname.yml b/compose/.apps/nextcloud/nextcloud.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/nextcloud/nextcloud.hostname.yml +++ b/compose/.apps/nextcloud/nextcloud.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/nextcloud/nextcloud.labels.yml b/compose/.apps/nextcloud/nextcloud.labels.yml index 725aef0ef8..6e34005bb4 100644 --- a/compose/.apps/nextcloud/nextcloud.labels.yml +++ b/compose/.apps/nextcloud/nextcloud.labels.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Gives you access to all your files wherever you are" com.dockstarter.appinfo.nicename: "Nextcloud" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_443: "444" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_datadir: "/mnt/nextcloud" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_443: "444" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_datadir: "/mnt/nextcloud" diff --git a/compose/.apps/nextcloud/nextcloud.netmode.yml b/compose/.apps/nextcloud/nextcloud.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/nextcloud/nextcloud.netmode.yml +++ b/compose/.apps/nextcloud/nextcloud.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/nextcloud/nextcloud.ports.yml b/compose/.apps/nextcloud/nextcloud.ports.yml index 0213e0baa0..f50393571a 100644 --- a/compose/.apps/nextcloud/nextcloud.ports.yml +++ b/compose/.apps/nextcloud/nextcloud.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_443}:443 + - ${_PORT_443}:443 diff --git a/compose/.apps/nextcloud/nextcloud.x86_64.yml b/compose/.apps/nextcloud/nextcloud.x86_64.yml index 9cc559223c..1eafcef728 100644 --- a/compose/.apps/nextcloud/nextcloud.x86_64.yml +++ b/compose/.apps/nextcloud/nextcloud.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/nextcloud:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/nextcloud:${_TAG} diff --git a/compose/.apps/nextcloud/nextcloud.yml b/compose/.apps/nextcloud/nextcloud.yml index c4f2d01d4c..2fe0b327b3 100644 --- a/compose/.apps/nextcloud/nextcloud.yml +++ b/compose/.apps/nextcloud/nextcloud.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_DATADIR}:/data + - ${_VOLUME_DATADIR}:/data diff --git a/compose/.apps/nodered/nodered.aarch64.yml b/compose/.apps/nodered/nodered.aarch64.yml index 42531af7d0..22168f6e81 100644 --- a/compose/.apps/nodered/nodered.aarch64.yml +++ b/compose/.apps/nodered/nodered.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: nodered/node-red:${${_APPNAME_}_TAG} + : + image: nodered/node-red:${_TAG} diff --git a/compose/.apps/nodered/nodered.hostname.yml b/compose/.apps/nodered/nodered.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/nodered/nodered.hostname.yml +++ b/compose/.apps/nodered/nodered.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/nodered/nodered.labels.yml b/compose/.apps/nodered/nodered.labels.yml index e1c49d4313..27afad578b 100644 --- a/compose/.apps/nodered/nodered.labels.yml +++ b/compose/.apps/nodered/nodered.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Low-code programming for event-driven applications" com.dockstarter.appinfo.nicename: "Nodered" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_1880: "1880" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_1880: "1880" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/nodered/nodered.netmode.yml b/compose/.apps/nodered/nodered.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/nodered/nodered.netmode.yml +++ b/compose/.apps/nodered/nodered.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/nodered/nodered.ports.yml b/compose/.apps/nodered/nodered.ports.yml index 218cf3c5c5..4f8cc2735f 100644 --- a/compose/.apps/nodered/nodered.ports.yml +++ b/compose/.apps/nodered/nodered.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_1880}:1880 + - ${_PORT_1880}:1880 diff --git a/compose/.apps/nodered/nodered.x86_64.yml b/compose/.apps/nodered/nodered.x86_64.yml index 42531af7d0..22168f6e81 100644 --- a/compose/.apps/nodered/nodered.x86_64.yml +++ b/compose/.apps/nodered/nodered.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: nodered/node-red:${${_APPNAME_}_TAG} + : + image: nodered/node-red:${_TAG} diff --git a/compose/.apps/nodered/nodered.yml b/compose/.apps/nodered/nodered.yml index cfb557d420..ca051134fa 100644 --- a/compose/.apps/nodered/nodered.yml +++ b/compose/.apps/nodered/nodered.yml @@ -1,10 +1,10 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/data + - ${DOCKER_VOLUME_CONFIG}/:/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/nzbget/nzbget.aarch64.yml b/compose/.apps/nzbget/nzbget.aarch64.yml index 552a516b37..6a289ce6fc 100644 --- a/compose/.apps/nzbget/nzbget.aarch64.yml +++ b/compose/.apps/nzbget/nzbget.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/nzbget:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/nzbget:${_TAG} diff --git a/compose/.apps/nzbget/nzbget.hostname.yml b/compose/.apps/nzbget/nzbget.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/nzbget/nzbget.hostname.yml +++ b/compose/.apps/nzbget/nzbget.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/nzbget/nzbget.labels.yml b/compose/.apps/nzbget/nzbget.labels.yml index 16b6fa8e7d..49cb8f77c5 100644 --- a/compose/.apps/nzbget/nzbget.labels.yml +++ b/compose/.apps/nzbget/nzbget.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Efficient usenet downloader" com.dockstarter.appinfo.nicename: "NZBGet" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_6789: "6789" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_6789: "6789" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/nzbget/nzbget.netmode.yml b/compose/.apps/nzbget/nzbget.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/nzbget/nzbget.netmode.yml +++ b/compose/.apps/nzbget/nzbget.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/nzbget/nzbget.ports.yml b/compose/.apps/nzbget/nzbget.ports.yml index f13a978b28..0fe681f8f5 100644 --- a/compose/.apps/nzbget/nzbget.ports.yml +++ b/compose/.apps/nzbget/nzbget.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_6789}:6789 + - ${_PORT_6789}:6789 diff --git a/compose/.apps/nzbget/nzbget.x86_64.yml b/compose/.apps/nzbget/nzbget.x86_64.yml index 552a516b37..6a289ce6fc 100644 --- a/compose/.apps/nzbget/nzbget.x86_64.yml +++ b/compose/.apps/nzbget/nzbget.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/nzbget:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/nzbget:${_TAG} diff --git a/compose/.apps/nzbget/nzbget.yml b/compose/.apps/nzbget/nzbget.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/nzbget/nzbget.yml +++ b/compose/.apps/nzbget/nzbget.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/nzbgetvpn/nzbgetvpn.hostname.yml b/compose/.apps/nzbgetvpn/nzbgetvpn.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/nzbgetvpn/nzbgetvpn.hostname.yml +++ b/compose/.apps/nzbgetvpn/nzbgetvpn.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/nzbgetvpn/nzbgetvpn.labels.yml b/compose/.apps/nzbgetvpn/nzbgetvpn.labels.yml index 5e539cedbd..032c0f5194 100644 --- a/compose/.apps/nzbgetvpn/nzbgetvpn.labels.yml +++ b/compose/.apps/nzbgetvpn/nzbgetvpn.labels.yml @@ -1,24 +1,24 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "NZBGet with PrivoxyVPN" com.dockstarter.appinfo.nicename: "NZBGetVPN" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_enable_privoxy: "no" - com.dockstarter.appvars.${_appname_}_environment_lan_network: "192.168.x.x/24" - com.dockstarter.appvars.${_appname_}_environment_name_servers: "1.1.1.1,8.8.8.8" - com.dockstarter.appvars.${_appname_}_environment_vpn_client: "openvpn" - com.dockstarter.appvars.${_appname_}_environment_vpn_enable: "no" - com.dockstarter.appvars.${_appname_}_environment_vpn_input_ports: "" - com.dockstarter.appvars.${_appname_}_environment_vpn_options: "" - com.dockstarter.appvars.${_appname_}_environment_vpn_output_ports: "" - com.dockstarter.appvars.${_appname_}_environment_vpn_pass: "your-vpn-pass" - com.dockstarter.appvars.${_appname_}_environment_vpn_prov: "custom" - com.dockstarter.appvars.${_appname_}_environment_vpn_user: "your-vpn-user" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_6789: "6789" - com.dockstarter.appvars.${_appname_}_port_8118: "8118" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_enable_privoxy: "no" + com.dockstarter.appvars._environment_lan_network: "192.168.x.x/24" + com.dockstarter.appvars._environment_name_servers: "1.1.1.1,8.8.8.8" + com.dockstarter.appvars._environment_vpn_client: "openvpn" + com.dockstarter.appvars._environment_vpn_enable: "no" + com.dockstarter.appvars._environment_vpn_input_ports: "" + com.dockstarter.appvars._environment_vpn_options: "" + com.dockstarter.appvars._environment_vpn_output_ports: "" + com.dockstarter.appvars._environment_vpn_pass: "your-vpn-pass" + com.dockstarter.appvars._environment_vpn_prov: "custom" + com.dockstarter.appvars._environment_vpn_user: "your-vpn-user" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_6789: "6789" + com.dockstarter.appvars._port_8118: "8118" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/nzbgetvpn/nzbgetvpn.netmode.yml b/compose/.apps/nzbgetvpn/nzbgetvpn.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/nzbgetvpn/nzbgetvpn.netmode.yml +++ b/compose/.apps/nzbgetvpn/nzbgetvpn.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/nzbgetvpn/nzbgetvpn.ports.yml b/compose/.apps/nzbgetvpn/nzbgetvpn.ports.yml index ef9c872d12..0d28758c31 100644 --- a/compose/.apps/nzbgetvpn/nzbgetvpn.ports.yml +++ b/compose/.apps/nzbgetvpn/nzbgetvpn.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_6789}:6789 - - ${${_APPNAME_}_PORT_8118}:8118 + - ${_PORT_6789}:6789 + - ${_PORT_8118}:8118 diff --git a/compose/.apps/nzbgetvpn/nzbgetvpn.x86_64.yml b/compose/.apps/nzbgetvpn/nzbgetvpn.x86_64.yml index 3ad00bfdae..6e0bb483eb 100644 --- a/compose/.apps/nzbgetvpn/nzbgetvpn.x86_64.yml +++ b/compose/.apps/nzbgetvpn/nzbgetvpn.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: jshridha/docker-nzbgetvpn:${${_APPNAME_}_TAG} + : + image: jshridha/docker-nzbgetvpn:${_TAG} diff --git a/compose/.apps/nzbgetvpn/nzbgetvpn.yml b/compose/.apps/nzbgetvpn/nzbgetvpn.yml index 7cc77e89ea..9d8cab9ca4 100644 --- a/compose/.apps/nzbgetvpn/nzbgetvpn.yml +++ b/compose/.apps/nzbgetvpn/nzbgetvpn.yml @@ -1,29 +1,29 @@ services: - ${_appname_}: + : cap_add: - NET_ADMIN - SYS_MODULE - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} environment: - - ENABLE_PRIVOXY=${${_APPNAME_}_ENVIRONMENT_ENABLE_PRIVOXY} - - LAN_NETWORK=${${_APPNAME_}_ENVIRONMENT_LAN_NETWORK} - - NAME_SERVERS=${${_APPNAME_}_ENVIRONMENT_NAME_SERVERS} + - ENABLE_PRIVOXY=${_ENVIRONMENT_ENABLE_PRIVOXY} + - LAN_NETWORK=${_ENVIRONMENT_LAN_NETWORK} + - NAME_SERVERS=${_ENVIRONMENT_NAME_SERVERS} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - VPN_CLIENT=${${_APPNAME_}_ENVIRONMENT_VPN_CLIENT} - - VPN_ENABLED=${${_APPNAME_}_ENVIRONMENT_VPN_ENABLE} - - VPN_INPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_VPN_INPUT_PORTS} - - VPN_OPTIONS=${${_APPNAME_}_ENVIRONMENT_VPN_OPTIONS} - - VPN_OUTPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_VPN_OUTPUT_PORTS} - - VPN_PASS=${${_APPNAME_}_ENVIRONMENT_VPN_PASS} - - VPN_PROV=${${_APPNAME_}_ENVIRONMENT_VPN_PROV} - - VPN_USER=${${_APPNAME_}_ENVIRONMENT_VPN_USER} + - VPN_CLIENT=${_ENVIRONMENT_VPN_CLIENT} + - VPN_ENABLED=${_ENVIRONMENT_VPN_ENABLE} + - VPN_INPUT_PORTS=${_ENVIRONMENT_VPN_INPUT_PORTS} + - VPN_OPTIONS=${_ENVIRONMENT_VPN_OPTIONS} + - VPN_OUTPUT_PORTS=${_ENVIRONMENT_VPN_OUTPUT_PORTS} + - VPN_PASS=${_ENVIRONMENT_VPN_PASS} + - VPN_PROV=${_ENVIRONMENT_VPN_PROV} + - VPN_USER=${_ENVIRONMENT_VPN_USER} privileged: true - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} sysctls: - net.ipv4.conf.all.src_valid_mark=1 volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/nzbhydra2/nzbhydra2.aarch64.yml b/compose/.apps/nzbhydra2/nzbhydra2.aarch64.yml index 7c85728a7d..cf0faa4b79 100644 --- a/compose/.apps/nzbhydra2/nzbhydra2.aarch64.yml +++ b/compose/.apps/nzbhydra2/nzbhydra2.aarch64.yml @@ -1,3 +1,3 @@ services: nzbhydra2: - image: lscr.io/linuxserver/nzbhydra2:${${_APPNAME_}_TAG} + image: lscr.io/linuxserver/nzbhydra2:${_TAG} diff --git a/compose/.apps/nzbhydra2/nzbhydra2.labels.yml b/compose/.apps/nzbhydra2/nzbhydra2.labels.yml index bf8934323a..0a0ac57e63 100644 --- a/compose/.apps/nzbhydra2/nzbhydra2.labels.yml +++ b/compose/.apps/nzbhydra2/nzbhydra2.labels.yml @@ -4,9 +4,9 @@ services: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Meta search for NZB indexers" com.dockstarter.appinfo.nicename: "NZBHydra2" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_5076: "5076" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_5076: "5076" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/nzbhydra2/nzbhydra2.netmode.yml b/compose/.apps/nzbhydra2/nzbhydra2.netmode.yml index d000179deb..dd8d73d87e 100644 --- a/compose/.apps/nzbhydra2/nzbhydra2.netmode.yml +++ b/compose/.apps/nzbhydra2/nzbhydra2.netmode.yml @@ -1,3 +1,3 @@ services: nzbhydra2: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/nzbhydra2/nzbhydra2.ports.yml b/compose/.apps/nzbhydra2/nzbhydra2.ports.yml index 38ca6aba54..1e8bd37d13 100644 --- a/compose/.apps/nzbhydra2/nzbhydra2.ports.yml +++ b/compose/.apps/nzbhydra2/nzbhydra2.ports.yml @@ -1,4 +1,4 @@ services: nzbhydra2: ports: - - ${${_APPNAME_}_PORT_5076}:5076 + - ${_PORT_5076}:5076 diff --git a/compose/.apps/nzbhydra2/nzbhydra2.x86_64.yml b/compose/.apps/nzbhydra2/nzbhydra2.x86_64.yml index 7c85728a7d..cf0faa4b79 100644 --- a/compose/.apps/nzbhydra2/nzbhydra2.x86_64.yml +++ b/compose/.apps/nzbhydra2/nzbhydra2.x86_64.yml @@ -1,3 +1,3 @@ services: nzbhydra2: - image: lscr.io/linuxserver/nzbhydra2:${${_APPNAME_}_TAG} + image: lscr.io/linuxserver/nzbhydra2:${_TAG} diff --git a/compose/.apps/nzbhydra2/nzbhydra2.yml b/compose/.apps/nzbhydra2/nzbhydra2.yml index 4cb0f318a0..9334b00ef3 100644 --- a/compose/.apps/nzbhydra2/nzbhydra2.yml +++ b/compose/.apps/nzbhydra2/nzbhydra2.yml @@ -1,12 +1,12 @@ services: nzbhydra2: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/omadacontroller/omadacontroller.aarch64.yml b/compose/.apps/omadacontroller/omadacontroller.aarch64.yml index dbc2fd6329..ca5b6e9ad2 100644 --- a/compose/.apps/omadacontroller/omadacontroller.aarch64.yml +++ b/compose/.apps/omadacontroller/omadacontroller.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: mbentley/omada-controller:${${_APPNAME_}_TAG} + : + image: mbentley/omada-controller:${_TAG} diff --git a/compose/.apps/omadacontroller/omadacontroller.hostname.yml b/compose/.apps/omadacontroller/omadacontroller.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/omadacontroller/omadacontroller.hostname.yml +++ b/compose/.apps/omadacontroller/omadacontroller.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/omadacontroller/omadacontroller.labels.yml b/compose/.apps/omadacontroller/omadacontroller.labels.yml index 14dd3c8f16..db9f748321 100644 --- a/compose/.apps/omadacontroller/omadacontroller.labels.yml +++ b/compose/.apps/omadacontroller/omadacontroller.labels.yml @@ -1,22 +1,22 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Docker image based off of Ubuntu:18.04 for TP-Link Omada Controller to control TP-Link Omada EAP Series Wireless Access Points" com.dockstarter.appinfo.nicename: "OmadaController" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_show_mongodb_logs: "false" - com.dockstarter.appvars.${_appname_}_environment_show_server_logs: "true" - com.dockstarter.appvars.${_appname_}_environment_small_files: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_27001: "27001" - com.dockstarter.appvars.${_appname_}_port_29810: "29810" - com.dockstarter.appvars.${_appname_}_port_29811: "29811" - com.dockstarter.appvars.${_appname_}_port_29812: "29812" - com.dockstarter.appvars.${_appname_}_port_29813: "29813" - com.dockstarter.appvars.${_appname_}_port_29814: "29814" - com.dockstarter.appvars.${_appname_}_port_8043: "8043" - com.dockstarter.appvars.${_appname_}_port_8088: "8088" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_show_mongodb_logs: "false" + com.dockstarter.appvars._environment_show_server_logs: "true" + com.dockstarter.appvars._environment_small_files: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_27001: "27001" + com.dockstarter.appvars._port_29810: "29810" + com.dockstarter.appvars._port_29811: "29811" + com.dockstarter.appvars._port_29812: "29812" + com.dockstarter.appvars._port_29813: "29813" + com.dockstarter.appvars._port_29814: "29814" + com.dockstarter.appvars._port_8043: "8043" + com.dockstarter.appvars._port_8088: "8088" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/omadacontroller/omadacontroller.netmode.yml b/compose/.apps/omadacontroller/omadacontroller.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/omadacontroller/omadacontroller.netmode.yml +++ b/compose/.apps/omadacontroller/omadacontroller.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/omadacontroller/omadacontroller.ports.yml b/compose/.apps/omadacontroller/omadacontroller.ports.yml index 9b187f49cd..c9fab22ecc 100644 --- a/compose/.apps/omadacontroller/omadacontroller.ports.yml +++ b/compose/.apps/omadacontroller/omadacontroller.ports.yml @@ -1,11 +1,11 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8043}:8043 - - ${${_APPNAME_}_PORT_8088}:8088 - - ${${_APPNAME_}_PORT_27001}:27001/udp - - ${${_APPNAME_}_PORT_29810}:29810/udp - - ${${_APPNAME_}_PORT_29811}:29811 - - ${${_APPNAME_}_PORT_29812}:29812 - - ${${_APPNAME_}_PORT_29813}:29813 - - ${${_APPNAME_}_PORT_29814}:29814 + - ${_PORT_8043}:8043 + - ${_PORT_8088}:8088 + - ${_PORT_27001}:27001/udp + - ${_PORT_29810}:29810/udp + - ${_PORT_29811}:29811 + - ${_PORT_29812}:29812 + - ${_PORT_29813}:29813 + - ${_PORT_29814}:29814 diff --git a/compose/.apps/omadacontroller/omadacontroller.x86_64.yml b/compose/.apps/omadacontroller/omadacontroller.x86_64.yml index dbc2fd6329..ca5b6e9ad2 100644 --- a/compose/.apps/omadacontroller/omadacontroller.x86_64.yml +++ b/compose/.apps/omadacontroller/omadacontroller.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: mbentley/omada-controller:${${_APPNAME_}_TAG} + : + image: mbentley/omada-controller:${_TAG} diff --git a/compose/.apps/omadacontroller/omadacontroller.yml b/compose/.apps/omadacontroller/omadacontroller.yml index 5f039aa87c..85fb5d579c 100644 --- a/compose/.apps/omadacontroller/omadacontroller.yml +++ b/compose/.apps/omadacontroller/omadacontroller.yml @@ -1,25 +1,25 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - MANAGE_HTTP_PORT=${${_APPNAME_}_PORT_8088} - - MANAGE_HTTPS_PORT=${${_APPNAME_}_PORT_8043} + - MANAGE_HTTP_PORT=${_PORT_8088} + - MANAGE_HTTPS_PORT=${_PORT_8043} - PGID=${PGID} - - PORT_ADOPT_V1=${${_APPNAME_}_PORT_29812} - - PORT_APP_DISCOVERY=${${_APPNAME_}_PORT_27001} - - PORT_DISCOVERY=${${_APPNAME_}_PORT_29810} - - PORT_MANAGER_V1=${${_APPNAME_}_PORT_29811} - - PORT_MANAGER_V2=${${_APPNAME_}_PORT_29814} - - PORT_UPGRADE_V1=${${_APPNAME_}_PORT_29813} + - PORT_ADOPT_V1=${_PORT_29812} + - PORT_APP_DISCOVERY=${_PORT_27001} + - PORT_DISCOVERY=${_PORT_29810} + - PORT_MANAGER_V1=${_PORT_29811} + - PORT_MANAGER_V2=${_PORT_29814} + - PORT_UPGRADE_V1=${_PORT_29813} - PUID=${PUID} - - SHOW_MONGODB_LOGS=${${_APPNAME_}_ENVIRONMENT_SHOW_MONGODB_LOGS} - - SHOW_SERVER_LOGS=${${_APPNAME_}_ENVIRONMENT_SHOW_SERVER_LOGS} - - SMALL_FILES=${${_APPNAME_}_ENVIRONMENT_SMALL_FILES} + - SHOW_MONGODB_LOGS=${_ENVIRONMENT_SHOW_MONGODB_LOGS} + - SHOW_SERVER_LOGS=${_ENVIRONMENT_SHOW_SERVER_LOGS} + - SMALL_FILES=${_ENVIRONMENT_SMALL_FILES} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/opt/tplink/EAPController/data - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/logs:/opt/tplink/EAPController/logs - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/work:/opt/tplink/EAPController/work + - ${DOCKER_VOLUME_CONFIG}/:/opt/tplink/EAPController/data + - ${DOCKER_VOLUME_CONFIG}//logs:/opt/tplink/EAPController/logs + - ${DOCKER_VOLUME_CONFIG}//work:/opt/tplink/EAPController/work - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/ombi/ombi.aarch64.yml b/compose/.apps/ombi/ombi.aarch64.yml index 737ae80b46..51994c0273 100644 --- a/compose/.apps/ombi/ombi.aarch64.yml +++ b/compose/.apps/ombi/ombi.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/ombi:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/ombi:${_TAG} diff --git a/compose/.apps/ombi/ombi.hostname.yml b/compose/.apps/ombi/ombi.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/ombi/ombi.hostname.yml +++ b/compose/.apps/ombi/ombi.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/ombi/ombi.labels.yml b/compose/.apps/ombi/ombi.labels.yml index 9d0248ace5..a129082d4e 100644 --- a/compose/.apps/ombi/ombi.labels.yml +++ b/compose/.apps/ombi/ombi.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Allow your users to Request Movies, TV Shows and Albums" com.dockstarter.appinfo.nicename: "Ombi" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_3579: "3579" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_3579: "3579" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/ombi/ombi.netmode.yml b/compose/.apps/ombi/ombi.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/ombi/ombi.netmode.yml +++ b/compose/.apps/ombi/ombi.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/ombi/ombi.ports.yml b/compose/.apps/ombi/ombi.ports.yml index 38fd242fd2..40202f8a04 100644 --- a/compose/.apps/ombi/ombi.ports.yml +++ b/compose/.apps/ombi/ombi.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_3579}:3579 + - ${_PORT_3579}:3579 diff --git a/compose/.apps/ombi/ombi.x86_64.yml b/compose/.apps/ombi/ombi.x86_64.yml index 737ae80b46..51994c0273 100644 --- a/compose/.apps/ombi/ombi.x86_64.yml +++ b/compose/.apps/ombi/ombi.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/ombi:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/ombi:${_TAG} diff --git a/compose/.apps/ombi/ombi.yml b/compose/.apps/ombi/ombi.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/ombi/ombi.yml +++ b/compose/.apps/ombi/ombi.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/openldap/openldap.aarch64.yml b/compose/.apps/openldap/openldap.aarch64.yml index e643004044..167b24f0bd 100644 --- a/compose/.apps/openldap/openldap.aarch64.yml +++ b/compose/.apps/openldap/openldap.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: osixia/openldap:${${_APPNAME_}_TAG} + : + image: osixia/openldap:${_TAG} diff --git a/compose/.apps/openldap/openldap.hostname.yml b/compose/.apps/openldap/openldap.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/openldap/openldap.hostname.yml +++ b/compose/.apps/openldap/openldap.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/openldap/openldap.labels.yml b/compose/.apps/openldap/openldap.labels.yml index 66fcf8c637..145100b9f6 100644 --- a/compose/.apps/openldap/openldap.labels.yml +++ b/compose/.apps/openldap/openldap.labels.yml @@ -1,21 +1,21 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "OpenLDAP with TLS, multi master replication and easy bootstrap." com.dockstarter.appinfo.nicename: "OpenLDAP" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_admin_password: "admin" - com.dockstarter.appvars.${_appname_}_environment_backend: "mdb" - com.dockstarter.appvars.${_appname_}_environment_config_password: "config" - com.dockstarter.appvars.${_appname_}_environment_domain: "example.org" - com.dockstarter.appvars.${_appname_}_environment_organisation: "example inc." - com.dockstarter.appvars.${_appname_}_environment_readonly_user: "false" - com.dockstarter.appvars.${_appname_}_environment_readonly_user_password: "readonly" - com.dockstarter.appvars.${_appname_}_environment_readonly_user_username: "readonly" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_389: "389" - com.dockstarter.appvars.${_appname_}_port_636: "636" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_admin_password: "admin" + com.dockstarter.appvars._environment_backend: "mdb" + com.dockstarter.appvars._environment_config_password: "config" + com.dockstarter.appvars._environment_domain: "example.org" + com.dockstarter.appvars._environment_organisation: "example inc." + com.dockstarter.appvars._environment_readonly_user: "false" + com.dockstarter.appvars._environment_readonly_user_password: "readonly" + com.dockstarter.appvars._environment_readonly_user_username: "readonly" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_389: "389" + com.dockstarter.appvars._port_636: "636" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/openldap/openldap.netmode.yml b/compose/.apps/openldap/openldap.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/openldap/openldap.netmode.yml +++ b/compose/.apps/openldap/openldap.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/openldap/openldap.ports.yml b/compose/.apps/openldap/openldap.ports.yml index 92bad13df5..0407cbdbe8 100644 --- a/compose/.apps/openldap/openldap.ports.yml +++ b/compose/.apps/openldap/openldap.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_389}:389 - - ${${_APPNAME_}_PORT_636}:636 + - ${_PORT_389}:389 + - ${_PORT_636}:636 diff --git a/compose/.apps/openldap/openldap.x86_64.yml b/compose/.apps/openldap/openldap.x86_64.yml index e643004044..167b24f0bd 100644 --- a/compose/.apps/openldap/openldap.x86_64.yml +++ b/compose/.apps/openldap/openldap.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: osixia/openldap:${${_APPNAME_}_TAG} + : + image: osixia/openldap:${_TAG} diff --git a/compose/.apps/openldap/openldap.yml b/compose/.apps/openldap/openldap.yml index aad06214d4..0bcec7cf6c 100644 --- a/compose/.apps/openldap/openldap.yml +++ b/compose/.apps/openldap/openldap.yml @@ -1,21 +1,21 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - LDAP_ADMIN_PASSWORD=${${_APPNAME_}_ENVIRONMENT_ADMIN_PASSWORD} - - LDAP_BACKEND=${${_APPNAME_}_ENVIRONMENT_BACKEND} - - LDAP_CONFIG_PASSWORD=${${_APPNAME_}_ENVIRONMENT_CONFIG_PASSWORD} - - LDAP_DOMAIN=${${_APPNAME_}_ENVIRONMENT_DOMAIN} + - LDAP_ADMIN_PASSWORD=${_ENVIRONMENT_ADMIN_PASSWORD} + - LDAP_BACKEND=${_ENVIRONMENT_BACKEND} + - LDAP_CONFIG_PASSWORD=${_ENVIRONMENT_CONFIG_PASSWORD} + - LDAP_DOMAIN=${_ENVIRONMENT_DOMAIN} - LDAP_OPENLDAP_GID=${PGID} - LDAP_OPENLDAP_UID=${PUID} - - LDAP_ORGANISATION=${${_APPNAME_}_ENVIRONMENT_ORGANISATION} - - LDAP_READONLY_USER_PASSWORD=${${_APPNAME_}_ENVIRONMENT_READONLY_USER_PASSWORD} - - LDAP_READONLY_USER_USERNAME=${${_APPNAME_}_ENVIRONMENT_READONLY_USER_USERNAME} - - LDAP_READONLY_USER=${${_APPNAME_}_ENVIRONMENT_READONLY_USER} + - LDAP_ORGANISATION=${_ENVIRONMENT_ORGANISATION} + - LDAP_READONLY_USER_PASSWORD=${_ENVIRONMENT_READONLY_USER_PASSWORD} + - LDAP_READONLY_USER_USERNAME=${_ENVIRONMENT_READONLY_USER_USERNAME} + - LDAP_READONLY_USER=${_ENVIRONMENT_READONLY_USER} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/database:/var/lib/ldap - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/config:/etc/ldap/ + - ${DOCKER_VOLUME_CONFIG}//database:/var/lib/ldap + - ${DOCKER_VOLUME_CONFIG}//config:/etc/ldap/ - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/openspeedtest/openspeedtest.aarch64.yml b/compose/.apps/openspeedtest/openspeedtest.aarch64.yml index a36b05856c..3d00e9cba2 100644 --- a/compose/.apps/openspeedtest/openspeedtest.aarch64.yml +++ b/compose/.apps/openspeedtest/openspeedtest.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: openspeedtest/latest:${${_APPNAME_}_TAG} + : + image: openspeedtest/latest:${_TAG} diff --git a/compose/.apps/openspeedtest/openspeedtest.hostname.yml b/compose/.apps/openspeedtest/openspeedtest.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/openspeedtest/openspeedtest.hostname.yml +++ b/compose/.apps/openspeedtest/openspeedtest.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/openspeedtest/openspeedtest.labels.yml b/compose/.apps/openspeedtest/openspeedtest.labels.yml index 4b9a81affb..08bab6f683 100644 --- a/compose/.apps/openspeedtest/openspeedtest.labels.yml +++ b/compose/.apps/openspeedtest/openspeedtest.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "This is a self-hosted speedtest service" com.dockstarter.appinfo.nicename: "OpenSpeedTest" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_base_path: "/" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_3000: "3000" - com.dockstarter.appvars.${_appname_}_port_3001: "3001" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_base_path: "/" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_3000: "3000" + com.dockstarter.appvars._port_3001: "3001" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/openspeedtest/openspeedtest.netmode.yml b/compose/.apps/openspeedtest/openspeedtest.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/openspeedtest/openspeedtest.netmode.yml +++ b/compose/.apps/openspeedtest/openspeedtest.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/openspeedtest/openspeedtest.ports.yml b/compose/.apps/openspeedtest/openspeedtest.ports.yml index 05b2c2d6d3..1510c0959b 100644 --- a/compose/.apps/openspeedtest/openspeedtest.ports.yml +++ b/compose/.apps/openspeedtest/openspeedtest.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_3000}:3000 - - ${${_APPNAME_}_PORT_3001}:3001 + - ${_PORT_3000}:3000 + - ${_PORT_3001}:3001 diff --git a/compose/.apps/openspeedtest/openspeedtest.x86_64.yml b/compose/.apps/openspeedtest/openspeedtest.x86_64.yml index a36b05856c..3d00e9cba2 100644 --- a/compose/.apps/openspeedtest/openspeedtest.x86_64.yml +++ b/compose/.apps/openspeedtest/openspeedtest.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: openspeedtest/latest:${${_APPNAME_}_TAG} + : + image: openspeedtest/latest:${_TAG} diff --git a/compose/.apps/openspeedtest/openspeedtest.yml b/compose/.apps/openspeedtest/openspeedtest.yml index b6fff875ee..2316c9b42c 100644 --- a/compose/.apps/openspeedtest/openspeedtest.yml +++ b/compose/.apps/openspeedtest/openspeedtest.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - - BASE_PATH=${${_APPNAME_}_ENVIRONMENT_BASE_PATH} + - BASE_PATH=${_ENVIRONMENT_BASE_PATH} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/openvpnas/openvpnas.hostname.yml b/compose/.apps/openvpnas/openvpnas.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/openvpnas/openvpnas.hostname.yml +++ b/compose/.apps/openvpnas/openvpnas.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/openvpnas/openvpnas.labels.yml b/compose/.apps/openvpnas/openvpnas.labels.yml index 119466321d..9852071b0d 100644 --- a/compose/.apps/openvpnas/openvpnas.labels.yml +++ b/compose/.apps/openvpnas/openvpnas.labels.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Secure network tunneling VPN" com.dockstarter.appinfo.nicename: "OpenVPNAS" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_interface: "eth0" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_1194: "1194" - com.dockstarter.appvars.${_appname_}_port_943: "943" - com.dockstarter.appvars.${_appname_}_port_9443: "9443" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_interface: "eth0" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_1194: "1194" + com.dockstarter.appvars._port_943: "943" + com.dockstarter.appvars._port_9443: "9443" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/openvpnas/openvpnas.netmode.yml b/compose/.apps/openvpnas/openvpnas.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/openvpnas/openvpnas.netmode.yml +++ b/compose/.apps/openvpnas/openvpnas.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/openvpnas/openvpnas.ports.yml b/compose/.apps/openvpnas/openvpnas.ports.yml index 4447ab29fb..7fa41ff015 100644 --- a/compose/.apps/openvpnas/openvpnas.ports.yml +++ b/compose/.apps/openvpnas/openvpnas.ports.yml @@ -1,6 +1,6 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_1194}:1194/udp - - ${${_APPNAME_}_PORT_943}:943 - - ${${_APPNAME_}_PORT_9443}:9443 + - ${_PORT_1194}:1194/udp + - ${_PORT_943}:943 + - ${_PORT_9443}:9443 diff --git a/compose/.apps/openvpnas/openvpnas.x86_64.yml b/compose/.apps/openvpnas/openvpnas.x86_64.yml index 2e81426a2c..23ab037b23 100644 --- a/compose/.apps/openvpnas/openvpnas.x86_64.yml +++ b/compose/.apps/openvpnas/openvpnas.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/openvpn-as:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/openvpn-as:${_TAG} diff --git a/compose/.apps/openvpnas/openvpnas.yml b/compose/.apps/openvpnas/openvpnas.yml index 7cb9b7036b..754d4685e4 100644 --- a/compose/.apps/openvpnas/openvpnas.yml +++ b/compose/.apps/openvpnas/openvpnas.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: + : cap_add: - NET_ADMIN - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} environment: - - INTERFACE=${${_APPNAME_}_ENVIRONMENT_INTERFACE} + - INTERFACE=${_ENVIRONMENT_INTERFACE} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/organizr/organizr.aarch64.yml b/compose/.apps/organizr/organizr.aarch64.yml index 5ff5cf7973..62bd870874 100644 --- a/compose/.apps/organizr/organizr.aarch64.yml +++ b/compose/.apps/organizr/organizr.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/organizr/organizr:${${_APPNAME_}_TAG} + : + image: ghcr.io/organizr/organizr:${_TAG} diff --git a/compose/.apps/organizr/organizr.hostname.yml b/compose/.apps/organizr/organizr.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/organizr/organizr.hostname.yml +++ b/compose/.apps/organizr/organizr.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/organizr/organizr.labels.yml b/compose/.apps/organizr/organizr.labels.yml index ee6e541fdd..68c14b6e6b 100644 --- a/compose/.apps/organizr/organizr.labels.yml +++ b/compose/.apps/organizr/organizr.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "HTPC/Homelab Services Organizer" com.dockstarter.appinfo.nicename: "Organizr" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_branch: "v2-master" - com.dockstarter.appvars.${_appname_}_environment_fpm: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_80: "8006" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_branch: "v2-master" + com.dockstarter.appvars._environment_fpm: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_80: "8006" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/organizr/organizr.netmode.yml b/compose/.apps/organizr/organizr.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/organizr/organizr.netmode.yml +++ b/compose/.apps/organizr/organizr.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/organizr/organizr.ports.yml b/compose/.apps/organizr/organizr.ports.yml index c37afbebb5..32f14e45fb 100644 --- a/compose/.apps/organizr/organizr.ports.yml +++ b/compose/.apps/organizr/organizr.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_80}:80 diff --git a/compose/.apps/organizr/organizr.x86_64.yml b/compose/.apps/organizr/organizr.x86_64.yml index 5ff5cf7973..62bd870874 100644 --- a/compose/.apps/organizr/organizr.x86_64.yml +++ b/compose/.apps/organizr/organizr.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/organizr/organizr:${${_APPNAME_}_TAG} + : + image: ghcr.io/organizr/organizr:${_TAG} diff --git a/compose/.apps/organizr/organizr.yml b/compose/.apps/organizr/organizr.yml index bb62495d24..bc35813a3b 100644 --- a/compose/.apps/organizr/organizr.yml +++ b/compose/.apps/organizr/organizr.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - branch=${${_APPNAME_}_ENVIRONMENT_BRANCH} - - fpm=${${_APPNAME_}_ENVIRONMENT_FPM} + - branch=${_ENVIRONMENT_BRANCH} + - fpm=${_ENVIRONMENT_FPM} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/ouroboros/ouroboros.aarch64.yml b/compose/.apps/ouroboros/ouroboros.aarch64.yml index efffc6dbf3..270d9d09c0 100644 --- a/compose/.apps/ouroboros/ouroboros.aarch64.yml +++ b/compose/.apps/ouroboros/ouroboros.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: pyouroboros/ouroboros:${${_APPNAME_}_TAG} + : + image: pyouroboros/ouroboros:${_TAG} diff --git a/compose/.apps/ouroboros/ouroboros.hostname.yml b/compose/.apps/ouroboros/ouroboros.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/ouroboros/ouroboros.hostname.yml +++ b/compose/.apps/ouroboros/ouroboros.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/ouroboros/ouroboros.labels.yml b/compose/.apps/ouroboros/ouroboros.labels.yml index 32bee7e29d..df9932f372 100644 --- a/compose/.apps/ouroboros/ouroboros.labels.yml +++ b/compose/.apps/ouroboros/ouroboros.labels.yml @@ -1,21 +1,21 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) Use Watchtower" com.dockstarter.appinfo.nicename: "Ouroboros" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_cleanup: "true" - com.dockstarter.appvars.${_appname_}_environment_cron: "0 4 * * *" - com.dockstarter.appvars.${_appname_}_environment_ignore: "" - com.dockstarter.appvars.${_appname_}_environment_log_level: "info" - com.dockstarter.appvars.${_appname_}_environment_monitor: "" - com.dockstarter.appvars.${_appname_}_environment_notifiers: "" - com.dockstarter.appvars.${_appname_}_environment_repo_pass: "" - com.dockstarter.appvars.${_appname_}_environment_repo_user: "" - com.dockstarter.appvars.${_appname_}_environment_self_update: "true" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_cleanup: "true" + com.dockstarter.appvars._environment_cron: "0 4 * * *" + com.dockstarter.appvars._environment_ignore: "" + com.dockstarter.appvars._environment_log_level: "info" + com.dockstarter.appvars._environment_monitor: "" + com.dockstarter.appvars._environment_notifiers: "" + com.dockstarter.appvars._environment_repo_pass: "" + com.dockstarter.appvars._environment_repo_user: "" + com.dockstarter.appvars._environment_self_update: "true" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/ouroboros/ouroboros.netmode.yml b/compose/.apps/ouroboros/ouroboros.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/ouroboros/ouroboros.netmode.yml +++ b/compose/.apps/ouroboros/ouroboros.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/ouroboros/ouroboros.x86_64.yml b/compose/.apps/ouroboros/ouroboros.x86_64.yml index efffc6dbf3..270d9d09c0 100644 --- a/compose/.apps/ouroboros/ouroboros.x86_64.yml +++ b/compose/.apps/ouroboros/ouroboros.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: pyouroboros/ouroboros:${${_APPNAME_}_TAG} + : + image: pyouroboros/ouroboros:${_TAG} diff --git a/compose/.apps/ouroboros/ouroboros.yml b/compose/.apps/ouroboros/ouroboros.yml index a083caa020..16672db12f 100644 --- a/compose/.apps/ouroboros/ouroboros.yml +++ b/compose/.apps/ouroboros/ouroboros.yml @@ -1,19 +1,19 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - CLEANUP=${${_APPNAME_}_ENVIRONMENT_CLEANUP} - - CRON=${${_APPNAME_}_ENVIRONMENT_CRON} - - IGNORE=${${_APPNAME_}_ENVIRONMENT_IGNORE} - - LOG_LEVEL=${${_APPNAME_}_ENVIRONMENT_LOG_LEVEL} - - MONITOR=${${_APPNAME_}_ENVIRONMENT_MONITOR} - - NOTIFIERS=${${_APPNAME_}_ENVIRONMENT_NOTIFIERS} - - REPO_PASS=${${_APPNAME_}_ENVIRONMENT_REPO_PASS} - - REPO_USER=${${_APPNAME_}_ENVIRONMENT_REPO_USER} - - SELF_UPDATE=${${_APPNAME_}_ENVIRONMENT_SELF_UPDATE} + - CLEANUP=${_ENVIRONMENT_CLEANUP} + - CRON=${_ENVIRONMENT_CRON} + - IGNORE=${_ENVIRONMENT_IGNORE} + - LOG_LEVEL=${_ENVIRONMENT_LOG_LEVEL} + - MONITOR=${_ENVIRONMENT_MONITOR} + - NOTIFIERS=${_ENVIRONMENT_NOTIFIERS} + - REPO_PASS=${_ENVIRONMENT_REPO_PASS} + - REPO_USER=${_ENVIRONMENT_REPO_USER} + - SELF_UPDATE=${_ENVIRONMENT_SELF_UPDATE} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock + - ${_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock diff --git a/compose/.apps/overseerr/overseerr.aarch64.yml b/compose/.apps/overseerr/overseerr.aarch64.yml index 4441e3dac4..e8eb83b3c3 100644 --- a/compose/.apps/overseerr/overseerr.aarch64.yml +++ b/compose/.apps/overseerr/overseerr.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/overseerr:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/overseerr:${_TAG} diff --git a/compose/.apps/overseerr/overseerr.hostname.yml b/compose/.apps/overseerr/overseerr.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/overseerr/overseerr.hostname.yml +++ b/compose/.apps/overseerr/overseerr.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/overseerr/overseerr.labels.yml b/compose/.apps/overseerr/overseerr.labels.yml index 2e9c5deff5..c5fea913af 100644 --- a/compose/.apps/overseerr/overseerr.labels.yml +++ b/compose/.apps/overseerr/overseerr.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A request management and media discovery tool" com.dockstarter.appinfo.nicename: "Overseerr" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_5055: "5055" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_5055: "5055" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/overseerr/overseerr.netmode.yml b/compose/.apps/overseerr/overseerr.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/overseerr/overseerr.netmode.yml +++ b/compose/.apps/overseerr/overseerr.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/overseerr/overseerr.ports.yml b/compose/.apps/overseerr/overseerr.ports.yml index 5712ba707f..dfe6fb9838 100644 --- a/compose/.apps/overseerr/overseerr.ports.yml +++ b/compose/.apps/overseerr/overseerr.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_5055}:5055 + - ${_PORT_5055}:5055 diff --git a/compose/.apps/overseerr/overseerr.x86_64.yml b/compose/.apps/overseerr/overseerr.x86_64.yml index 4441e3dac4..e8eb83b3c3 100644 --- a/compose/.apps/overseerr/overseerr.x86_64.yml +++ b/compose/.apps/overseerr/overseerr.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/overseerr:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/overseerr:${_TAG} diff --git a/compose/.apps/overseerr/overseerr.yml b/compose/.apps/overseerr/overseerr.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/overseerr/overseerr.yml +++ b/compose/.apps/overseerr/overseerr.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/petio/petio.aarch64.yml b/compose/.apps/petio/petio.aarch64.yml index c817e6268c..2c57f1cb9b 100644 --- a/compose/.apps/petio/petio.aarch64.yml +++ b/compose/.apps/petio/petio.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/petio-team/petio:${${_APPNAME_}_TAG} + : + image: ghcr.io/petio-team/petio:${_TAG} diff --git a/compose/.apps/petio/petio.hostname.yml b/compose/.apps/petio/petio.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/petio/petio.hostname.yml +++ b/compose/.apps/petio/petio.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/petio/petio.labels.yml b/compose/.apps/petio/petio.labels.yml index 8edee8a46d..468e1bcba5 100644 --- a/compose/.apps/petio/petio.labels.yml +++ b/compose/.apps/petio/petio.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A request companion app" com.dockstarter.appinfo.nicename: "Petio" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_7777: "7777" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_7777: "7777" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/petio/petio.netmode.yml b/compose/.apps/petio/petio.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/petio/petio.netmode.yml +++ b/compose/.apps/petio/petio.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/petio/petio.ports.yml b/compose/.apps/petio/petio.ports.yml index 51c11dd53e..96322cbac9 100644 --- a/compose/.apps/petio/petio.ports.yml +++ b/compose/.apps/petio/petio.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_7777}:7777 + - ${_PORT_7777}:7777 diff --git a/compose/.apps/petio/petio.x86_64.yml b/compose/.apps/petio/petio.x86_64.yml index c817e6268c..2c57f1cb9b 100644 --- a/compose/.apps/petio/petio.x86_64.yml +++ b/compose/.apps/petio/petio.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/petio-team/petio:${${_APPNAME_}_TAG} + : + image: ghcr.io/petio-team/petio:${_TAG} diff --git a/compose/.apps/petio/petio.yml b/compose/.apps/petio/petio.yml index adbb612add..41334e1b53 100644 --- a/compose/.apps/petio/petio.yml +++ b/compose/.apps/petio/petio.yml @@ -1,11 +1,11 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/config:/app/api/config - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/logs:/app/logs + - ${DOCKER_VOLUME_CONFIG}//config:/app/api/config + - ${DOCKER_VOLUME_CONFIG}//logs:/app/logs - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/pgadmin/pgadmin.aarch64.yml b/compose/.apps/pgadmin/pgadmin.aarch64.yml index 80d7b25391..913d20c4d1 100644 --- a/compose/.apps/pgadmin/pgadmin.aarch64.yml +++ b/compose/.apps/pgadmin/pgadmin.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: dpage/pgadmin4:${${_APPNAME_}_TAG} + : + image: dpage/pgadmin4:${_TAG} diff --git a/compose/.apps/pgadmin/pgadmin.hostname.yml b/compose/.apps/pgadmin/pgadmin.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/pgadmin/pgadmin.hostname.yml +++ b/compose/.apps/pgadmin/pgadmin.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/pgadmin/pgadmin.labels.yml b/compose/.apps/pgadmin/pgadmin.labels.yml index 61cb45d4ea..d716f90c05 100644 --- a/compose/.apps/pgadmin/pgadmin.labels.yml +++ b/compose/.apps/pgadmin/pgadmin.labels.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: pgAdmin 4 is a web based administration tool for the PostgreSQL database. com.dockstarter.appinfo.nicename: pgAdmin - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_default_email: "" - com.dockstarter.appvars.${_appname_}_environment_default_password: "" - com.dockstarter.appvars.${_appname_}_environment_disable_postfix: "True" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_80: "5050" - com.dockstarter.appvars.${_appname_}_restart: unless-stopped - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_default_email: "" + com.dockstarter.appvars._environment_default_password: "" + com.dockstarter.appvars._environment_disable_postfix: "True" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_80: "5050" + com.dockstarter.appvars._restart: unless-stopped + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/pgadmin/pgadmin.netmode.yml b/compose/.apps/pgadmin/pgadmin.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/pgadmin/pgadmin.netmode.yml +++ b/compose/.apps/pgadmin/pgadmin.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/pgadmin/pgadmin.ports.yml b/compose/.apps/pgadmin/pgadmin.ports.yml index c37afbebb5..32f14e45fb 100644 --- a/compose/.apps/pgadmin/pgadmin.ports.yml +++ b/compose/.apps/pgadmin/pgadmin.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_80}:80 diff --git a/compose/.apps/pgadmin/pgadmin.x86_64.yml b/compose/.apps/pgadmin/pgadmin.x86_64.yml index 80d7b25391..913d20c4d1 100644 --- a/compose/.apps/pgadmin/pgadmin.x86_64.yml +++ b/compose/.apps/pgadmin/pgadmin.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: dpage/pgadmin4:${${_APPNAME_}_TAG} + : + image: dpage/pgadmin4:${_TAG} diff --git a/compose/.apps/pgadmin/pgadmin.yml b/compose/.apps/pgadmin/pgadmin.yml index 54997b8d0e..aa59c5b3fd 100644 --- a/compose/.apps/pgadmin/pgadmin.yml +++ b/compose/.apps/pgadmin/pgadmin.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - PGADMIN_DEFAULT_EMAIL=${${_APPNAME_}_ENVIRONMENT_DEFAULT_EMAIL} - - PGADMIN_DEFAULT_PASSWORD=${${_APPNAME_}_ENVIRONMENT_DEFAULT_PASSWORD} - - PGADMIN_DISABLE_POSTFIX=${${_APPNAME_}_ENVIRONMENT_DISABLE_POSTFIX} + - PGADMIN_DEFAULT_EMAIL=${_ENVIRONMENT_DEFAULT_EMAIL} + - PGADMIN_DEFAULT_PASSWORD=${_ENVIRONMENT_DEFAULT_PASSWORD} + - PGADMIN_DISABLE_POSTFIX=${_ENVIRONMENT_DISABLE_POSTFIX} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/var/lib/pgadmin + - ${DOCKER_VOLUME_CONFIG}/:/var/lib/pgadmin - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/pgbackup/pgbackup.aarch64.yml b/compose/.apps/pgbackup/pgbackup.aarch64.yml index 93fd4ffac2..ced73bb948 100644 --- a/compose/.apps/pgbackup/pgbackup.aarch64.yml +++ b/compose/.apps/pgbackup/pgbackup.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: prodrigestivill/postgres-backup-local:${${_APPNAME_}_TAG} + : + image: prodrigestivill/postgres-backup-local:${_TAG} diff --git a/compose/.apps/pgbackup/pgbackup.hostname.yml b/compose/.apps/pgbackup/pgbackup.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/pgbackup/pgbackup.hostname.yml +++ b/compose/.apps/pgbackup/pgbackup.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/pgbackup/pgbackup.labels.yml b/compose/.apps/pgbackup/pgbackup.labels.yml index 9b655f6b96..5f126620c3 100644 --- a/compose/.apps/pgbackup/pgbackup.labels.yml +++ b/compose/.apps/pgbackup/pgbackup.labels.yml @@ -1,20 +1,20 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: Backup PostgresSQL to the local filesystem with periodic rotating backups. com.dockstarter.appinfo.nicename: pgBackup - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_keep_days: "8" - com.dockstarter.appvars.${_appname_}_environment_keep_months: "12" - com.dockstarter.appvars.${_appname_}_environment_keep_weeks: "4" - com.dockstarter.appvars.${_appname_}_environment_postgres_db: "" - com.dockstarter.appvars.${_appname_}_environment_postgres_extra_opts: "Z6 --schema=public --blobs" - com.dockstarter.appvars.${_appname_}_environment_postgres_host: "postgres" - com.dockstarter.appvars.${_appname_}_environment_postgres_password: "" - com.dockstarter.appvars.${_appname_}_environment_postgres_user: "" - com.dockstarter.appvars.${_appname_}_environment_schedule: "@daily" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_restart: unless-stopped - com.dockstarter.appvars.${_appname_}_tag: "16" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_keep_days: "8" + com.dockstarter.appvars._environment_keep_months: "12" + com.dockstarter.appvars._environment_keep_weeks: "4" + com.dockstarter.appvars._environment_postgres_db: "" + com.dockstarter.appvars._environment_postgres_extra_opts: "Z6 --schema=public --blobs" + com.dockstarter.appvars._environment_postgres_host: "postgres" + com.dockstarter.appvars._environment_postgres_password: "" + com.dockstarter.appvars._environment_postgres_user: "" + com.dockstarter.appvars._environment_schedule: "@daily" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._restart: unless-stopped + com.dockstarter.appvars._tag: "16" diff --git a/compose/.apps/pgbackup/pgbackup.netmode.yml b/compose/.apps/pgbackup/pgbackup.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/pgbackup/pgbackup.netmode.yml +++ b/compose/.apps/pgbackup/pgbackup.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/pgbackup/pgbackup.x86_64.yml b/compose/.apps/pgbackup/pgbackup.x86_64.yml index 93fd4ffac2..ced73bb948 100644 --- a/compose/.apps/pgbackup/pgbackup.x86_64.yml +++ b/compose/.apps/pgbackup/pgbackup.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: prodrigestivill/postgres-backup-local:${${_APPNAME_}_TAG} + : + image: prodrigestivill/postgres-backup-local:${_TAG} diff --git a/compose/.apps/pgbackup/pgbackup.yml b/compose/.apps/pgbackup/pgbackup.yml index 453fa54e77..146da617b8 100644 --- a/compose/.apps/pgbackup/pgbackup.yml +++ b/compose/.apps/pgbackup/pgbackup.yml @@ -1,18 +1,18 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - BACKUP_KEEP_DAYS=${${_APPNAME_}_ENVIRONMENT_KEEP_DAYS} - - BACKUP_KEEP_MONTHS=${${_APPNAME_}_ENVIRONMENT_KEEP_MONTHS} - - BACKUP_KEEP_WEEKS=${${_APPNAME_}_ENVIRONMENT_KEEP_WEEKS} - - POSTGRES_DB=${${_APPNAME_}_ENVIRONMENT_POSTGRES_DB} - - POSTGRES_EXTRA_OPTS=${${_APPNAME_}_ENVIRONMENT_POSTGRES_EXTRA_OPTS} - - POSTGRES_HOST=${${_APPNAME_}_ENVIRONMENT_POSTGRES_HOST} - - POSTGRES_PASSWORD=${${_APPNAME_}_ENVIRONMENT_POSTGRES_PASSWORD} - - POSTGRES_USER=${${_APPNAME_}_ENVIRONMENT_POSTGRES_USER} - - SCHEDULE=${${_APPNAME_}_ENVIRONMENT_SCHEDULE} + - BACKUP_KEEP_DAYS=${_ENVIRONMENT_KEEP_DAYS} + - BACKUP_KEEP_MONTHS=${_ENVIRONMENT_KEEP_MONTHS} + - BACKUP_KEEP_WEEKS=${_ENVIRONMENT_KEEP_WEEKS} + - POSTGRES_DB=${_ENVIRONMENT_POSTGRES_DB} + - POSTGRES_EXTRA_OPTS=${_ENVIRONMENT_POSTGRES_EXTRA_OPTS} + - POSTGRES_HOST=${_ENVIRONMENT_POSTGRES_HOST} + - POSTGRES_PASSWORD=${_ENVIRONMENT_POSTGRES_PASSWORD} + - POSTGRES_USER=${_ENVIRONMENT_POSTGRES_USER} + - SCHEDULE=${_ENVIRONMENT_SCHEDULE} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}/backups/postgres:/backups diff --git a/compose/.apps/photoshow/photoshow.aarch64.yml b/compose/.apps/photoshow/photoshow.aarch64.yml index fed91e84d3..c733744526 100644 --- a/compose/.apps/photoshow/photoshow.aarch64.yml +++ b/compose/.apps/photoshow/photoshow.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/photoshow:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/photoshow:${_TAG} diff --git a/compose/.apps/photoshow/photoshow.hostname.yml b/compose/.apps/photoshow/photoshow.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/photoshow/photoshow.hostname.yml +++ b/compose/.apps/photoshow/photoshow.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/photoshow/photoshow.labels.yml b/compose/.apps/photoshow/photoshow.labels.yml index 0c4770ce3f..10edc4c7cc 100644 --- a/compose/.apps/photoshow/photoshow.labels.yml +++ b/compose/.apps/photoshow/photoshow.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) No replacement" com.dockstarter.appinfo.nicename: "PhotoShow" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_80: "80" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_images_dir: "/mnt/photoshow/pictures" - com.dockstarter.appvars.${_appname_}_volume_thumbs_dir: "/mnt/photoshow/thumbs" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_80: "80" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_images_dir: "/mnt/photoshow/pictures" + com.dockstarter.appvars._volume_thumbs_dir: "/mnt/photoshow/thumbs" diff --git a/compose/.apps/photoshow/photoshow.netmode.yml b/compose/.apps/photoshow/photoshow.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/photoshow/photoshow.netmode.yml +++ b/compose/.apps/photoshow/photoshow.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/photoshow/photoshow.ports.yml b/compose/.apps/photoshow/photoshow.ports.yml index c37afbebb5..32f14e45fb 100644 --- a/compose/.apps/photoshow/photoshow.ports.yml +++ b/compose/.apps/photoshow/photoshow.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_80}:80 diff --git a/compose/.apps/photoshow/photoshow.x86_64.yml b/compose/.apps/photoshow/photoshow.x86_64.yml index fed91e84d3..c733744526 100644 --- a/compose/.apps/photoshow/photoshow.x86_64.yml +++ b/compose/.apps/photoshow/photoshow.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/photoshow:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/photoshow:${_TAG} diff --git a/compose/.apps/photoshow/photoshow.yml b/compose/.apps/photoshow/photoshow.yml index 59b1f631f2..edb6fc1834 100644 --- a/compose/.apps/photoshow/photoshow.yml +++ b/compose/.apps/photoshow/photoshow.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_IMAGES_DIR}:/Pictures:ro - - ${${_APPNAME_}_VOLUME_THUMBS_DIR}:/Thumbs + - ${_VOLUME_IMAGES_DIR}:/Pictures:ro + - ${_VOLUME_THUMBS_DIR}:/Thumbs diff --git a/compose/.apps/photostructure/photostructure.hostname.yml b/compose/.apps/photostructure/photostructure.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/photostructure/photostructure.hostname.yml +++ b/compose/.apps/photostructure/photostructure.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/photostructure/photostructure.labels.yml b/compose/.apps/photostructure/photostructure.labels.yml index 9cbfb09843..9c7c80bebe 100644 --- a/compose/.apps/photostructure/photostructure.labels.yml +++ b/compose/.apps/photostructure/photostructure.labels.yml @@ -1,16 +1,16 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "PhotoStructure is your new home for all your photos & videos." com.dockstarter.appinfo.nicename: "PhotoStructure" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_expose_network_without_auth: "true" - com.dockstarter.appvars.${_appname_}_environment_force_local_db_replica: "0" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_1787: "1787" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_cache_directory: "/tmp/photostructure_cache" - com.dockstarter.appvars.${_appname_}_volume_library: "/mnt/photostructure" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_expose_network_without_auth: "true" + com.dockstarter.appvars._environment_force_local_db_replica: "0" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_1787: "1787" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_cache_directory: "/tmp/photostructure_cache" + com.dockstarter.appvars._volume_library: "/mnt/photostructure" diff --git a/compose/.apps/photostructure/photostructure.netmode.yml b/compose/.apps/photostructure/photostructure.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/photostructure/photostructure.netmode.yml +++ b/compose/.apps/photostructure/photostructure.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/photostructure/photostructure.ports.yml b/compose/.apps/photostructure/photostructure.ports.yml index 8c2a0b7b5e..0ba0936db1 100644 --- a/compose/.apps/photostructure/photostructure.ports.yml +++ b/compose/.apps/photostructure/photostructure.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_1787}:1787 + - ${_PORT_1787}:1787 diff --git a/compose/.apps/photostructure/photostructure.x86_64.yml b/compose/.apps/photostructure/photostructure.x86_64.yml index 959f38be36..a0a2ec517b 100644 --- a/compose/.apps/photostructure/photostructure.x86_64.yml +++ b/compose/.apps/photostructure/photostructure.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: photostructure/server:${${_APPNAME_}_TAG} + : + image: photostructure/server:${_TAG} diff --git a/compose/.apps/photostructure/photostructure.yml b/compose/.apps/photostructure/photostructure.yml index bccf4138e6..bfec61be7e 100644 --- a/compose/.apps/photostructure/photostructure.yml +++ b/compose/.apps/photostructure/photostructure.yml @@ -1,17 +1,17 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - - PS_EXPOSE_NETWORK_WITHOUT_AUTH=${${_APPNAME_}_ENVIRONMENT_EXPOSE_NETWORK_WITHOUT_AUTH} - - PS_FORCE_LOCAL_DB_REPLICA=${${_APPNAME_}_ENVIRONMENT_FORCE_LOCAL_DB_REPLICA} + - PS_EXPOSE_NETWORK_WITHOUT_AUTH=${_ENVIRONMENT_EXPOSE_NETWORK_WITHOUT_AUTH} + - PS_FORCE_LOCAL_DB_REPLICA=${_ENVIRONMENT_FORCE_LOCAL_DB_REPLICA} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/ps/config - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/logs:/ps/logs + - ${DOCKER_VOLUME_CONFIG}/:/ps/config + - ${DOCKER_VOLUME_CONFIG}//logs:/ps/logs - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_CACHE_DIRECTORY}:/ps/tmp - - ${${_APPNAME_}_VOLUME_LIBRARY}:/ps/library + - ${_VOLUME_CACHE_DIRECTORY}:/ps/tmp + - ${_VOLUME_LIBRARY}:/ps/library diff --git a/compose/.apps/phpmyadmin/phpmyadmin.aarch64.yml b/compose/.apps/phpmyadmin/phpmyadmin.aarch64.yml index 01bfb0d2dc..f48d0c5537 100644 --- a/compose/.apps/phpmyadmin/phpmyadmin.aarch64.yml +++ b/compose/.apps/phpmyadmin/phpmyadmin.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: phpmyadmin:${${_APPNAME_}_TAG} + : + image: phpmyadmin:${_TAG} diff --git a/compose/.apps/phpmyadmin/phpmyadmin.hostname.yml b/compose/.apps/phpmyadmin/phpmyadmin.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/phpmyadmin/phpmyadmin.hostname.yml +++ b/compose/.apps/phpmyadmin/phpmyadmin.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/phpmyadmin/phpmyadmin.labels.yml b/compose/.apps/phpmyadmin/phpmyadmin.labels.yml index ad8a6a3f38..fc80d7529e 100644 --- a/compose/.apps/phpmyadmin/phpmyadmin.labels.yml +++ b/compose/.apps/phpmyadmin/phpmyadmin.labels.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A web interface for MySQL and MariaDB" com.dockstarter.appinfo.nicename: "phpMyAdmin" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_pma_host: "mariadb" - com.dockstarter.appvars.${_appname_}_environment_pma_password: "" - com.dockstarter.appvars.${_appname_}_environment_pma_user: "root" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_80: "8007" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_pma_host: "mariadb" + com.dockstarter.appvars._environment_pma_password: "" + com.dockstarter.appvars._environment_pma_user: "root" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_80: "8007" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/phpmyadmin/phpmyadmin.netmode.yml b/compose/.apps/phpmyadmin/phpmyadmin.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/phpmyadmin/phpmyadmin.netmode.yml +++ b/compose/.apps/phpmyadmin/phpmyadmin.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/phpmyadmin/phpmyadmin.ports.yml b/compose/.apps/phpmyadmin/phpmyadmin.ports.yml index c37afbebb5..32f14e45fb 100644 --- a/compose/.apps/phpmyadmin/phpmyadmin.ports.yml +++ b/compose/.apps/phpmyadmin/phpmyadmin.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_80}:80 diff --git a/compose/.apps/phpmyadmin/phpmyadmin.x86_64.yml b/compose/.apps/phpmyadmin/phpmyadmin.x86_64.yml index 01bfb0d2dc..f48d0c5537 100644 --- a/compose/.apps/phpmyadmin/phpmyadmin.x86_64.yml +++ b/compose/.apps/phpmyadmin/phpmyadmin.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: phpmyadmin:${${_APPNAME_}_TAG} + : + image: phpmyadmin:${_TAG} diff --git a/compose/.apps/phpmyadmin/phpmyadmin.yml b/compose/.apps/phpmyadmin/phpmyadmin.yml index 771ceff9c9..c1fd81c6df 100644 --- a/compose/.apps/phpmyadmin/phpmyadmin.yml +++ b/compose/.apps/phpmyadmin/phpmyadmin.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - PMA_HOST=${${_APPNAME_}_ENVIRONMENT_PMA_HOST} - - PMA_PASSWORD=${${_APPNAME_}_ENVIRONMENT_PMA_PASSWORD} - - PMA_USER=${${_APPNAME_}_ENVIRONMENT_PMA_USER} + - PMA_HOST=${_ENVIRONMENT_PMA_HOST} + - PMA_PASSWORD=${_ENVIRONMENT_PMA_PASSWORD} + - PMA_USER=${_ENVIRONMENT_PMA_USER} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/sessions + - ${DOCKER_VOLUME_CONFIG}/:/sessions - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/picard/picard.hostname.yml b/compose/.apps/picard/picard.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/picard/picard.hostname.yml +++ b/compose/.apps/picard/picard.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/picard/picard.labels.yml b/compose/.apps/picard/picard.labels.yml index d3447d2e78..79a0f3b93f 100644 --- a/compose/.apps/picard/picard.labels.yml +++ b/compose/.apps/picard/picard.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Tool for organizing your music" com.dockstarter.appinfo.nicename: "Picard" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_5800: "5800" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_5800: "5800" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/picard/picard.netmode.yml b/compose/.apps/picard/picard.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/picard/picard.netmode.yml +++ b/compose/.apps/picard/picard.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/picard/picard.ports.yml b/compose/.apps/picard/picard.ports.yml index e628931935..d1f47bfc16 100644 --- a/compose/.apps/picard/picard.ports.yml +++ b/compose/.apps/picard/picard.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_5800}:5800 + - ${_PORT_5800}:5800 diff --git a/compose/.apps/picard/picard.x86_64.yml b/compose/.apps/picard/picard.x86_64.yml index b68dfc802d..13fcc93acc 100644 --- a/compose/.apps/picard/picard.x86_64.yml +++ b/compose/.apps/picard/picard.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: mikenye/picard:${${_APPNAME_}_TAG} + : + image: mikenye/picard:${_TAG} diff --git a/compose/.apps/picard/picard.yml b/compose/.apps/picard/picard.yml index 6c9e7bc9b9..4b0a683c82 100644 --- a/compose/.apps/picard/picard.yml +++ b/compose/.apps/picard/picard.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - GROUP_ID=${PGID} - TZ=${TZ} - USER_ID=${PUID} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/pihole/pihole.aarch64.yml b/compose/.apps/pihole/pihole.aarch64.yml index 57f95056f0..66f5afcb1a 100644 --- a/compose/.apps/pihole/pihole.aarch64.yml +++ b/compose/.apps/pihole/pihole.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: pihole/pihole:${${_APPNAME_}_TAG} + : + image: pihole/pihole:${_TAG} diff --git a/compose/.apps/pihole/pihole.hostname.yml b/compose/.apps/pihole/pihole.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/pihole/pihole.hostname.yml +++ b/compose/.apps/pihole/pihole.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/pihole/pihole.labels.yml b/compose/.apps/pihole/pihole.labels.yml index ef0d69d267..51fcf39b30 100644 --- a/compose/.apps/pihole/pihole.labels.yml +++ b/compose/.apps/pihole/pihole.labels.yml @@ -1,19 +1,19 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A black hole for internet advertisements" com.dockstarter.appinfo.nicename: "PiHole" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_dns1: "1.1.1.1" - com.dockstarter.appvars.${_appname_}_environment_dns2: "8.8.8.8" - com.dockstarter.appvars.${_appname_}_environment_serverip: "0.0.0.0" - com.dockstarter.appvars.${_appname_}_environment_webpassword: "" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_443: "446" - com.dockstarter.appvars.${_appname_}_port_53: "53" - com.dockstarter.appvars.${_appname_}_port_67: "67" - com.dockstarter.appvars.${_appname_}_port_80: "8008" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_dns1: "1.1.1.1" + com.dockstarter.appvars._environment_dns2: "8.8.8.8" + com.dockstarter.appvars._environment_serverip: "0.0.0.0" + com.dockstarter.appvars._environment_webpassword: "" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_443: "446" + com.dockstarter.appvars._port_53: "53" + com.dockstarter.appvars._port_67: "67" + com.dockstarter.appvars._port_80: "8008" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/pihole/pihole.netmode.yml b/compose/.apps/pihole/pihole.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/pihole/pihole.netmode.yml +++ b/compose/.apps/pihole/pihole.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/pihole/pihole.ports.yml b/compose/.apps/pihole/pihole.ports.yml index 368dc6e022..f44df07638 100644 --- a/compose/.apps/pihole/pihole.ports.yml +++ b/compose/.apps/pihole/pihole.ports.yml @@ -1,8 +1,8 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_443}:443 - - ${${_APPNAME_}_PORT_80}:80 - - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${${_APPNAME_}_PORT_53}:53 - - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${${_APPNAME_}_PORT_53}:53/udp - - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${${_APPNAME_}_PORT_67}:67/udp + - ${_PORT_443}:443 + - ${_PORT_80}:80 + - ${_ENVIRONMENT_SERVERIP}:${_PORT_53}:53 + - ${_ENVIRONMENT_SERVERIP}:${_PORT_53}:53/udp + - ${_ENVIRONMENT_SERVERIP}:${_PORT_67}:67/udp diff --git a/compose/.apps/pihole/pihole.x86_64.yml b/compose/.apps/pihole/pihole.x86_64.yml index 57f95056f0..66f5afcb1a 100644 --- a/compose/.apps/pihole/pihole.x86_64.yml +++ b/compose/.apps/pihole/pihole.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: pihole/pihole:${${_APPNAME_}_TAG} + : + image: pihole/pihole:${_TAG} diff --git a/compose/.apps/pihole/pihole.yml b/compose/.apps/pihole/pihole.yml index 2f180a6ff2..0fcb6905a9 100644 --- a/compose/.apps/pihole/pihole.yml +++ b/compose/.apps/pihole/pihole.yml @@ -1,21 +1,21 @@ services: - ${_appname_}: + : cap_add: - NET_ADMIN - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} dns: - 127.0.0.1 - - ${${_APPNAME_}_ENVIRONMENT_DNS1} - - ${${_APPNAME_}_ENVIRONMENT_DNS2} + - ${_ENVIRONMENT_DNS1} + - ${_ENVIRONMENT_DNS2} environment: - - DNS1=${${_APPNAME_}_ENVIRONMENT_DNS1} - - DNS2=${${_APPNAME_}_ENVIRONMENT_DNS2} - - ServerIP=${${_APPNAME_}_ENVIRONMENT_SERVERIP} + - DNS1=${_ENVIRONMENT_DNS1} + - DNS2=${_ENVIRONMENT_DNS2} + - ServerIP=${_ENVIRONMENT_SERVERIP} - TZ=${TZ} - - WEBPASSWORD=${${_APPNAME_}_ENVIRONMENT_WEBPASSWORD} - restart: ${${_APPNAME_}_RESTART} + - WEBPASSWORD=${_ENVIRONMENT_WEBPASSWORD} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/dnsmasq.d:/etc/dnsmasq.d - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/pihole:/etc/pihole + - ${DOCKER_VOLUME_CONFIG}//dnsmasq.d:/etc/dnsmasq.d + - ${DOCKER_VOLUME_CONFIG}//pihole:/etc/pihole - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/piwigo/piwigo.aarch64.yml b/compose/.apps/piwigo/piwigo.aarch64.yml index 8b7cc902f8..d537f9e7cd 100644 --- a/compose/.apps/piwigo/piwigo.aarch64.yml +++ b/compose/.apps/piwigo/piwigo.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/piwigo:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/piwigo:${_TAG} diff --git a/compose/.apps/piwigo/piwigo.hostname.yml b/compose/.apps/piwigo/piwigo.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/piwigo/piwigo.hostname.yml +++ b/compose/.apps/piwigo/piwigo.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/piwigo/piwigo.labels.yml b/compose/.apps/piwigo/piwigo.labels.yml index 321673f264..086d48b940 100644 --- a/compose/.apps/piwigo/piwigo.labels.yml +++ b/compose/.apps/piwigo/piwigo.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Photo gallery software for the web" com.dockstarter.appinfo.nicename: "Piwigo" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_80: "80" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_80: "80" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/piwigo/piwigo.netmode.yml b/compose/.apps/piwigo/piwigo.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/piwigo/piwigo.netmode.yml +++ b/compose/.apps/piwigo/piwigo.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/piwigo/piwigo.ports.yml b/compose/.apps/piwigo/piwigo.ports.yml index c37afbebb5..32f14e45fb 100644 --- a/compose/.apps/piwigo/piwigo.ports.yml +++ b/compose/.apps/piwigo/piwigo.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_80}:80 diff --git a/compose/.apps/piwigo/piwigo.x86_64.yml b/compose/.apps/piwigo/piwigo.x86_64.yml index 8b7cc902f8..d537f9e7cd 100644 --- a/compose/.apps/piwigo/piwigo.x86_64.yml +++ b/compose/.apps/piwigo/piwigo.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/piwigo:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/piwigo:${_TAG} diff --git a/compose/.apps/piwigo/piwigo.yml b/compose/.apps/piwigo/piwigo.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/piwigo/piwigo.yml +++ b/compose/.apps/piwigo/piwigo.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/plex/plex.aarch64.yml b/compose/.apps/plex/plex.aarch64.yml index e387757f1d..079128bfe2 100644 --- a/compose/.apps/plex/plex.aarch64.yml +++ b/compose/.apps/plex/plex.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/plex:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/plex:${_TAG} diff --git a/compose/.apps/plex/plex.hostname.yml b/compose/.apps/plex/plex.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/plex/plex.hostname.yml +++ b/compose/.apps/plex/plex.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/plex/plex.labels.yml b/compose/.apps/plex/plex.labels.yml index 083beee3b4..cdfa5884f7 100644 --- a/compose/.apps/plex/plex.labels.yml +++ b/compose/.apps/plex/plex.labels.yml @@ -1,23 +1,23 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Organizes all of your video, music and photo collections" com.dockstarter.appinfo.nicename: "Plex" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_plex_claim: "https://plex.tv/claim" - com.dockstarter.appvars.${_appname_}_environment_version: "docker" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_1900: "1900" - com.dockstarter.appvars.${_appname_}_port_3005: "3005" - com.dockstarter.appvars.${_appname_}_port_32400: "32400" - com.dockstarter.appvars.${_appname_}_port_32410: "32410" - com.dockstarter.appvars.${_appname_}_port_32412: "32412" - com.dockstarter.appvars.${_appname_}_port_32413: "32413" - com.dockstarter.appvars.${_appname_}_port_32414: "32414" - com.dockstarter.appvars.${_appname_}_port_32469: "32469" - com.dockstarter.appvars.${_appname_}_port_33400: "33400" - com.dockstarter.appvars.${_appname_}_port_8324: "8324" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_plex_claim: "https://plex.tv/claim" + com.dockstarter.appvars._environment_version: "docker" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_1900: "1900" + com.dockstarter.appvars._port_3005: "3005" + com.dockstarter.appvars._port_32400: "32400" + com.dockstarter.appvars._port_32410: "32410" + com.dockstarter.appvars._port_32412: "32412" + com.dockstarter.appvars._port_32413: "32413" + com.dockstarter.appvars._port_32414: "32414" + com.dockstarter.appvars._port_32469: "32469" + com.dockstarter.appvars._port_33400: "33400" + com.dockstarter.appvars._port_8324: "8324" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/plex/plex.netmode.yml b/compose/.apps/plex/plex.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/plex/plex.netmode.yml +++ b/compose/.apps/plex/plex.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/plex/plex.ports.yml b/compose/.apps/plex/plex.ports.yml index e14288e6bc..6a30085bae 100644 --- a/compose/.apps/plex/plex.ports.yml +++ b/compose/.apps/plex/plex.ports.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_1900}:1900/udp - - ${${_APPNAME_}_PORT_3005}:3005 - - ${${_APPNAME_}_PORT_32400}:32400 - - ${${_APPNAME_}_PORT_32410}:32410/udp - - ${${_APPNAME_}_PORT_32412}:32412/udp - - ${${_APPNAME_}_PORT_32413}:32413/udp - - ${${_APPNAME_}_PORT_32414}:32414/udp - - ${${_APPNAME_}_PORT_32469}:32469 - - ${${_APPNAME_}_PORT_33400}:33400 - - ${${_APPNAME_}_PORT_8324}:8324 + - ${_PORT_1900}:1900/udp + - ${_PORT_3005}:3005 + - ${_PORT_32400}:32400 + - ${_PORT_32410}:32410/udp + - ${_PORT_32412}:32412/udp + - ${_PORT_32413}:32413/udp + - ${_PORT_32414}:32414/udp + - ${_PORT_32469}:32469 + - ${_PORT_33400}:33400 + - ${_PORT_8324}:8324 diff --git a/compose/.apps/plex/plex.x86_64.yml b/compose/.apps/plex/plex.x86_64.yml index e387757f1d..079128bfe2 100644 --- a/compose/.apps/plex/plex.x86_64.yml +++ b/compose/.apps/plex/plex.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/plex:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/plex:${_TAG} diff --git a/compose/.apps/plex/plex.yml b/compose/.apps/plex/plex.yml index 9f884e2788..0486a542cf 100644 --- a/compose/.apps/plex/plex.yml +++ b/compose/.apps/plex/plex.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - - PLEX_CLAIM=${${_APPNAME_}_ENVIRONMENT_PLEX_CLAIM} + - PLEX_CLAIM=${_ENVIRONMENT_PLEX_CLAIM} - PUID=${PUID} - TZ=${TZ} - - VERSION=${${_APPNAME_}_ENVIRONMENT_VERSION} - restart: ${${_APPNAME_}_RESTART} + - VERSION=${_ENVIRONMENT_VERSION} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/plexanisync/plexanisync.aarch64.yml b/compose/.apps/plexanisync/plexanisync.aarch64.yml index 81419faeb1..28ec83fd1e 100644 --- a/compose/.apps/plexanisync/plexanisync.aarch64.yml +++ b/compose/.apps/plexanisync/plexanisync.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: rickdb/plexanisync:${${_APPNAME_}_TAG} + : + image: rickdb/plexanisync:${_TAG} diff --git a/compose/.apps/plexanisync/plexanisync.hostname.yml b/compose/.apps/plexanisync/plexanisync.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/plexanisync/plexanisync.hostname.yml +++ b/compose/.apps/plexanisync/plexanisync.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/plexanisync/plexanisync.labels.yml b/compose/.apps/plexanisync/plexanisync.labels.yml index 4e01f1ff6a..abfa022298 100644 --- a/compose/.apps/plexanisync/plexanisync.labels.yml +++ b/compose/.apps/plexanisync/plexanisync.labels.yml @@ -1,17 +1,17 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Sync anime watched status from Plex to AniList" com.dockstarter.appinfo.nicename: "Plexanisync" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_ani_token: "" - com.dockstarter.appvars.${_appname_}_environment_ani_username: "" - com.dockstarter.appvars.${_appname_}_environment_interval: "3600" - com.dockstarter.appvars.${_appname_}_environment_plex_section: "Anime" - com.dockstarter.appvars.${_appname_}_environment_plex_token: "" - com.dockstarter.appvars.${_appname_}_environment_plex_url: "http://plex:32400" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_ani_token: "" + com.dockstarter.appvars._environment_ani_username: "" + com.dockstarter.appvars._environment_interval: "3600" + com.dockstarter.appvars._environment_plex_section: "Anime" + com.dockstarter.appvars._environment_plex_token: "" + com.dockstarter.appvars._environment_plex_url: "http://plex:32400" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/plexanisync/plexanisync.netmode.yml b/compose/.apps/plexanisync/plexanisync.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/plexanisync/plexanisync.netmode.yml +++ b/compose/.apps/plexanisync/plexanisync.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/plexanisync/plexanisync.x86_64.yml b/compose/.apps/plexanisync/plexanisync.x86_64.yml index 81419faeb1..28ec83fd1e 100644 --- a/compose/.apps/plexanisync/plexanisync.x86_64.yml +++ b/compose/.apps/plexanisync/plexanisync.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: rickdb/plexanisync:${${_APPNAME_}_TAG} + : + image: rickdb/plexanisync:${_TAG} diff --git a/compose/.apps/plexanisync/plexanisync.yml b/compose/.apps/plexanisync/plexanisync.yml index 16bef094c4..e492779b79 100644 --- a/compose/.apps/plexanisync/plexanisync.yml +++ b/compose/.apps/plexanisync/plexanisync.yml @@ -1,17 +1,17 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - ANI_TOKEN=${${_APPNAME_}_ENVIRONMENT_ANI_TOKEN} - - ANI_USERNAME=${${_APPNAME_}_ENVIRONMENT_ANI_USERNAME} - - INTERVAL=${${_APPNAME_}_ENVIRONMENT_INTERVAL} + - ANI_TOKEN=${_ENVIRONMENT_ANI_TOKEN} + - ANI_USERNAME=${_ENVIRONMENT_ANI_USERNAME} + - INTERVAL=${_ENVIRONMENT_INTERVAL} - PGID=${PGID} - - PLEX_SECTION=${${_APPNAME_}_ENVIRONMENT_PLEX_SECTION} - - PLEX_TOKEN=${${_APPNAME_}_ENVIRONMENT_PLEX_TOKEN} - - PLEX_URL=${${_APPNAME_}_ENVIRONMENT_PLEX_URL} + - PLEX_SECTION=${_ENVIRONMENT_PLEX_SECTION} + - PLEX_TOKEN=${_ENVIRONMENT_PLEX_TOKEN} + - PLEX_URL=${_ENVIRONMENT_PLEX_URL} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/plexrequests/plexrequests.hostname.yml b/compose/.apps/plexrequests/plexrequests.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/plexrequests/plexrequests.hostname.yml +++ b/compose/.apps/plexrequests/plexrequests.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/plexrequests/plexrequests.labels.yml b/compose/.apps/plexrequests/plexrequests.labels.yml index d65c42f38a..e920ecb16d 100644 --- a/compose/.apps/plexrequests/plexrequests.labels.yml +++ b/compose/.apps/plexrequests/plexrequests.labels.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) Use Ombi" diff --git a/compose/.apps/plexrequests/plexrequests.netmode.yml b/compose/.apps/plexrequests/plexrequests.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/plexrequests/plexrequests.netmode.yml +++ b/compose/.apps/plexrequests/plexrequests.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/plexrequests/plexrequests.ports.yml b/compose/.apps/plexrequests/plexrequests.ports.yml index 40e1a7dee8..ba1bfa6d83 100644 --- a/compose/.apps/plexrequests/plexrequests.ports.yml +++ b/compose/.apps/plexrequests/plexrequests.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_3000}:3000 + - ${_PORT_3000}:3000 diff --git a/compose/.apps/plexrequests/plexrequests.x86_64.yml b/compose/.apps/plexrequests/plexrequests.x86_64.yml index 4ea976a51e..e4da7fb2a6 100644 --- a/compose/.apps/plexrequests/plexrequests.x86_64.yml +++ b/compose/.apps/plexrequests/plexrequests.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/plexrequests:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/plexrequests:${_TAG} diff --git a/compose/.apps/plexrequests/plexrequests.yml b/compose/.apps/plexrequests/plexrequests.yml index ef87fc3975..80bfc17b91 100644 --- a/compose/.apps/plexrequests/plexrequests.yml +++ b/compose/.apps/plexrequests/plexrequests.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - URL_BASE=/plexrequests - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/portainer/portainer.aarch64.yml b/compose/.apps/portainer/portainer.aarch64.yml index 4c148773d3..66591f228c 100644 --- a/compose/.apps/portainer/portainer.aarch64.yml +++ b/compose/.apps/portainer/portainer.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: portainer/portainer-ce:${${_APPNAME_}_TAG} + : + image: portainer/portainer-ce:${_TAG} diff --git a/compose/.apps/portainer/portainer.hostname.yml b/compose/.apps/portainer/portainer.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/portainer/portainer.hostname.yml +++ b/compose/.apps/portainer/portainer.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/portainer/portainer.labels.yml b/compose/.apps/portainer/portainer.labels.yml index b5ac6cc1f8..0482835a17 100644 --- a/compose/.apps/portainer/portainer.labels.yml +++ b/compose/.apps/portainer/portainer.labels.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Simple management UI for Docker" com.dockstarter.appinfo.nicename: "Portainer" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_9000: "9000" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_9000: "9000" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/portainer/portainer.netmode.yml b/compose/.apps/portainer/portainer.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/portainer/portainer.netmode.yml +++ b/compose/.apps/portainer/portainer.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/portainer/portainer.ports.yml b/compose/.apps/portainer/portainer.ports.yml index f725dec1dd..dfec7772e1 100644 --- a/compose/.apps/portainer/portainer.ports.yml +++ b/compose/.apps/portainer/portainer.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_9000}:9000 + - ${_PORT_9000}:9000 diff --git a/compose/.apps/portainer/portainer.x86_64.yml b/compose/.apps/portainer/portainer.x86_64.yml index 4c148773d3..66591f228c 100644 --- a/compose/.apps/portainer/portainer.x86_64.yml +++ b/compose/.apps/portainer/portainer.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: portainer/portainer-ce:${${_APPNAME_}_TAG} + : + image: portainer/portainer-ce:${_TAG} diff --git a/compose/.apps/portainer/portainer.yml b/compose/.apps/portainer/portainer.yml index e0a0592a82..d1b2d24848 100644 --- a/compose/.apps/portainer/portainer.yml +++ b/compose/.apps/portainer/portainer.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : command: "-H unix:///var/run/docker.sock" - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} environment: - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/data + - ${DOCKER_VOLUME_CONFIG}/:/data - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock + - ${_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock diff --git a/compose/.apps/portaineragent/portaineragent.aarch64.yml b/compose/.apps/portaineragent/portaineragent.aarch64.yml index c2cc8e703b..36156d1b8f 100644 --- a/compose/.apps/portaineragent/portaineragent.aarch64.yml +++ b/compose/.apps/portaineragent/portaineragent.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: portainer/agent:${${_APPNAME_}_TAG} + : + image: portainer/agent:${_TAG} diff --git a/compose/.apps/portaineragent/portaineragent.hostname.yml b/compose/.apps/portaineragent/portaineragent.hostname.yml index b8e5ba9b02..a4aa8b800b 100644 --- a/compose/.apps/portaineragent/portaineragent.hostname.yml +++ b/compose/.apps/portaineragent/portaineragent.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: portaineragent diff --git a/compose/.apps/portaineragent/portaineragent.labels.yml b/compose/.apps/portaineragent/portaineragent.labels.yml index 67a5444a0f..af53128869 100644 --- a/compose/.apps/portaineragent/portaineragent.labels.yml +++ b/compose/.apps/portaineragent/portaineragent.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "An agent used to manage all the resources in a Swarm cluster" com.dockstarter.appinfo.nicename: "PortainerAgent" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_9001: "9001" - com.dockstarter.appvars.${_appname_}_environment_cap_host_management: "1" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_9001: "9001" + com.dockstarter.appvars._environment_cap_host_management: "1" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/portaineragent/portaineragent.netmode.yml b/compose/.apps/portaineragent/portaineragent.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/portaineragent/portaineragent.netmode.yml +++ b/compose/.apps/portaineragent/portaineragent.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/portaineragent/portaineragent.ports.yml b/compose/.apps/portaineragent/portaineragent.ports.yml index 2c69ddbd75..ed09b10ae9 100644 --- a/compose/.apps/portaineragent/portaineragent.ports.yml +++ b/compose/.apps/portaineragent/portaineragent.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_9001}:9001 + - ${_PORT_9001}:9001 diff --git a/compose/.apps/portaineragent/portaineragent.x86_64.yml b/compose/.apps/portaineragent/portaineragent.x86_64.yml index c2cc8e703b..36156d1b8f 100644 --- a/compose/.apps/portaineragent/portaineragent.x86_64.yml +++ b/compose/.apps/portaineragent/portaineragent.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: portainer/agent:${${_APPNAME_}_TAG} + : + image: portainer/agent:${_TAG} diff --git a/compose/.apps/portaineragent/portaineragent.yml b/compose/.apps/portaineragent/portaineragent.yml index 8a4e9ac6b2..8702c86c52 100644 --- a/compose/.apps/portaineragent/portaineragent.yml +++ b/compose/.apps/portaineragent/portaineragent.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - CAP_HOST_MANAGEMENT=${${_APPNAME_}_ENVIRONMENT_CAP_HOST_MANAGEMENT} + - CAP_HOST_MANAGEMENT=${_ENVIRONMENT_CAP_HOST_MANAGEMENT} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /:/host - /etc/localtime:/etc/localtime:ro - /var/lib/docker/volumes:/var/lib/docker/volumes - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock + - ${_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock diff --git a/compose/.apps/postgres/postgres.aarch64.yml b/compose/.apps/postgres/postgres.aarch64.yml index 30dc4e32bf..f2266b1e6d 100644 --- a/compose/.apps/postgres/postgres.aarch64.yml +++ b/compose/.apps/postgres/postgres.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: postgres:${${_APPNAME_}_TAG} + : + image: postgres:${_TAG} diff --git a/compose/.apps/postgres/postgres.hostname.yml b/compose/.apps/postgres/postgres.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/postgres/postgres.hostname.yml +++ b/compose/.apps/postgres/postgres.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/postgres/postgres.labels.yml b/compose/.apps/postgres/postgres.labels.yml index 65ef9a928a..a00271a291 100644 --- a/compose/.apps/postgres/postgres.labels.yml +++ b/compose/.apps/postgres/postgres.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: The PostgreSQL object-relational database system provides reliability and data integrity. com.dockstarter.appinfo.nicename: Postgres - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_password: "" - com.dockstarter.appvars.${_appname_}_environment_user: "postgres" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_5432: "5432" - com.dockstarter.appvars.${_appname_}_restart: unless-stopped - com.dockstarter.appvars.${_appname_}_tag: "16" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_password: "" + com.dockstarter.appvars._environment_user: "postgres" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_5432: "5432" + com.dockstarter.appvars._restart: unless-stopped + com.dockstarter.appvars._tag: "16" diff --git a/compose/.apps/postgres/postgres.netmode.yml b/compose/.apps/postgres/postgres.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/postgres/postgres.netmode.yml +++ b/compose/.apps/postgres/postgres.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/postgres/postgres.ports.yml b/compose/.apps/postgres/postgres.ports.yml index 11a1ec6cc6..0ac9eefc5f 100644 --- a/compose/.apps/postgres/postgres.ports.yml +++ b/compose/.apps/postgres/postgres.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_5432}:5432 + - ${_PORT_5432}:5432 diff --git a/compose/.apps/postgres/postgres.x86_64.yml b/compose/.apps/postgres/postgres.x86_64.yml index 30dc4e32bf..f2266b1e6d 100644 --- a/compose/.apps/postgres/postgres.x86_64.yml +++ b/compose/.apps/postgres/postgres.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: postgres:${${_APPNAME_}_TAG} + : + image: postgres:${_TAG} diff --git a/compose/.apps/postgres/postgres.yml b/compose/.apps/postgres/postgres.yml index db3e5df14d..0d492d4ba8 100644 --- a/compose/.apps/postgres/postgres.yml +++ b/compose/.apps/postgres/postgres.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - POSTGRES_PASSWORD=${${_APPNAME_}_ENVIRONMENT_PASSWORD} - - POSTGRES_USER=${${_APPNAME_}_ENVIRONMENT_USER} + - POSTGRES_PASSWORD=${_ENVIRONMENT_PASSWORD} + - POSTGRES_USER=${_ENVIRONMENT_USER} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/var/lib/postgresql/data + - ${DOCKER_VOLUME_CONFIG}/:/var/lib/postgresql/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/privoxyvpn/privoxyvpn.aarch64.yml b/compose/.apps/privoxyvpn/privoxyvpn.aarch64.yml index 19736f8c8c..bdd4d3e6fc 100644 --- a/compose/.apps/privoxyvpn/privoxyvpn.aarch64.yml +++ b/compose/.apps/privoxyvpn/privoxyvpn.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/binhex/arch-privoxyvpn:${${_APPNAME_}_TAG} + : + image: ghcr.io/binhex/arch-privoxyvpn:${_TAG} diff --git a/compose/.apps/privoxyvpn/privoxyvpn.hostname.yml b/compose/.apps/privoxyvpn/privoxyvpn.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/privoxyvpn/privoxyvpn.hostname.yml +++ b/compose/.apps/privoxyvpn/privoxyvpn.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/privoxyvpn/privoxyvpn.labels.yml b/compose/.apps/privoxyvpn/privoxyvpn.labels.yml index da22f35fe6..fdcea82355 100644 --- a/compose/.apps/privoxyvpn/privoxyvpn.labels.yml +++ b/compose/.apps/privoxyvpn/privoxyvpn.labels.yml @@ -1,28 +1,28 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Privoxy, microsocks, OpenVPN, WireGuard" com.dockstarter.appinfo.nicename: "PrivoxyVPN" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_enable_privoxy: "no" - com.dockstarter.appvars.${_appname_}_environment_enable_socks: "no" - com.dockstarter.appvars.${_appname_}_environment_enable_startup_scripts: "" - com.dockstarter.appvars.${_appname_}_environment_lan_network: "192.168.x.x/24" - com.dockstarter.appvars.${_appname_}_environment_name_servers: "1.1.1.1,8.8.8.8" - com.dockstarter.appvars.${_appname_}_environment_socks_pass: "your-socks-pass" - com.dockstarter.appvars.${_appname_}_environment_socks_user: "your-socks-user" - com.dockstarter.appvars.${_appname_}_environment_vpn_client: "openvpn" - com.dockstarter.appvars.${_appname_}_environment_vpn_enable: "no" - com.dockstarter.appvars.${_appname_}_environment_vpn_input_ports: "" - com.dockstarter.appvars.${_appname_}_environment_vpn_options: "" - com.dockstarter.appvars.${_appname_}_environment_vpn_output_ports: "" - com.dockstarter.appvars.${_appname_}_environment_vpn_pass: "your-vpn-pass" - com.dockstarter.appvars.${_appname_}_environment_vpn_prov: "custom" - com.dockstarter.appvars.${_appname_}_environment_vpn_user: "your-vpn-user" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8118: "8118" - com.dockstarter.appvars.${_appname_}_port_9118: "9118" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_enable_privoxy: "no" + com.dockstarter.appvars._environment_enable_socks: "no" + com.dockstarter.appvars._environment_enable_startup_scripts: "" + com.dockstarter.appvars._environment_lan_network: "192.168.x.x/24" + com.dockstarter.appvars._environment_name_servers: "1.1.1.1,8.8.8.8" + com.dockstarter.appvars._environment_socks_pass: "your-socks-pass" + com.dockstarter.appvars._environment_socks_user: "your-socks-user" + com.dockstarter.appvars._environment_vpn_client: "openvpn" + com.dockstarter.appvars._environment_vpn_enable: "no" + com.dockstarter.appvars._environment_vpn_input_ports: "" + com.dockstarter.appvars._environment_vpn_options: "" + com.dockstarter.appvars._environment_vpn_output_ports: "" + com.dockstarter.appvars._environment_vpn_pass: "your-vpn-pass" + com.dockstarter.appvars._environment_vpn_prov: "custom" + com.dockstarter.appvars._environment_vpn_user: "your-vpn-user" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8118: "8118" + com.dockstarter.appvars._port_9118: "9118" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/privoxyvpn/privoxyvpn.netmode.yml b/compose/.apps/privoxyvpn/privoxyvpn.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/privoxyvpn/privoxyvpn.netmode.yml +++ b/compose/.apps/privoxyvpn/privoxyvpn.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/privoxyvpn/privoxyvpn.ports.yml b/compose/.apps/privoxyvpn/privoxyvpn.ports.yml index 22c6114395..d2692ee49c 100644 --- a/compose/.apps/privoxyvpn/privoxyvpn.ports.yml +++ b/compose/.apps/privoxyvpn/privoxyvpn.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8118}:8118 - - ${${_APPNAME_}_PORT_9118}:9118 + - ${_PORT_8118}:8118 + - ${_PORT_9118}:9118 diff --git a/compose/.apps/privoxyvpn/privoxyvpn.x86_64.yml b/compose/.apps/privoxyvpn/privoxyvpn.x86_64.yml index 19736f8c8c..bdd4d3e6fc 100644 --- a/compose/.apps/privoxyvpn/privoxyvpn.x86_64.yml +++ b/compose/.apps/privoxyvpn/privoxyvpn.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/binhex/arch-privoxyvpn:${${_APPNAME_}_TAG} + : + image: ghcr.io/binhex/arch-privoxyvpn:${_TAG} diff --git a/compose/.apps/privoxyvpn/privoxyvpn.yml b/compose/.apps/privoxyvpn/privoxyvpn.yml index f435830ac0..91690fae13 100644 --- a/compose/.apps/privoxyvpn/privoxyvpn.yml +++ b/compose/.apps/privoxyvpn/privoxyvpn.yml @@ -1,35 +1,35 @@ services: - ${_appname_}: + : cap_add: - NET_ADMIN - SYS_MODULE - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} devices: - /dev/net/tun environment: - - ENABLE_PRIVOXY=${${_APPNAME_}_ENVIRONMENT_ENABLE_PRIVOXY} - - ENABLE_SOCKS=${${_APPNAME_}_ENVIRONMENT_ENABLE_SOCKS} - - ENABLE_STARTUP_SCRIPTS=${${_APPNAME_}_ENVIRONMENT_ENABLE_STARTUP_SCRIPTS} - - LAN_NETWORK=${${_APPNAME_}_ENVIRONMENT_LAN_NETWORK} - - NAME_SERVERS=${${_APPNAME_}_ENVIRONMENT_NAME_SERVERS} + - ENABLE_PRIVOXY=${_ENVIRONMENT_ENABLE_PRIVOXY} + - ENABLE_SOCKS=${_ENVIRONMENT_ENABLE_SOCKS} + - ENABLE_STARTUP_SCRIPTS=${_ENVIRONMENT_ENABLE_STARTUP_SCRIPTS} + - LAN_NETWORK=${_ENVIRONMENT_LAN_NETWORK} + - NAME_SERVERS=${_ENVIRONMENT_NAME_SERVERS} - PGID=${PGID} - PUID=${PUID} - - SOCKS_PASS=${${_APPNAME_}_ENVIRONMENT_SOCKS_PASS} - - SOCKS_USER=${${_APPNAME_}_ENVIRONMENT_SOCKS_USER} + - SOCKS_PASS=${_ENVIRONMENT_SOCKS_PASS} + - SOCKS_USER=${_ENVIRONMENT_SOCKS_USER} - TZ=${TZ} - - VPN_CLIENT=${${_APPNAME_}_ENVIRONMENT_VPN_CLIENT} - - VPN_ENABLED=${${_APPNAME_}_ENVIRONMENT_VPN_ENABLE} - - VPN_INPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_VPN_INPUT_PORTS} - - VPN_OPTIONS=${${_APPNAME_}_ENVIRONMENT_VPN_OPTIONS} - - VPN_OUTPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_VPN_OUTPUT_PORTS} - - VPN_PASS=${${_APPNAME_}_ENVIRONMENT_VPN_PASS} - - VPN_PROV=${${_APPNAME_}_ENVIRONMENT_VPN_PROV} - - VPN_USER=${${_APPNAME_}_ENVIRONMENT_VPN_USER} + - VPN_CLIENT=${_ENVIRONMENT_VPN_CLIENT} + - VPN_ENABLED=${_ENVIRONMENT_VPN_ENABLE} + - VPN_INPUT_PORTS=${_ENVIRONMENT_VPN_INPUT_PORTS} + - VPN_OPTIONS=${_ENVIRONMENT_VPN_OPTIONS} + - VPN_OUTPUT_PORTS=${_ENVIRONMENT_VPN_OUTPUT_PORTS} + - VPN_PASS=${_ENVIRONMENT_VPN_PASS} + - VPN_PROV=${_ENVIRONMENT_VPN_PROV} + - VPN_USER=${_ENVIRONMENT_VPN_USER} privileged: true - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} sysctls: - net.ipv4.conf.all.src_valid_mark=1 volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/prometheus/prometheus.hostname.yml b/compose/.apps/prometheus/prometheus.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/prometheus/prometheus.hostname.yml +++ b/compose/.apps/prometheus/prometheus.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/prometheus/prometheus.labels.yml b/compose/.apps/prometheus/prometheus.labels.yml index 250e150cd8..ca4d5c9f4c 100644 --- a/compose/.apps/prometheus/prometheus.labels.yml +++ b/compose/.apps/prometheus/prometheus.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Prometheus is a systems and service monitoring system." com.dockstarter.appinfo.nicename: "Prometheus" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_9090: "9090" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_9090: "9090" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/prometheus/prometheus.netmode.yml b/compose/.apps/prometheus/prometheus.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/prometheus/prometheus.netmode.yml +++ b/compose/.apps/prometheus/prometheus.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/prometheus/prometheus.ports.yml b/compose/.apps/prometheus/prometheus.ports.yml index 2b79952fa8..3f22a0961a 100644 --- a/compose/.apps/prometheus/prometheus.ports.yml +++ b/compose/.apps/prometheus/prometheus.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_9090}:9090 + - ${_PORT_9090}:9090 diff --git a/compose/.apps/prometheus/prometheus.x86_64.yml b/compose/.apps/prometheus/prometheus.x86_64.yml index c52aabd8d0..712a56f322 100644 --- a/compose/.apps/prometheus/prometheus.x86_64.yml +++ b/compose/.apps/prometheus/prometheus.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: prom/prometheus:${${_APPNAME_}_TAG} + : + image: prom/prometheus:${_TAG} diff --git a/compose/.apps/prometheus/prometheus.yml b/compose/.apps/prometheus/prometheus.yml index 62f0e7509f..e05e08d009 100644 --- a/compose/.apps/prometheus/prometheus.yml +++ b/compose/.apps/prometheus/prometheus.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/etc:/etc/prometheus - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/data:/prometheus + - ${DOCKER_VOLUME_CONFIG}//etc:/etc/prometheus + - ${DOCKER_VOLUME_CONFIG}//data:/prometheus - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/prowlarr/prowlarr.aarch64.yml b/compose/.apps/prowlarr/prowlarr.aarch64.yml index 4e462e3b2f..d9b3f9e7f0 100644 --- a/compose/.apps/prowlarr/prowlarr.aarch64.yml +++ b/compose/.apps/prowlarr/prowlarr.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/prowlarr:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/prowlarr:${_TAG} diff --git a/compose/.apps/prowlarr/prowlarr.hostname.yml b/compose/.apps/prowlarr/prowlarr.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/prowlarr/prowlarr.hostname.yml +++ b/compose/.apps/prowlarr/prowlarr.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/prowlarr/prowlarr.labels.yml b/compose/.apps/prowlarr/prowlarr.labels.yml index 5b0b3d3982..5aea63bd16 100644 --- a/compose/.apps/prowlarr/prowlarr.labels.yml +++ b/compose/.apps/prowlarr/prowlarr.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Indexer manager/proxy to integrate with your various PVR apps." com.dockstarter.appinfo.nicename: "Prowlarr" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_9696: "9696" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_9696: "9696" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/prowlarr/prowlarr.netmode.yml b/compose/.apps/prowlarr/prowlarr.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/prowlarr/prowlarr.netmode.yml +++ b/compose/.apps/prowlarr/prowlarr.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/prowlarr/prowlarr.ports.yml b/compose/.apps/prowlarr/prowlarr.ports.yml index cfab586339..0de2eb637c 100644 --- a/compose/.apps/prowlarr/prowlarr.ports.yml +++ b/compose/.apps/prowlarr/prowlarr.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_9696}:9696 + - ${_PORT_9696}:9696 diff --git a/compose/.apps/prowlarr/prowlarr.x86_64.yml b/compose/.apps/prowlarr/prowlarr.x86_64.yml index 4e462e3b2f..d9b3f9e7f0 100644 --- a/compose/.apps/prowlarr/prowlarr.x86_64.yml +++ b/compose/.apps/prowlarr/prowlarr.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/prowlarr:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/prowlarr:${_TAG} diff --git a/compose/.apps/prowlarr/prowlarr.yml b/compose/.apps/prowlarr/prowlarr.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/prowlarr/prowlarr.yml +++ b/compose/.apps/prowlarr/prowlarr.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/pyload/pyload.aarch64.yml b/compose/.apps/pyload/pyload.aarch64.yml index d7732838fb..0b954bec75 100644 --- a/compose/.apps/pyload/pyload.aarch64.yml +++ b/compose/.apps/pyload/pyload.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/pyload-ng:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/pyload-ng:${_TAG} diff --git a/compose/.apps/pyload/pyload.hostname.yml b/compose/.apps/pyload/pyload.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/pyload/pyload.hostname.yml +++ b/compose/.apps/pyload/pyload.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/pyload/pyload.labels.yml b/compose/.apps/pyload/pyload.labels.yml index 43046a18a8..5b2eb12059 100644 --- a/compose/.apps/pyload/pyload.labels.yml +++ b/compose/.apps/pyload/pyload.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Python Download Manager" com.dockstarter.appinfo.nicename: "pyLoad" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8000: "8000" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8000: "8000" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/pyload/pyload.netmode.yml b/compose/.apps/pyload/pyload.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/pyload/pyload.netmode.yml +++ b/compose/.apps/pyload/pyload.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/pyload/pyload.ports.yml b/compose/.apps/pyload/pyload.ports.yml index 33070f8cee..384ad2ee98 100644 --- a/compose/.apps/pyload/pyload.ports.yml +++ b/compose/.apps/pyload/pyload.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8000}:8000 + - ${_PORT_8000}:8000 diff --git a/compose/.apps/pyload/pyload.x86_64.yml b/compose/.apps/pyload/pyload.x86_64.yml index d7732838fb..0b954bec75 100644 --- a/compose/.apps/pyload/pyload.x86_64.yml +++ b/compose/.apps/pyload/pyload.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/pyload-ng:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/pyload-ng:${_TAG} diff --git a/compose/.apps/pyload/pyload.yml b/compose/.apps/pyload/pyload.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/pyload/pyload.yml +++ b/compose/.apps/pyload/pyload.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/qbittorrent/qbittorrent.aarch64.yml b/compose/.apps/qbittorrent/qbittorrent.aarch64.yml index a18697ae34..37f71682a3 100644 --- a/compose/.apps/qbittorrent/qbittorrent.aarch64.yml +++ b/compose/.apps/qbittorrent/qbittorrent.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/qbittorrent:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/qbittorrent:${_TAG} diff --git a/compose/.apps/qbittorrent/qbittorrent.hostname.yml b/compose/.apps/qbittorrent/qbittorrent.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/qbittorrent/qbittorrent.hostname.yml +++ b/compose/.apps/qbittorrent/qbittorrent.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/qbittorrent/qbittorrent.labels.yml b/compose/.apps/qbittorrent/qbittorrent.labels.yml index ad92bb545e..552ca240e9 100644 --- a/compose/.apps/qbittorrent/qbittorrent.labels.yml +++ b/compose/.apps/qbittorrent/qbittorrent.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Cross-platform free and open-source BitTorrent client" com.dockstarter.appinfo.nicename: "qBittorrent" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_51413: "51413" - com.dockstarter.appvars.${_appname_}_port_6881: "6881" - com.dockstarter.appvars.${_appname_}_port_8080: "8080" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_51413: "51413" + com.dockstarter.appvars._port_6881: "6881" + com.dockstarter.appvars._port_8080: "8080" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/qbittorrent/qbittorrent.netmode.yml b/compose/.apps/qbittorrent/qbittorrent.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/qbittorrent/qbittorrent.netmode.yml +++ b/compose/.apps/qbittorrent/qbittorrent.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/qbittorrent/qbittorrent.ports.yml b/compose/.apps/qbittorrent/qbittorrent.ports.yml index aebc2b1f31..dcd51aa613 100644 --- a/compose/.apps/qbittorrent/qbittorrent.ports.yml +++ b/compose/.apps/qbittorrent/qbittorrent.ports.yml @@ -1,8 +1,8 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_51413}:51413 - - ${${_APPNAME_}_PORT_51413}:51413/udp - - ${${_APPNAME_}_PORT_6881}:6881 - - ${${_APPNAME_}_PORT_6881}:6881/udp - - ${${_APPNAME_}_PORT_8080}:${${_APPNAME_}_PORT_8080} + - ${_PORT_51413}:51413 + - ${_PORT_51413}:51413/udp + - ${_PORT_6881}:6881 + - ${_PORT_6881}:6881/udp + - ${_PORT_8080}:${_PORT_8080} diff --git a/compose/.apps/qbittorrent/qbittorrent.x86_64.yml b/compose/.apps/qbittorrent/qbittorrent.x86_64.yml index a18697ae34..37f71682a3 100644 --- a/compose/.apps/qbittorrent/qbittorrent.x86_64.yml +++ b/compose/.apps/qbittorrent/qbittorrent.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/qbittorrent:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/qbittorrent:${_TAG} diff --git a/compose/.apps/qbittorrent/qbittorrent.yml b/compose/.apps/qbittorrent/qbittorrent.yml index fb26c15768..11edd13f3b 100644 --- a/compose/.apps/qbittorrent/qbittorrent.yml +++ b/compose/.apps/qbittorrent/qbittorrent.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - WEBUI_PORT=${${_APPNAME_}_PORT_8080} - restart: ${${_APPNAME_}_RESTART} + - WEBUI_PORT=${_PORT_8080} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/qbittorrentvpn/qbittorrentvpn.aarch64.yml b/compose/.apps/qbittorrentvpn/qbittorrentvpn.aarch64.yml index 273e4467df..8da6b6979b 100644 --- a/compose/.apps/qbittorrentvpn/qbittorrentvpn.aarch64.yml +++ b/compose/.apps/qbittorrentvpn/qbittorrentvpn.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/binhex/arch-qbittorrentvpn:${${_APPNAME_}_TAG} + : + image: ghcr.io/binhex/arch-qbittorrentvpn:${_TAG} diff --git a/compose/.apps/qbittorrentvpn/qbittorrentvpn.hostname.yml b/compose/.apps/qbittorrentvpn/qbittorrentvpn.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/qbittorrentvpn/qbittorrentvpn.hostname.yml +++ b/compose/.apps/qbittorrentvpn/qbittorrentvpn.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/qbittorrentvpn/qbittorrentvpn.labels.yml b/compose/.apps/qbittorrentvpn/qbittorrentvpn.labels.yml index 847fa296f0..2242216c73 100644 --- a/compose/.apps/qbittorrentvpn/qbittorrentvpn.labels.yml +++ b/compose/.apps/qbittorrentvpn/qbittorrentvpn.labels.yml @@ -1,25 +1,25 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "qBittorrent PrivoxyVPN" com.dockstarter.appinfo.nicename: "qBittorrentVPN" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_enable_privoxy: "no" - com.dockstarter.appvars.${_appname_}_environment_lan_network: "192.168.x.x/24" - com.dockstarter.appvars.${_appname_}_environment_name_servers: "1.1.1.1,8.8.8.8" - com.dockstarter.appvars.${_appname_}_environment_vpn_client: "openvpn" - com.dockstarter.appvars.${_appname_}_environment_vpn_enable: "no" - com.dockstarter.appvars.${_appname_}_environment_vpn_input_ports: "" - com.dockstarter.appvars.${_appname_}_environment_vpn_options: "" - com.dockstarter.appvars.${_appname_}_environment_vpn_output_ports: "" - com.dockstarter.appvars.${_appname_}_environment_vpn_pass: "your-vpn-pass" - com.dockstarter.appvars.${_appname_}_environment_vpn_prov: "custom" - com.dockstarter.appvars.${_appname_}_environment_vpn_user: "your-vpn-user" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_6881: "6881" - com.dockstarter.appvars.${_appname_}_port_8080: "8080" - com.dockstarter.appvars.${_appname_}_port_8118: "8118" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_enable_privoxy: "no" + com.dockstarter.appvars._environment_lan_network: "192.168.x.x/24" + com.dockstarter.appvars._environment_name_servers: "1.1.1.1,8.8.8.8" + com.dockstarter.appvars._environment_vpn_client: "openvpn" + com.dockstarter.appvars._environment_vpn_enable: "no" + com.dockstarter.appvars._environment_vpn_input_ports: "" + com.dockstarter.appvars._environment_vpn_options: "" + com.dockstarter.appvars._environment_vpn_output_ports: "" + com.dockstarter.appvars._environment_vpn_pass: "your-vpn-pass" + com.dockstarter.appvars._environment_vpn_prov: "custom" + com.dockstarter.appvars._environment_vpn_user: "your-vpn-user" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_6881: "6881" + com.dockstarter.appvars._port_8080: "8080" + com.dockstarter.appvars._port_8118: "8118" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/qbittorrentvpn/qbittorrentvpn.netmode.yml b/compose/.apps/qbittorrentvpn/qbittorrentvpn.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/qbittorrentvpn/qbittorrentvpn.netmode.yml +++ b/compose/.apps/qbittorrentvpn/qbittorrentvpn.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/qbittorrentvpn/qbittorrentvpn.ports.yml b/compose/.apps/qbittorrentvpn/qbittorrentvpn.ports.yml index ed71a27543..5696511a30 100644 --- a/compose/.apps/qbittorrentvpn/qbittorrentvpn.ports.yml +++ b/compose/.apps/qbittorrentvpn/qbittorrentvpn.ports.yml @@ -1,7 +1,7 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_6881}:6881 - - ${${_APPNAME_}_PORT_6881}:6881/udp - - ${${_APPNAME_}_PORT_8080}:${${_APPNAME_}_PORT_8080} - - ${${_APPNAME_}_PORT_8118}:8118 + - ${_PORT_6881}:6881 + - ${_PORT_6881}:6881/udp + - ${_PORT_8080}:${_PORT_8080} + - ${_PORT_8118}:8118 diff --git a/compose/.apps/qbittorrentvpn/qbittorrentvpn.x86_64.yml b/compose/.apps/qbittorrentvpn/qbittorrentvpn.x86_64.yml index 273e4467df..8da6b6979b 100644 --- a/compose/.apps/qbittorrentvpn/qbittorrentvpn.x86_64.yml +++ b/compose/.apps/qbittorrentvpn/qbittorrentvpn.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/binhex/arch-qbittorrentvpn:${${_APPNAME_}_TAG} + : + image: ghcr.io/binhex/arch-qbittorrentvpn:${_TAG} diff --git a/compose/.apps/qbittorrentvpn/qbittorrentvpn.yml b/compose/.apps/qbittorrentvpn/qbittorrentvpn.yml index 30724c89db..a16b9fc511 100644 --- a/compose/.apps/qbittorrentvpn/qbittorrentvpn.yml +++ b/compose/.apps/qbittorrentvpn/qbittorrentvpn.yml @@ -1,30 +1,30 @@ services: - ${_appname_}: + : cap_add: - NET_ADMIN - SYS_MODULE - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} environment: - - ENABLE_PRIVOXY=${${_APPNAME_}_ENVIRONMENT_ENABLE_PRIVOXY} - - LAN_NETWORK=${${_APPNAME_}_ENVIRONMENT_LAN_NETWORK} - - NAME_SERVERS=${${_APPNAME_}_ENVIRONMENT_NAME_SERVERS} + - ENABLE_PRIVOXY=${_ENVIRONMENT_ENABLE_PRIVOXY} + - LAN_NETWORK=${_ENVIRONMENT_LAN_NETWORK} + - NAME_SERVERS=${_ENVIRONMENT_NAME_SERVERS} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - VPN_CLIENT=${${_APPNAME_}_ENVIRONMENT_VPN_CLIENT} - - VPN_ENABLED=${${_APPNAME_}_ENVIRONMENT_VPN_ENABLE} - - VPN_INPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_VPN_INPUT_PORTS} - - VPN_OPTIONS=${${_APPNAME_}_ENVIRONMENT_VPN_OPTIONS} - - VPN_OUTPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_VPN_OUTPUT_PORTS} - - VPN_PASS=${${_APPNAME_}_ENVIRONMENT_VPN_PASS} - - VPN_PROV=${${_APPNAME_}_ENVIRONMENT_VPN_PROV} - - VPN_USER=${${_APPNAME_}_ENVIRONMENT_VPN_USER} - - WEBUI_PORT=${${_APPNAME_}_PORT_8080} + - VPN_CLIENT=${_ENVIRONMENT_VPN_CLIENT} + - VPN_ENABLED=${_ENVIRONMENT_VPN_ENABLE} + - VPN_INPUT_PORTS=${_ENVIRONMENT_VPN_INPUT_PORTS} + - VPN_OPTIONS=${_ENVIRONMENT_VPN_OPTIONS} + - VPN_OUTPUT_PORTS=${_ENVIRONMENT_VPN_OUTPUT_PORTS} + - VPN_PASS=${_ENVIRONMENT_VPN_PASS} + - VPN_PROV=${_ENVIRONMENT_VPN_PROV} + - VPN_USER=${_ENVIRONMENT_VPN_USER} + - WEBUI_PORT=${_PORT_8080} privileged: true - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} sysctls: - net.ipv4.conf.all.src_valid_mark=1 volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/quasselcore/quasselcore.aarch64.yml b/compose/.apps/quasselcore/quasselcore.aarch64.yml index f4aa36bc85..c1d07121d9 100644 --- a/compose/.apps/quasselcore/quasselcore.aarch64.yml +++ b/compose/.apps/quasselcore/quasselcore.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/quassel-core:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/quassel-core:${_TAG} diff --git a/compose/.apps/quasselcore/quasselcore.hostname.yml b/compose/.apps/quasselcore/quasselcore.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/quasselcore/quasselcore.hostname.yml +++ b/compose/.apps/quasselcore/quasselcore.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/quasselcore/quasselcore.labels.yml b/compose/.apps/quasselcore/quasselcore.labels.yml index 911457a841..cee6a2e93a 100644 --- a/compose/.apps/quasselcore/quasselcore.labels.yml +++ b/compose/.apps/quasselcore/quasselcore.labels.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Modern, cross-platform, distributed IRC client" com.dockstarter.appinfo.nicename: "QuasselCore" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_10113: "10113" - com.dockstarter.appvars.${_appname_}_port_4242: "4242" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_10113: "10113" + com.dockstarter.appvars._port_4242: "4242" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/quasselcore/quasselcore.netmode.yml b/compose/.apps/quasselcore/quasselcore.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/quasselcore/quasselcore.netmode.yml +++ b/compose/.apps/quasselcore/quasselcore.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/quasselcore/quasselcore.ports.yml b/compose/.apps/quasselcore/quasselcore.ports.yml index 8c2a81491a..9a7f26c625 100644 --- a/compose/.apps/quasselcore/quasselcore.ports.yml +++ b/compose/.apps/quasselcore/quasselcore.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_10113}:10113 - - ${${_APPNAME_}_PORT_4242}:4242 + - ${_PORT_10113}:10113 + - ${_PORT_4242}:4242 diff --git a/compose/.apps/quasselcore/quasselcore.x86_64.yml b/compose/.apps/quasselcore/quasselcore.x86_64.yml index f4aa36bc85..c1d07121d9 100644 --- a/compose/.apps/quasselcore/quasselcore.x86_64.yml +++ b/compose/.apps/quasselcore/quasselcore.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/quassel-core:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/quassel-core:${_TAG} diff --git a/compose/.apps/quasselcore/quasselcore.yml b/compose/.apps/quasselcore/quasselcore.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/quasselcore/quasselcore.yml +++ b/compose/.apps/quasselcore/quasselcore.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/quasselweb/quasselweb.aarch64.yml b/compose/.apps/quasselweb/quasselweb.aarch64.yml index b45507b6ce..c4a9f36ec8 100644 --- a/compose/.apps/quasselweb/quasselweb.aarch64.yml +++ b/compose/.apps/quasselweb/quasselweb.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/quassel-web:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/quassel-web:${_TAG} diff --git a/compose/.apps/quasselweb/quasselweb.hostname.yml b/compose/.apps/quasselweb/quasselweb.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/quasselweb/quasselweb.hostname.yml +++ b/compose/.apps/quasselweb/quasselweb.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/quasselweb/quasselweb.labels.yml b/compose/.apps/quasselweb/quasselweb.labels.yml index 3365a3bab1..0a69f3bb50 100644 --- a/compose/.apps/quasselweb/quasselweb.labels.yml +++ b/compose/.apps/quasselweb/quasselweb.labels.yml @@ -1,17 +1,17 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Web client for Quassel. A Quassel-Core instance is required" com.dockstarter.appinfo.nicename: "QuasselWeb" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_quassel_core: "quasselcore" - com.dockstarter.appvars.${_appname_}_environment_quassel_https: "" - com.dockstarter.appvars.${_appname_}_environment_quassel_port: "4242" - com.dockstarter.appvars.${_appname_}_environment_url_base: "/quassel" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_64080: "64080" - com.dockstarter.appvars.${_appname_}_port_64443: "64443" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_quassel_core: "quasselcore" + com.dockstarter.appvars._environment_quassel_https: "" + com.dockstarter.appvars._environment_quassel_port: "4242" + com.dockstarter.appvars._environment_url_base: "/quassel" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_64080: "64080" + com.dockstarter.appvars._port_64443: "64443" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/quasselweb/quasselweb.netmode.yml b/compose/.apps/quasselweb/quasselweb.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/quasselweb/quasselweb.netmode.yml +++ b/compose/.apps/quasselweb/quasselweb.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/quasselweb/quasselweb.ports.yml b/compose/.apps/quasselweb/quasselweb.ports.yml index 323d3de899..9dc056a51c 100644 --- a/compose/.apps/quasselweb/quasselweb.ports.yml +++ b/compose/.apps/quasselweb/quasselweb.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_64080}:64080 - - ${${_APPNAME_}_PORT_64443}:64443 + - ${_PORT_64080}:64080 + - ${_PORT_64443}:64443 diff --git a/compose/.apps/quasselweb/quasselweb.x86_64.yml b/compose/.apps/quasselweb/quasselweb.x86_64.yml index b45507b6ce..c4a9f36ec8 100644 --- a/compose/.apps/quasselweb/quasselweb.x86_64.yml +++ b/compose/.apps/quasselweb/quasselweb.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/quassel-web:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/quassel-web:${_TAG} diff --git a/compose/.apps/quasselweb/quasselweb.yml b/compose/.apps/quasselweb/quasselweb.yml index 09cb5bb717..87b6ce2e96 100644 --- a/compose/.apps/quasselweb/quasselweb.yml +++ b/compose/.apps/quasselweb/quasselweb.yml @@ -1,16 +1,16 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - - QUASSEL_CORE=${${_APPNAME_}_ENVIRONMENT_QUASSEL_CORE} - - QUASSEL_HTTPS=${${_APPNAME_}_ENVIRONMENT_QUASSEL_HTTPS} - - QUASSEL_PORT=${${_APPNAME_}_ENVIRONMENT_QUASSEL_PORT} + - QUASSEL_CORE=${_ENVIRONMENT_QUASSEL_CORE} + - QUASSEL_HTTPS=${_ENVIRONMENT_QUASSEL_HTTPS} + - QUASSEL_PORT=${_ENVIRONMENT_QUASSEL_PORT} - TZ=${TZ} - - URL_BASE=${${_APPNAME_}_ENVIRONMENT_URL_BASE} - restart: ${${_APPNAME_}_RESTART} + - URL_BASE=${_ENVIRONMENT_URL_BASE} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/radarr/radarr.aarch64.yml b/compose/.apps/radarr/radarr.aarch64.yml index a7da28b768..b9d1b95d3f 100644 --- a/compose/.apps/radarr/radarr.aarch64.yml +++ b/compose/.apps/radarr/radarr.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/radarr:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/radarr:${_TAG} diff --git a/compose/.apps/radarr/radarr.hostname.yml b/compose/.apps/radarr/radarr.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/radarr/radarr.hostname.yml +++ b/compose/.apps/radarr/radarr.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/radarr/radarr.labels.yml b/compose/.apps/radarr/radarr.labels.yml index 06e9299ea9..59bf1c7ee2 100644 --- a/compose/.apps/radarr/radarr.labels.yml +++ b/compose/.apps/radarr/radarr.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Automatically download movies via Usenet and BitTorrent" com.dockstarter.appinfo.nicename: "Radarr" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_7878: "7878" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_7878: "7878" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/radarr/radarr.netmode.yml b/compose/.apps/radarr/radarr.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/radarr/radarr.netmode.yml +++ b/compose/.apps/radarr/radarr.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/radarr/radarr.ports.yml b/compose/.apps/radarr/radarr.ports.yml index 5530f94f09..5e98b63635 100644 --- a/compose/.apps/radarr/radarr.ports.yml +++ b/compose/.apps/radarr/radarr.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_7878}:7878 + - ${_PORT_7878}:7878 diff --git a/compose/.apps/radarr/radarr.x86_64.yml b/compose/.apps/radarr/radarr.x86_64.yml index a7da28b768..b9d1b95d3f 100644 --- a/compose/.apps/radarr/radarr.x86_64.yml +++ b/compose/.apps/radarr/radarr.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/radarr:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/radarr:${_TAG} diff --git a/compose/.apps/radarr/radarr.yml b/compose/.apps/radarr/radarr.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/radarr/radarr.yml +++ b/compose/.apps/radarr/radarr.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/readarr/readarr.aarch64.yml b/compose/.apps/readarr/readarr.aarch64.yml index 82ec2fdd04..3cd630406c 100644 --- a/compose/.apps/readarr/readarr.aarch64.yml +++ b/compose/.apps/readarr/readarr.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/readarr:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/readarr:${_TAG} diff --git a/compose/.apps/readarr/readarr.hostname.yml b/compose/.apps/readarr/readarr.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/readarr/readarr.hostname.yml +++ b/compose/.apps/readarr/readarr.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/readarr/readarr.labels.yml b/compose/.apps/readarr/readarr.labels.yml index ff45abc745..525cf2cbd8 100644 --- a/compose/.apps/readarr/readarr.labels.yml +++ b/compose/.apps/readarr/readarr.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "eBook and audiobook collection manager for Usenet and BitTorrent users." com.dockstarter.appinfo.nicename: "Readarr" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8787: "8787" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "develop" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8787: "8787" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "develop" diff --git a/compose/.apps/readarr/readarr.netmode.yml b/compose/.apps/readarr/readarr.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/readarr/readarr.netmode.yml +++ b/compose/.apps/readarr/readarr.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/readarr/readarr.ports.yml b/compose/.apps/readarr/readarr.ports.yml index 23c79b663a..5c87d68a94 100644 --- a/compose/.apps/readarr/readarr.ports.yml +++ b/compose/.apps/readarr/readarr.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8787}:8787 + - ${_PORT_8787}:8787 diff --git a/compose/.apps/readarr/readarr.x86_64.yml b/compose/.apps/readarr/readarr.x86_64.yml index 82ec2fdd04..3cd630406c 100644 --- a/compose/.apps/readarr/readarr.x86_64.yml +++ b/compose/.apps/readarr/readarr.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/readarr:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/readarr:${_TAG} diff --git a/compose/.apps/readarr/readarr.yml b/compose/.apps/readarr/readarr.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/readarr/readarr.yml +++ b/compose/.apps/readarr/readarr.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/recyclarr/recyclarr.aarch64.yml b/compose/.apps/recyclarr/recyclarr.aarch64.yml index 66c9b3e716..b7a9d8f1ff 100644 --- a/compose/.apps/recyclarr/recyclarr.aarch64.yml +++ b/compose/.apps/recyclarr/recyclarr.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/recyclarr/recyclarr:${${_APPNAME_}_TAG} + : + image: ghcr.io/recyclarr/recyclarr:${_TAG} diff --git a/compose/.apps/recyclarr/recyclarr.hostname.yml b/compose/.apps/recyclarr/recyclarr.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/recyclarr/recyclarr.hostname.yml +++ b/compose/.apps/recyclarr/recyclarr.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/recyclarr/recyclarr.labels.yml b/compose/.apps/recyclarr/recyclarr.labels.yml index 101ff41e8e..821349f3e5 100644 --- a/compose/.apps/recyclarr/recyclarr.labels.yml +++ b/compose/.apps/recyclarr/recyclarr.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Application to synchronize settings from the TRaSH guides to your Sonarr/Radarr instances" com.dockstarter.appinfo.nicename: "Recyclarr" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_create_config: "true" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_create_config: "true" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/recyclarr/recyclarr.netmode.yml b/compose/.apps/recyclarr/recyclarr.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/recyclarr/recyclarr.netmode.yml +++ b/compose/.apps/recyclarr/recyclarr.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/recyclarr/recyclarr.x86_64.yml b/compose/.apps/recyclarr/recyclarr.x86_64.yml index 66c9b3e716..b7a9d8f1ff 100644 --- a/compose/.apps/recyclarr/recyclarr.x86_64.yml +++ b/compose/.apps/recyclarr/recyclarr.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/recyclarr/recyclarr:${${_APPNAME_}_TAG} + : + image: ghcr.io/recyclarr/recyclarr:${_TAG} diff --git a/compose/.apps/recyclarr/recyclarr.yml b/compose/.apps/recyclarr/recyclarr.yml index 773de347d7..bf793f810f 100644 --- a/compose/.apps/recyclarr/recyclarr.yml +++ b/compose/.apps/recyclarr/recyclarr.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - RECYCLARR_CREATE_CONFIG=${${_APPNAME_}_ENVIRONMENT_CREATE_CONFIG} + - RECYCLARR_CREATE_CONFIG=${_ENVIRONMENT_CREATE_CONFIG} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} user: ${PUID}:${PGID} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/requestrr/requestrr.aarch64.yml b/compose/.apps/requestrr/requestrr.aarch64.yml index 0ffd4dc926..d94a53c138 100644 --- a/compose/.apps/requestrr/requestrr.aarch64.yml +++ b/compose/.apps/requestrr/requestrr.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/requestrr:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/requestrr:${_TAG} diff --git a/compose/.apps/requestrr/requestrr.hostname.yml b/compose/.apps/requestrr/requestrr.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/requestrr/requestrr.hostname.yml +++ b/compose/.apps/requestrr/requestrr.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/requestrr/requestrr.labels.yml b/compose/.apps/requestrr/requestrr.labels.yml index 2f489019d0..dd57092b9e 100644 --- a/compose/.apps/requestrr/requestrr.labels.yml +++ b/compose/.apps/requestrr/requestrr.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) Use Doplarr" com.dockstarter.appinfo.nicename: "Requestrr" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_4545: "4545" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_4545: "4545" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/requestrr/requestrr.netmode.yml b/compose/.apps/requestrr/requestrr.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/requestrr/requestrr.netmode.yml +++ b/compose/.apps/requestrr/requestrr.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/requestrr/requestrr.ports.yml b/compose/.apps/requestrr/requestrr.ports.yml index dc7f6d9ea7..0c7663fe36 100644 --- a/compose/.apps/requestrr/requestrr.ports.yml +++ b/compose/.apps/requestrr/requestrr.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_4545}:4545 + - ${_PORT_4545}:4545 diff --git a/compose/.apps/requestrr/requestrr.x86_64.yml b/compose/.apps/requestrr/requestrr.x86_64.yml index 0ffd4dc926..d94a53c138 100644 --- a/compose/.apps/requestrr/requestrr.x86_64.yml +++ b/compose/.apps/requestrr/requestrr.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/requestrr:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/requestrr:${_TAG} diff --git a/compose/.apps/requestrr/requestrr.yml b/compose/.apps/requestrr/requestrr.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/requestrr/requestrr.yml +++ b/compose/.apps/requestrr/requestrr.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/resiliosync/resiliosync.aarch64.yml b/compose/.apps/resiliosync/resiliosync.aarch64.yml index 2e7b123bc5..77dec7ba10 100644 --- a/compose/.apps/resiliosync/resiliosync.aarch64.yml +++ b/compose/.apps/resiliosync/resiliosync.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/resilio-sync:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/resilio-sync:${_TAG} diff --git a/compose/.apps/resiliosync/resiliosync.hostname.yml b/compose/.apps/resiliosync/resiliosync.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/resiliosync/resiliosync.hostname.yml +++ b/compose/.apps/resiliosync/resiliosync.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/resiliosync/resiliosync.labels.yml b/compose/.apps/resiliosync/resiliosync.labels.yml index 918c1f1f79..0c2ece41bb 100644 --- a/compose/.apps/resiliosync/resiliosync.labels.yml +++ b/compose/.apps/resiliosync/resiliosync.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A fast, reliable, and simple P2P file sync and share solution" com.dockstarter.appinfo.nicename: "ResilioSync" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_55555: "55555" - com.dockstarter.appvars.${_appname_}_port_8888: "8888" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_syncdir: "/mnt/resiliosync" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_55555: "55555" + com.dockstarter.appvars._port_8888: "8888" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_syncdir: "/mnt/resiliosync" diff --git a/compose/.apps/resiliosync/resiliosync.netmode.yml b/compose/.apps/resiliosync/resiliosync.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/resiliosync/resiliosync.netmode.yml +++ b/compose/.apps/resiliosync/resiliosync.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/resiliosync/resiliosync.ports.yml b/compose/.apps/resiliosync/resiliosync.ports.yml index 51dffad37a..7f3b239ce4 100644 --- a/compose/.apps/resiliosync/resiliosync.ports.yml +++ b/compose/.apps/resiliosync/resiliosync.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8888}:8888 - - ${${_APPNAME_}_PORT_55555}:55555 + - ${_PORT_8888}:8888 + - ${_PORT_55555}:55555 diff --git a/compose/.apps/resiliosync/resiliosync.x86_64.yml b/compose/.apps/resiliosync/resiliosync.x86_64.yml index 2e7b123bc5..77dec7ba10 100644 --- a/compose/.apps/resiliosync/resiliosync.x86_64.yml +++ b/compose/.apps/resiliosync/resiliosync.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/resilio-sync:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/resilio-sync:${_TAG} diff --git a/compose/.apps/resiliosync/resiliosync.yml b/compose/.apps/resiliosync/resiliosync.yml index 5f32e97c3c..8934f58bd9 100644 --- a/compose/.apps/resiliosync/resiliosync.yml +++ b/compose/.apps/resiliosync/resiliosync.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_SYNCDIR}:/sync + - ${_VOLUME_SYNCDIR}:/sync diff --git a/compose/.apps/rsnapshot/rsnapshot.aarch64.yml b/compose/.apps/rsnapshot/rsnapshot.aarch64.yml index f57e8b2765..45d3622a9c 100644 --- a/compose/.apps/rsnapshot/rsnapshot.aarch64.yml +++ b/compose/.apps/rsnapshot/rsnapshot.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/rsnapshot:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/rsnapshot:${_TAG} diff --git a/compose/.apps/rsnapshot/rsnapshot.hostname.yml b/compose/.apps/rsnapshot/rsnapshot.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/rsnapshot/rsnapshot.hostname.yml +++ b/compose/.apps/rsnapshot/rsnapshot.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/rsnapshot/rsnapshot.labels.yml b/compose/.apps/rsnapshot/rsnapshot.labels.yml index 33d450c9cf..a27358f32c 100644 --- a/compose/.apps/rsnapshot/rsnapshot.labels.yml +++ b/compose/.apps/rsnapshot/rsnapshot.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Make periodic snapshots of local machines, and remote machines over ssh" com.dockstarter.appinfo.nicename: "Rsnapshot" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_datadir: "~/.config/appdata" - com.dockstarter.appvars.${_appname_}_volume_root_ssh: "/root/.ssh" - com.dockstarter.appvars.${_appname_}_volume_snapshotsdir: "/mnt/rsnapshot/snapshots" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_datadir: "~/.config/appdata" + com.dockstarter.appvars._volume_root_ssh: "/root/.ssh" + com.dockstarter.appvars._volume_snapshotsdir: "/mnt/rsnapshot/snapshots" diff --git a/compose/.apps/rsnapshot/rsnapshot.netmode.yml b/compose/.apps/rsnapshot/rsnapshot.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/rsnapshot/rsnapshot.netmode.yml +++ b/compose/.apps/rsnapshot/rsnapshot.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/rsnapshot/rsnapshot.x86_64.yml b/compose/.apps/rsnapshot/rsnapshot.x86_64.yml index f57e8b2765..45d3622a9c 100644 --- a/compose/.apps/rsnapshot/rsnapshot.x86_64.yml +++ b/compose/.apps/rsnapshot/rsnapshot.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/rsnapshot:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/rsnapshot:${_TAG} diff --git a/compose/.apps/rsnapshot/rsnapshot.yml b/compose/.apps/rsnapshot/rsnapshot.yml index 7c6fe03981..f432ae720b 100644 --- a/compose/.apps/rsnapshot/rsnapshot.yml +++ b/compose/.apps/rsnapshot/rsnapshot.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_DATADIR}:/data - - ${${_APPNAME_}_VOLUME_ROOT_SSH}:/root/.ssh:ro - - ${${_APPNAME_}_VOLUME_SNAPSHOTSDIR}:/.snapshots + - ${_VOLUME_DATADIR}:/data + - ${_VOLUME_ROOT_SSH}:/root/.ssh:ro + - ${_VOLUME_SNAPSHOTSDIR}:/.snapshots diff --git a/compose/.apps/rtorrentvpn/rtorrentvpn.hostname.yml b/compose/.apps/rtorrentvpn/rtorrentvpn.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/rtorrentvpn/rtorrentvpn.hostname.yml +++ b/compose/.apps/rtorrentvpn/rtorrentvpn.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/rtorrentvpn/rtorrentvpn.labels.yml b/compose/.apps/rtorrentvpn/rtorrentvpn.labels.yml index e30fb3e892..9496759bc0 100644 --- a/compose/.apps/rtorrentvpn/rtorrentvpn.labels.yml +++ b/compose/.apps/rtorrentvpn/rtorrentvpn.labels.yml @@ -1,25 +1,25 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) rTorrent with PrivoxyVPN" com.dockstarter.appinfo.nicename: "rTorrentVPN" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_enable_autodl_irssi: "no" - com.dockstarter.appvars.${_appname_}_environment_enable_privoxy: "no" - com.dockstarter.appvars.${_appname_}_environment_enable_rpc2: "yes" - com.dockstarter.appvars.${_appname_}_environment_enable_rpc2_auth: "yes" - com.dockstarter.appvars.${_appname_}_environment_enable_webui_auth: "yes" - com.dockstarter.appvars.${_appname_}_environment_rpc2_pass: "rutorrent" - com.dockstarter.appvars.${_appname_}_environment_rpc2_user: "admin" - com.dockstarter.appvars.${_appname_}_environment_webui_pass: "rutorrent" - com.dockstarter.appvars.${_appname_}_environment_webui_user: "admin" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_51413: "51413" - com.dockstarter.appvars.${_appname_}_port_6881: "6881" - com.dockstarter.appvars.${_appname_}_port_8118: "8118" - com.dockstarter.appvars.${_appname_}_port_9080: "9080" - com.dockstarter.appvars.${_appname_}_port_9443: "9443" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_enable_autodl_irssi: "no" + com.dockstarter.appvars._environment_enable_privoxy: "no" + com.dockstarter.appvars._environment_enable_rpc2: "yes" + com.dockstarter.appvars._environment_enable_rpc2_auth: "yes" + com.dockstarter.appvars._environment_enable_webui_auth: "yes" + com.dockstarter.appvars._environment_rpc2_pass: "rutorrent" + com.dockstarter.appvars._environment_rpc2_user: "admin" + com.dockstarter.appvars._environment_webui_pass: "rutorrent" + com.dockstarter.appvars._environment_webui_user: "admin" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_51413: "51413" + com.dockstarter.appvars._port_6881: "6881" + com.dockstarter.appvars._port_8118: "8118" + com.dockstarter.appvars._port_9080: "9080" + com.dockstarter.appvars._port_9443: "9443" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/rtorrentvpn/rtorrentvpn.netmode.yml b/compose/.apps/rtorrentvpn/rtorrentvpn.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/rtorrentvpn/rtorrentvpn.netmode.yml +++ b/compose/.apps/rtorrentvpn/rtorrentvpn.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/rtorrentvpn/rtorrentvpn.ports.yml b/compose/.apps/rtorrentvpn/rtorrentvpn.ports.yml index c4595005d8..dd0841456c 100644 --- a/compose/.apps/rtorrentvpn/rtorrentvpn.ports.yml +++ b/compose/.apps/rtorrentvpn/rtorrentvpn.ports.yml @@ -1,10 +1,10 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_51413}:51413 - - ${${_APPNAME_}_PORT_51413}:51413/udp - - ${${_APPNAME_}_PORT_6881}:6881 - - ${${_APPNAME_}_PORT_6881}:6881/udp - - ${${_APPNAME_}_PORT_8118}:8118 - - ${${_APPNAME_}_PORT_9080}:9080 - - ${${_APPNAME_}_PORT_9443}:9443 + - ${_PORT_51413}:51413 + - ${_PORT_51413}:51413/udp + - ${_PORT_6881}:6881 + - ${_PORT_6881}:6881/udp + - ${_PORT_8118}:8118 + - ${_PORT_9080}:9080 + - ${_PORT_9443}:9443 diff --git a/compose/.apps/rtorrentvpn/rtorrentvpn.x86_64.yml b/compose/.apps/rtorrentvpn/rtorrentvpn.x86_64.yml index 89e7a34941..6cb8013f5f 100644 --- a/compose/.apps/rtorrentvpn/rtorrentvpn.x86_64.yml +++ b/compose/.apps/rtorrentvpn/rtorrentvpn.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/binhex/arch-rtorrentvpn:${${_APPNAME_}_TAG} + : + image: ghcr.io/binhex/arch-rtorrentvpn:${_TAG} diff --git a/compose/.apps/rtorrentvpn/rtorrentvpn.yml b/compose/.apps/rtorrentvpn/rtorrentvpn.yml index a072a4c7d7..3146e73ffb 100644 --- a/compose/.apps/rtorrentvpn/rtorrentvpn.yml +++ b/compose/.apps/rtorrentvpn/rtorrentvpn.yml @@ -1,22 +1,22 @@ services: - ${_appname_}: + : cap_add: - NET_ADMIN - SYS_MODULE - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} environment: - - ENABLE_AUTODL_IRSSI=${${_APPNAME_}_ENVIRONMENT_ENABLE_AUTODL_IRSSI} - - ENABLE_PRIVOXY=${${_APPNAME_}_ENVIRONMENT_ENABLE_PRIVOXY} - - ENABLE_RPC2_AUTH=${${_APPNAME_}_ENVIRONMENT_ENABLE_RPC2_AUTH} - - ENABLE_RPC2=${${_APPNAME_}_ENVIRONMENT_ENABLE_RPC2} - - ENABLE_WEBUI_AUTH=${${_APPNAME_}_ENVIRONMENT_ENABLE_WEBUI_AUTH} + - ENABLE_AUTODL_IRSSI=${_ENVIRONMENT_ENABLE_AUTODL_IRSSI} + - ENABLE_PRIVOXY=${_ENVIRONMENT_ENABLE_PRIVOXY} + - ENABLE_RPC2_AUTH=${_ENVIRONMENT_ENABLE_RPC2_AUTH} + - ENABLE_RPC2=${_ENVIRONMENT_ENABLE_RPC2} + - ENABLE_WEBUI_AUTH=${_ENVIRONMENT_ENABLE_WEBUI_AUTH} - LAN_NETWORK=${LAN_NETWORK} - NAME_SERVERS=${NS1},${NS2} - PGID=${PGID} - PHP_TZ=${TZ} - PUID=${PUID} - - RPC2_PASS=${${_APPNAME_}_ENVIRONMENT_RPC2_PASS} - - RPC2_USER=${${_APPNAME_}_ENVIRONMENT_RPC2_USER} + - RPC2_PASS=${_ENVIRONMENT_RPC2_PASS} + - RPC2_USER=${_ENVIRONMENT_RPC2_USER} - TZ=${TZ} - VPN_CLIENT=${VPN_CLIENT} - VPN_ENABLED=${VPN_ENABLE} @@ -24,15 +24,15 @@ services: - VPN_PASS=${VPN_PASS} - VPN_PROV=${VPN_PROV} - VPN_USER=${VPN_USER} - - WEBUI_PASS=${${_APPNAME_}_ENVIRONMENT_WEBUI_PASS} - - WEBUI_USER=${${_APPNAME_}_ENVIRONMENT_WEBUI_USER} + - WEBUI_PASS=${_ENVIRONMENT_WEBUI_PASS} + - WEBUI_USER=${_ENVIRONMENT_WEBUI_USER} privileged: true - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} sysctls: - net.ipv4.conf.all.src_valid_mark=1 volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage - ${VPN_VOLUME_OVPNDIR}:/config/openvpn - ${VPN_VOLUME_WGDIR}:/config/wireguard diff --git a/compose/.apps/rustdesk/rustdesk.aarch64.yml b/compose/.apps/rustdesk/rustdesk.aarch64.yml index 3443ac03c9..119aabae49 100644 --- a/compose/.apps/rustdesk/rustdesk.aarch64.yml +++ b/compose/.apps/rustdesk/rustdesk.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: rustdesk/rustdesk-server-s6:${${_APPNAME_}_TAG} + : + image: rustdesk/rustdesk-server-s6:${_TAG} diff --git a/compose/.apps/rustdesk/rustdesk.hostname.yml b/compose/.apps/rustdesk/rustdesk.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/rustdesk/rustdesk.hostname.yml +++ b/compose/.apps/rustdesk/rustdesk.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/rustdesk/rustdesk.labels.yml b/compose/.apps/rustdesk/rustdesk.labels.yml index 247c0d0705..cca4cb9a33 100644 --- a/compose/.apps/rustdesk/rustdesk.labels.yml +++ b/compose/.apps/rustdesk/rustdesk.labels.yml @@ -1,17 +1,17 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "RustDesk server software including hbbs (rendezvous server) and hbbr (relay server) program, an open-source self-hosted TeamViewer alternative" com.dockstarter.appinfo.nicename: "RustDesk" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_relay_server: "0.0.0.0" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_21115: "21115" - com.dockstarter.appvars.${_appname_}_port_21116: "21116" - com.dockstarter.appvars.${_appname_}_port_21117: "21117" - com.dockstarter.appvars.${_appname_}_port_21118: "21118" - com.dockstarter.appvars.${_appname_}_port_21119: "21119" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_relay_server: "0.0.0.0" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_21115: "21115" + com.dockstarter.appvars._port_21116: "21116" + com.dockstarter.appvars._port_21117: "21117" + com.dockstarter.appvars._port_21118: "21118" + com.dockstarter.appvars._port_21119: "21119" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/rustdesk/rustdesk.netmode.yml b/compose/.apps/rustdesk/rustdesk.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/rustdesk/rustdesk.netmode.yml +++ b/compose/.apps/rustdesk/rustdesk.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/rustdesk/rustdesk.ports.yml b/compose/.apps/rustdesk/rustdesk.ports.yml index 99146f4171..372b5a0e33 100644 --- a/compose/.apps/rustdesk/rustdesk.ports.yml +++ b/compose/.apps/rustdesk/rustdesk.ports.yml @@ -1,9 +1,9 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_21115}:21115 - - ${${_APPNAME_}_PORT_21116}:21116 - - ${${_APPNAME_}_PORT_21116}:21116/udp - - ${${_APPNAME_}_PORT_21117}:21117 - - ${${_APPNAME_}_PORT_21118}:21118 - - ${${_APPNAME_}_PORT_21119}:21119 + - ${_PORT_21115}:21115 + - ${_PORT_21116}:21116 + - ${_PORT_21116}:21116/udp + - ${_PORT_21117}:21117 + - ${_PORT_21118}:21118 + - ${_PORT_21119}:21119 diff --git a/compose/.apps/rustdesk/rustdesk.x86_64.yml b/compose/.apps/rustdesk/rustdesk.x86_64.yml index 3443ac03c9..119aabae49 100644 --- a/compose/.apps/rustdesk/rustdesk.x86_64.yml +++ b/compose/.apps/rustdesk/rustdesk.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: rustdesk/rustdesk-server-s6:${${_APPNAME_}_TAG} + : + image: rustdesk/rustdesk-server-s6:${_TAG} diff --git a/compose/.apps/rustdesk/rustdesk.yml b/compose/.apps/rustdesk/rustdesk.yml index 820b028237..e1c2e376f1 100644 --- a/compose/.apps/rustdesk/rustdesk.yml +++ b/compose/.apps/rustdesk/rustdesk.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - - RELAY=${${_APPNAME_}_ENVIRONMENT_RELAY_SERVER} + - RELAY=${_ENVIRONMENT_RELAY_SERVER} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/data + - ${DOCKER_VOLUME_CONFIG}/:/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/rutorrent/rutorrent.aarch64.yml b/compose/.apps/rutorrent/rutorrent.aarch64.yml index 4855a95633..efd00324ca 100644 --- a/compose/.apps/rutorrent/rutorrent.aarch64.yml +++ b/compose/.apps/rutorrent/rutorrent.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/rutorrent:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/rutorrent:${_TAG} diff --git a/compose/.apps/rutorrent/rutorrent.hostname.yml b/compose/.apps/rutorrent/rutorrent.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/rutorrent/rutorrent.hostname.yml +++ b/compose/.apps/rutorrent/rutorrent.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/rutorrent/rutorrent.labels.yml b/compose/.apps/rutorrent/rutorrent.labels.yml index 86680e81ab..05df5d2d4d 100644 --- a/compose/.apps/rutorrent/rutorrent.labels.yml +++ b/compose/.apps/rutorrent/rutorrent.labels.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) Use Deluge/qBittorrent/Transmission" com.dockstarter.appinfo.nicename: "ruTorrent" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_5000: "5000" - com.dockstarter.appvars.${_appname_}_port_51413: "51413" - com.dockstarter.appvars.${_appname_}_port_6881: "6881" - com.dockstarter.appvars.${_appname_}_port_80: "8009" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_5000: "5000" + com.dockstarter.appvars._port_51413: "51413" + com.dockstarter.appvars._port_6881: "6881" + com.dockstarter.appvars._port_80: "8009" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/rutorrent/rutorrent.netmode.yml b/compose/.apps/rutorrent/rutorrent.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/rutorrent/rutorrent.netmode.yml +++ b/compose/.apps/rutorrent/rutorrent.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/rutorrent/rutorrent.ports.yml b/compose/.apps/rutorrent/rutorrent.ports.yml index e37edbcbf1..cec63ead35 100644 --- a/compose/.apps/rutorrent/rutorrent.ports.yml +++ b/compose/.apps/rutorrent/rutorrent.ports.yml @@ -1,9 +1,9 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_5000}:5000 - - ${${_APPNAME_}_PORT_51413}:51413 - - ${${_APPNAME_}_PORT_51413}:51413/udp - - ${${_APPNAME_}_PORT_6881}:6881 - - ${${_APPNAME_}_PORT_6881}:6881/udp - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_5000}:5000 + - ${_PORT_51413}:51413 + - ${_PORT_51413}:51413/udp + - ${_PORT_6881}:6881 + - ${_PORT_6881}:6881/udp + - ${_PORT_80}:80 diff --git a/compose/.apps/rutorrent/rutorrent.x86_64.yml b/compose/.apps/rutorrent/rutorrent.x86_64.yml index 4855a95633..efd00324ca 100644 --- a/compose/.apps/rutorrent/rutorrent.x86_64.yml +++ b/compose/.apps/rutorrent/rutorrent.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/rutorrent:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/rutorrent:${_TAG} diff --git a/compose/.apps/rutorrent/rutorrent.yml b/compose/.apps/rutorrent/rutorrent.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/rutorrent/rutorrent.yml +++ b/compose/.apps/rutorrent/rutorrent.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/sabnzbd/sabnzbd.aarch64.yml b/compose/.apps/sabnzbd/sabnzbd.aarch64.yml index 204752bbc1..38b2d84889 100644 --- a/compose/.apps/sabnzbd/sabnzbd.aarch64.yml +++ b/compose/.apps/sabnzbd/sabnzbd.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/sabnzbd:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/sabnzbd:${_TAG} diff --git a/compose/.apps/sabnzbd/sabnzbd.hostname.yml b/compose/.apps/sabnzbd/sabnzbd.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/sabnzbd/sabnzbd.hostname.yml +++ b/compose/.apps/sabnzbd/sabnzbd.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/sabnzbd/sabnzbd.labels.yml b/compose/.apps/sabnzbd/sabnzbd.labels.yml index 2e6642db4f..8f3dfdb45b 100644 --- a/compose/.apps/sabnzbd/sabnzbd.labels.yml +++ b/compose/.apps/sabnzbd/sabnzbd.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "NZB Newsgrabber / Downloader" com.dockstarter.appinfo.nicename: "SABnzbd" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8080: "8080" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8080: "8080" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/sabnzbd/sabnzbd.netmode.yml b/compose/.apps/sabnzbd/sabnzbd.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/sabnzbd/sabnzbd.netmode.yml +++ b/compose/.apps/sabnzbd/sabnzbd.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/sabnzbd/sabnzbd.ports.yml b/compose/.apps/sabnzbd/sabnzbd.ports.yml index 7d1c7e4455..f19f4867cd 100644 --- a/compose/.apps/sabnzbd/sabnzbd.ports.yml +++ b/compose/.apps/sabnzbd/sabnzbd.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8080}:8080 + - ${_PORT_8080}:8080 diff --git a/compose/.apps/sabnzbd/sabnzbd.x86_64.yml b/compose/.apps/sabnzbd/sabnzbd.x86_64.yml index 204752bbc1..38b2d84889 100644 --- a/compose/.apps/sabnzbd/sabnzbd.x86_64.yml +++ b/compose/.apps/sabnzbd/sabnzbd.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/sabnzbd:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/sabnzbd:${_TAG} diff --git a/compose/.apps/sabnzbd/sabnzbd.yml b/compose/.apps/sabnzbd/sabnzbd.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/sabnzbd/sabnzbd.yml +++ b/compose/.apps/sabnzbd/sabnzbd.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/sabnzbdvpn/sabnzbdvpn.hostname.yml b/compose/.apps/sabnzbdvpn/sabnzbdvpn.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/sabnzbdvpn/sabnzbdvpn.hostname.yml +++ b/compose/.apps/sabnzbdvpn/sabnzbdvpn.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/sabnzbdvpn/sabnzbdvpn.labels.yml b/compose/.apps/sabnzbdvpn/sabnzbdvpn.labels.yml index c61087980c..d58b558017 100644 --- a/compose/.apps/sabnzbdvpn/sabnzbdvpn.labels.yml +++ b/compose/.apps/sabnzbdvpn/sabnzbdvpn.labels.yml @@ -1,25 +1,25 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "SABnzbd with PrivoxyVPN" com.dockstarter.appinfo.nicename: "SABnzbdVPN" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_enable_privoxy: "no" - com.dockstarter.appvars.${_appname_}_environment_lan_network: "192.168.x.x/24" - com.dockstarter.appvars.${_appname_}_environment_name_servers: "1.1.1.1,8.8.8.8" - com.dockstarter.appvars.${_appname_}_environment_vpn_client: "openvpn" - com.dockstarter.appvars.${_appname_}_environment_vpn_enable: "no" - com.dockstarter.appvars.${_appname_}_environment_vpn_input_ports: "" - com.dockstarter.appvars.${_appname_}_environment_vpn_options: "" - com.dockstarter.appvars.${_appname_}_environment_vpn_output_ports: "" - com.dockstarter.appvars.${_appname_}_environment_vpn_pass: "your-vpn-pass" - com.dockstarter.appvars.${_appname_}_environment_vpn_prov: "custom" - com.dockstarter.appvars.${_appname_}_environment_vpn_user: "your-vpn-user" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8080: "8080" - com.dockstarter.appvars.${_appname_}_port_8090: "8090" - com.dockstarter.appvars.${_appname_}_port_8118: "8118" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_enable_privoxy: "no" + com.dockstarter.appvars._environment_lan_network: "192.168.x.x/24" + com.dockstarter.appvars._environment_name_servers: "1.1.1.1,8.8.8.8" + com.dockstarter.appvars._environment_vpn_client: "openvpn" + com.dockstarter.appvars._environment_vpn_enable: "no" + com.dockstarter.appvars._environment_vpn_input_ports: "" + com.dockstarter.appvars._environment_vpn_options: "" + com.dockstarter.appvars._environment_vpn_output_ports: "" + com.dockstarter.appvars._environment_vpn_pass: "your-vpn-pass" + com.dockstarter.appvars._environment_vpn_prov: "custom" + com.dockstarter.appvars._environment_vpn_user: "your-vpn-user" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8080: "8080" + com.dockstarter.appvars._port_8090: "8090" + com.dockstarter.appvars._port_8118: "8118" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/sabnzbdvpn/sabnzbdvpn.netmode.yml b/compose/.apps/sabnzbdvpn/sabnzbdvpn.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/sabnzbdvpn/sabnzbdvpn.netmode.yml +++ b/compose/.apps/sabnzbdvpn/sabnzbdvpn.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/sabnzbdvpn/sabnzbdvpn.ports.yml b/compose/.apps/sabnzbdvpn/sabnzbdvpn.ports.yml index cbd6b6e4ce..d8f1d67f76 100644 --- a/compose/.apps/sabnzbdvpn/sabnzbdvpn.ports.yml +++ b/compose/.apps/sabnzbdvpn/sabnzbdvpn.ports.yml @@ -1,6 +1,6 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8080}:8080 - - ${${_APPNAME_}_PORT_8090}:8090 - - ${${_APPNAME_}_PORT_8118}:8118 + - ${_PORT_8080}:8080 + - ${_PORT_8090}:8090 + - ${_PORT_8118}:8118 diff --git a/compose/.apps/sabnzbdvpn/sabnzbdvpn.x86_64.yml b/compose/.apps/sabnzbdvpn/sabnzbdvpn.x86_64.yml index 007ca5c5e5..4bb67efa61 100644 --- a/compose/.apps/sabnzbdvpn/sabnzbdvpn.x86_64.yml +++ b/compose/.apps/sabnzbdvpn/sabnzbdvpn.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/binhex/arch-sabnzbdvpn:${${_APPNAME_}_TAG} + : + image: ghcr.io/binhex/arch-sabnzbdvpn:${_TAG} diff --git a/compose/.apps/sabnzbdvpn/sabnzbdvpn.yml b/compose/.apps/sabnzbdvpn/sabnzbdvpn.yml index 7cc77e89ea..9d8cab9ca4 100644 --- a/compose/.apps/sabnzbdvpn/sabnzbdvpn.yml +++ b/compose/.apps/sabnzbdvpn/sabnzbdvpn.yml @@ -1,29 +1,29 @@ services: - ${_appname_}: + : cap_add: - NET_ADMIN - SYS_MODULE - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} environment: - - ENABLE_PRIVOXY=${${_APPNAME_}_ENVIRONMENT_ENABLE_PRIVOXY} - - LAN_NETWORK=${${_APPNAME_}_ENVIRONMENT_LAN_NETWORK} - - NAME_SERVERS=${${_APPNAME_}_ENVIRONMENT_NAME_SERVERS} + - ENABLE_PRIVOXY=${_ENVIRONMENT_ENABLE_PRIVOXY} + - LAN_NETWORK=${_ENVIRONMENT_LAN_NETWORK} + - NAME_SERVERS=${_ENVIRONMENT_NAME_SERVERS} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - VPN_CLIENT=${${_APPNAME_}_ENVIRONMENT_VPN_CLIENT} - - VPN_ENABLED=${${_APPNAME_}_ENVIRONMENT_VPN_ENABLE} - - VPN_INPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_VPN_INPUT_PORTS} - - VPN_OPTIONS=${${_APPNAME_}_ENVIRONMENT_VPN_OPTIONS} - - VPN_OUTPUT_PORTS=${${_APPNAME_}_ENVIRONMENT_VPN_OUTPUT_PORTS} - - VPN_PASS=${${_APPNAME_}_ENVIRONMENT_VPN_PASS} - - VPN_PROV=${${_APPNAME_}_ENVIRONMENT_VPN_PROV} - - VPN_USER=${${_APPNAME_}_ENVIRONMENT_VPN_USER} + - VPN_CLIENT=${_ENVIRONMENT_VPN_CLIENT} + - VPN_ENABLED=${_ENVIRONMENT_VPN_ENABLE} + - VPN_INPUT_PORTS=${_ENVIRONMENT_VPN_INPUT_PORTS} + - VPN_OPTIONS=${_ENVIRONMENT_VPN_OPTIONS} + - VPN_OUTPUT_PORTS=${_ENVIRONMENT_VPN_OUTPUT_PORTS} + - VPN_PASS=${_ENVIRONMENT_VPN_PASS} + - VPN_PROV=${_ENVIRONMENT_VPN_PROV} + - VPN_USER=${_ENVIRONMENT_VPN_USER} privileged: true - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} sysctls: - net.ipv4.conf.all.src_valid_mark=1 volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/samba/samba.aarch64.yml b/compose/.apps/samba/samba.aarch64.yml index d731d2d06b..a31f5f8d25 100644 --- a/compose/.apps/samba/samba.aarch64.yml +++ b/compose/.apps/samba/samba.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: dperson/samba:${${_APPNAME_}_TAG} + : + image: dperson/samba:${_TAG} diff --git a/compose/.apps/samba/samba.hostname.yml b/compose/.apps/samba/samba.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/samba/samba.hostname.yml +++ b/compose/.apps/samba/samba.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/samba/samba.labels.yml b/compose/.apps/samba/samba.labels.yml index 9eb131613b..5b9da65f15 100644 --- a/compose/.apps/samba/samba.labels.yml +++ b/compose/.apps/samba/samba.labels.yml @@ -1,20 +1,20 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) No replacement" com.dockstarter.appinfo.nicename: "Samba" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_nmbd: "true" - com.dockstarter.appvars.${_appname_}_environment_password: "ds" - com.dockstarter.appvars.${_appname_}_environment_sharename: "DockSTARTer" - com.dockstarter.appvars.${_appname_}_environment_username: "ds" - com.dockstarter.appvars.${_appname_}_environment_workgroup: "WORKGROUP" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_137: "137" - com.dockstarter.appvars.${_appname_}_port_138: "138" - com.dockstarter.appvars.${_appname_}_port_139: "139" - com.dockstarter.appvars.${_appname_}_port_445: "445" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_nmbd: "true" + com.dockstarter.appvars._environment_password: "ds" + com.dockstarter.appvars._environment_sharename: "DockSTARTer" + com.dockstarter.appvars._environment_username: "ds" + com.dockstarter.appvars._environment_workgroup: "WORKGROUP" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_137: "137" + com.dockstarter.appvars._port_138: "138" + com.dockstarter.appvars._port_139: "139" + com.dockstarter.appvars._port_445: "445" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/samba/samba.netmode.yml b/compose/.apps/samba/samba.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/samba/samba.netmode.yml +++ b/compose/.apps/samba/samba.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/samba/samba.ports.yml b/compose/.apps/samba/samba.ports.yml index 5545e23a22..1cc851f85d 100644 --- a/compose/.apps/samba/samba.ports.yml +++ b/compose/.apps/samba/samba.ports.yml @@ -1,7 +1,7 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_137}:137/udp - - ${${_APPNAME_}_PORT_138}:138/udp - - ${${_APPNAME_}_PORT_139}:139 - - ${${_APPNAME_}_PORT_445}:445 + - ${_PORT_137}:137/udp + - ${_PORT_138}:138/udp + - ${_PORT_139}:139 + - ${_PORT_445}:445 diff --git a/compose/.apps/samba/samba.x86_64.yml b/compose/.apps/samba/samba.x86_64.yml index d731d2d06b..a31f5f8d25 100644 --- a/compose/.apps/samba/samba.x86_64.yml +++ b/compose/.apps/samba/samba.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: dperson/samba:${${_APPNAME_}_TAG} + : + image: dperson/samba:${_TAG} diff --git a/compose/.apps/samba/samba.yml b/compose/.apps/samba/samba.yml index 6c9667838d..bd77db83b4 100644 --- a/compose/.apps/samba/samba.yml +++ b/compose/.apps/samba/samba.yml @@ -1,17 +1,17 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - GROUPID=${PGID} - - NMBD=${${_APPNAME_}_ENVIRONMENT_NMBD} - - SHARE=${${_APPNAME_}_ENVIRONMENT_SHARENAME};/${${_APPNAME_}_ENVIRONMENT_SHARENAME};yes;no;no;all;${${_APPNAME_}_ENVIRONMENT_USERNAME} + - NMBD=${_ENVIRONMENT_NMBD} + - SHARE=${_ENVIRONMENT_SHARENAME};/${_ENVIRONMENT_SHARENAME};yes;no;no;all;${_ENVIRONMENT_USERNAME} - TZ=${TZ} - - USER=${${_APPNAME_}_ENVIRONMENT_USERNAME};${${_APPNAME_}_ENVIRONMENT_PASSWORD} + - USER=${_ENVIRONMENT_USERNAME};${_ENVIRONMENT_PASSWORD} - USERID=${PUID} - - WORKGROUP=${${_APPNAME_}_ENVIRONMENT_WORKGROUP} - restart: ${${_APPNAME_}_RESTART} + - WORKGROUP=${_ENVIRONMENT_WORKGROUP} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}:/${${_APPNAME_}_ENVIRONMENT_SHARENAME}/config - - ${DOCKER_VOLUME_STORAGE}:/${${_APPNAME_}_ENVIRONMENT_SHARENAME}/storage + - ${DOCKER_VOLUME_CONFIG}:/${_ENVIRONMENT_SHARENAME}/config + - ${DOCKER_VOLUME_STORAGE}:/${_ENVIRONMENT_SHARENAME}/storage - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/sickchill/sickchill.aarch64.yml b/compose/.apps/sickchill/sickchill.aarch64.yml index 4c4eb4bc7b..b498d40b8b 100644 --- a/compose/.apps/sickchill/sickchill.aarch64.yml +++ b/compose/.apps/sickchill/sickchill.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/sickchill:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/sickchill:${_TAG} diff --git a/compose/.apps/sickchill/sickchill.hostname.yml b/compose/.apps/sickchill/sickchill.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/sickchill/sickchill.hostname.yml +++ b/compose/.apps/sickchill/sickchill.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/sickchill/sickchill.labels.yml b/compose/.apps/sickchill/sickchill.labels.yml index 2d5f480d07..60039540ae 100644 --- a/compose/.apps/sickchill/sickchill.labels.yml +++ b/compose/.apps/sickchill/sickchill.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Automatic Video Library Manager for TV Shows" com.dockstarter.appinfo.nicename: "SickChill" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8081: "8081" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8081: "8081" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/sickchill/sickchill.netmode.yml b/compose/.apps/sickchill/sickchill.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/sickchill/sickchill.netmode.yml +++ b/compose/.apps/sickchill/sickchill.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/sickchill/sickchill.ports.yml b/compose/.apps/sickchill/sickchill.ports.yml index b70b0fc494..52e7bd8a46 100644 --- a/compose/.apps/sickchill/sickchill.ports.yml +++ b/compose/.apps/sickchill/sickchill.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8081}:8081 + - ${_PORT_8081}:8081 diff --git a/compose/.apps/sickchill/sickchill.x86_64.yml b/compose/.apps/sickchill/sickchill.x86_64.yml index 4c4eb4bc7b..b498d40b8b 100644 --- a/compose/.apps/sickchill/sickchill.x86_64.yml +++ b/compose/.apps/sickchill/sickchill.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/sickchill:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/sickchill:${_TAG} diff --git a/compose/.apps/sickchill/sickchill.yml b/compose/.apps/sickchill/sickchill.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/sickchill/sickchill.yml +++ b/compose/.apps/sickchill/sickchill.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/smokeping/smokeping.aarch64.yml b/compose/.apps/smokeping/smokeping.aarch64.yml index 6dca09c211..a8a3a8e5d3 100644 --- a/compose/.apps/smokeping/smokeping.aarch64.yml +++ b/compose/.apps/smokeping/smokeping.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/smokeping:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/smokeping:${_TAG} diff --git a/compose/.apps/smokeping/smokeping.hostname.yml b/compose/.apps/smokeping/smokeping.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/smokeping/smokeping.hostname.yml +++ b/compose/.apps/smokeping/smokeping.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/smokeping/smokeping.labels.yml b/compose/.apps/smokeping/smokeping.labels.yml index 0e6dbe2619..ce1d354253 100644 --- a/compose/.apps/smokeping/smokeping.labels.yml +++ b/compose/.apps/smokeping/smokeping.labels.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Latency logging, graphing, and alerting system" com.dockstarter.appinfo.nicename: "SmokePing" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_dns1: "1.1.1.1" - com.dockstarter.appvars.${_appname_}_environment_dns2: "8.8.8.8" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_80: "8011" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_datadir: "/mnt/smokeping" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_dns1: "1.1.1.1" + com.dockstarter.appvars._environment_dns2: "8.8.8.8" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_80: "8011" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_datadir: "/mnt/smokeping" diff --git a/compose/.apps/smokeping/smokeping.netmode.yml b/compose/.apps/smokeping/smokeping.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/smokeping/smokeping.netmode.yml +++ b/compose/.apps/smokeping/smokeping.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/smokeping/smokeping.ports.yml b/compose/.apps/smokeping/smokeping.ports.yml index c37afbebb5..32f14e45fb 100644 --- a/compose/.apps/smokeping/smokeping.ports.yml +++ b/compose/.apps/smokeping/smokeping.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_80}:80 diff --git a/compose/.apps/smokeping/smokeping.x86_64.yml b/compose/.apps/smokeping/smokeping.x86_64.yml index 6dca09c211..a8a3a8e5d3 100644 --- a/compose/.apps/smokeping/smokeping.x86_64.yml +++ b/compose/.apps/smokeping/smokeping.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/smokeping:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/smokeping:${_TAG} diff --git a/compose/.apps/smokeping/smokeping.yml b/compose/.apps/smokeping/smokeping.yml index 9cad219eb9..b9a813a1ce 100644 --- a/compose/.apps/smokeping/smokeping.yml +++ b/compose/.apps/smokeping/smokeping.yml @@ -1,16 +1,16 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} dns: - - ${${_APPNAME_}_ENVIRONMENT_DNS1} - - ${${_APPNAME_}_ENVIRONMENT_DNS2} + - ${_ENVIRONMENT_DNS1} + - ${_ENVIRONMENT_DNS2} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_DATADIR}:/data + - ${_VOLUME_DATADIR}:/data diff --git a/compose/.apps/sonarr/sonarr.aarch64.yml b/compose/.apps/sonarr/sonarr.aarch64.yml index 3b0115c1a6..c2ce398425 100644 --- a/compose/.apps/sonarr/sonarr.aarch64.yml +++ b/compose/.apps/sonarr/sonarr.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/sonarr:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/sonarr:${_TAG} diff --git a/compose/.apps/sonarr/sonarr.hostname.yml b/compose/.apps/sonarr/sonarr.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/sonarr/sonarr.hostname.yml +++ b/compose/.apps/sonarr/sonarr.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/sonarr/sonarr.labels.yml b/compose/.apps/sonarr/sonarr.labels.yml index 72a59477dc..1025b63732 100644 --- a/compose/.apps/sonarr/sonarr.labels.yml +++ b/compose/.apps/sonarr/sonarr.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Smart TV show PVR via Usenet and BitTorrent" com.dockstarter.appinfo.nicename: "Sonarr" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8989: "8989" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8989: "8989" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/sonarr/sonarr.netmode.yml b/compose/.apps/sonarr/sonarr.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/sonarr/sonarr.netmode.yml +++ b/compose/.apps/sonarr/sonarr.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/sonarr/sonarr.ports.yml b/compose/.apps/sonarr/sonarr.ports.yml index e749e8dce4..4766972de3 100644 --- a/compose/.apps/sonarr/sonarr.ports.yml +++ b/compose/.apps/sonarr/sonarr.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8989}:8989 + - ${_PORT_8989}:8989 diff --git a/compose/.apps/sonarr/sonarr.x86_64.yml b/compose/.apps/sonarr/sonarr.x86_64.yml index 3b0115c1a6..c2ce398425 100644 --- a/compose/.apps/sonarr/sonarr.x86_64.yml +++ b/compose/.apps/sonarr/sonarr.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/sonarr:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/sonarr:${_TAG} diff --git a/compose/.apps/sonarr/sonarr.yml b/compose/.apps/sonarr/sonarr.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/sonarr/sonarr.yml +++ b/compose/.apps/sonarr/sonarr.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/speedtest/speedtest.aarch64.yml b/compose/.apps/speedtest/speedtest.aarch64.yml index 7487a618cf..e3eb4da398 100644 --- a/compose/.apps/speedtest/speedtest.aarch64.yml +++ b/compose/.apps/speedtest/speedtest.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: henrywhitaker3/speedtest-tracker:${${_APPNAME_}_TAG}-arm + : + image: henrywhitaker3/speedtest-tracker:${_TAG}-arm diff --git a/compose/.apps/speedtest/speedtest.hostname.yml b/compose/.apps/speedtest/speedtest.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/speedtest/speedtest.hostname.yml +++ b/compose/.apps/speedtest/speedtest.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/speedtest/speedtest.labels.yml b/compose/.apps/speedtest/speedtest.labels.yml index 47b0c2fa5e..9027bd72f3 100644 --- a/compose/.apps/speedtest/speedtest.labels.yml +++ b/compose/.apps/speedtest/speedtest.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "This program runs a speedtest check every hour and graphs the results." com.dockstarter.appinfo.nicename: "speedtest" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_base_path: "/" - com.dockstarter.appvars.${_appname_}_environment_ookla_eula_gdpr: "true" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_80: "80" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_base_path: "/" + com.dockstarter.appvars._environment_ookla_eula_gdpr: "true" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_80: "80" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/speedtest/speedtest.netmode.yml b/compose/.apps/speedtest/speedtest.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/speedtest/speedtest.netmode.yml +++ b/compose/.apps/speedtest/speedtest.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/speedtest/speedtest.ports.yml b/compose/.apps/speedtest/speedtest.ports.yml index c37afbebb5..32f14e45fb 100644 --- a/compose/.apps/speedtest/speedtest.ports.yml +++ b/compose/.apps/speedtest/speedtest.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_80}:80 diff --git a/compose/.apps/speedtest/speedtest.x86_64.yml b/compose/.apps/speedtest/speedtest.x86_64.yml index 1ca11d61ff..4d80056a91 100644 --- a/compose/.apps/speedtest/speedtest.x86_64.yml +++ b/compose/.apps/speedtest/speedtest.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: henrywhitaker3/speedtest-tracker:${${_APPNAME_}_TAG} + : + image: henrywhitaker3/speedtest-tracker:${_TAG} diff --git a/compose/.apps/speedtest/speedtest.yml b/compose/.apps/speedtest/speedtest.yml index e9ab37b6cd..b1a0c52348 100644 --- a/compose/.apps/speedtest/speedtest.yml +++ b/compose/.apps/speedtest/speedtest.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - OOKLA_EULA_GDPR=${${_APPNAME_}_ENVIRONMENT_OOKLA_EULA_GDPR} + - OOKLA_EULA_GDPR=${_ENVIRONMENT_OOKLA_EULA_GDPR} - PGID=${PGID} - PUID=${PUID} - - BASE_PATH=${${_APPNAME_}_ENVIRONMENT_BASE_PATH} + - BASE_PATH=${_ENVIRONMENT_BASE_PATH} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/swag/swag.aarch64.yml b/compose/.apps/swag/swag.aarch64.yml index d952604507..0d4b6949d4 100644 --- a/compose/.apps/swag/swag.aarch64.yml +++ b/compose/.apps/swag/swag.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/swag:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/swag:${_TAG} diff --git a/compose/.apps/swag/swag.hostname.yml b/compose/.apps/swag/swag.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/swag/swag.hostname.yml +++ b/compose/.apps/swag/swag.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/swag/swag.labels.yml b/compose/.apps/swag/swag.labels.yml index 594259f282..f62d2b8305 100644 --- a/compose/.apps/swag/swag.labels.yml +++ b/compose/.apps/swag/swag.labels.yml @@ -1,20 +1,20 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Secure Web-server And Gateway" com.dockstarter.appinfo.nicename: "SWAG" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_dnsplugin: "" - com.dockstarter.appvars.${_appname_}_environment_email: "" - com.dockstarter.appvars.${_appname_}_environment_extra_domains: "" - com.dockstarter.appvars.${_appname_}_environment_only_subdomains: "false" - com.dockstarter.appvars.${_appname_}_environment_subdomains: "www" - com.dockstarter.appvars.${_appname_}_environment_url: "" - com.dockstarter.appvars.${_appname_}_environment_validation: "http" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_443: "443" - com.dockstarter.appvars.${_appname_}_port_80: "80" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_dnsplugin: "" + com.dockstarter.appvars._environment_email: "" + com.dockstarter.appvars._environment_extra_domains: "" + com.dockstarter.appvars._environment_only_subdomains: "false" + com.dockstarter.appvars._environment_subdomains: "www" + com.dockstarter.appvars._environment_url: "" + com.dockstarter.appvars._environment_validation: "http" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_443: "443" + com.dockstarter.appvars._port_80: "80" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/swag/swag.netmode.yml b/compose/.apps/swag/swag.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/swag/swag.netmode.yml +++ b/compose/.apps/swag/swag.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/swag/swag.ports.yml b/compose/.apps/swag/swag.ports.yml index b90d412fbb..120e3121a3 100644 --- a/compose/.apps/swag/swag.ports.yml +++ b/compose/.apps/swag/swag.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_443}:443 - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_443}:443 + - ${_PORT_80}:80 diff --git a/compose/.apps/swag/swag.x86_64.yml b/compose/.apps/swag/swag.x86_64.yml index d952604507..0d4b6949d4 100644 --- a/compose/.apps/swag/swag.x86_64.yml +++ b/compose/.apps/swag/swag.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/swag:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/swag:${_TAG} diff --git a/compose/.apps/swag/swag.yml b/compose/.apps/swag/swag.yml index eb75533f04..0cd6bb0a1c 100644 --- a/compose/.apps/swag/swag.yml +++ b/compose/.apps/swag/swag.yml @@ -1,21 +1,21 @@ services: - ${_appname_}: + : cap_add: - NET_ADMIN - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} environment: - - DNSPLUGIN=${${_APPNAME_}_ENVIRONMENT_DNSPLUGIN} - - EMAIL=${${_APPNAME_}_ENVIRONMENT_EMAIL} - - EXTRA_DOMAINS=${${_APPNAME_}_ENVIRONMENT_EXTRA_DOMAINS} - - ONLY_SUBDOMAINS=${${_APPNAME_}_ENVIRONMENT_ONLY_SUBDOMAINS} + - DNSPLUGIN=${_ENVIRONMENT_DNSPLUGIN} + - EMAIL=${_ENVIRONMENT_EMAIL} + - EXTRA_DOMAINS=${_ENVIRONMENT_EXTRA_DOMAINS} + - ONLY_SUBDOMAINS=${_ENVIRONMENT_ONLY_SUBDOMAINS} - PGID=${PGID} - PUID=${PUID} - - SUBDOMAINS=${${_APPNAME_}_ENVIRONMENT_SUBDOMAINS} + - SUBDOMAINS=${_ENVIRONMENT_SUBDOMAINS} - TZ=${TZ} - - URL=${${_APPNAME_}_ENVIRONMENT_URL} - - VALIDATION=${${_APPNAME_}_ENVIRONMENT_VALIDATION} - restart: ${${_APPNAME_}_RESTART} + - URL=${_ENVIRONMENT_URL} + - VALIDATION=${_ENVIRONMENT_VALIDATION} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/synclounge/synclounge.aarch64.yml b/compose/.apps/synclounge/synclounge.aarch64.yml index 911e142284..48f4dab2e9 100644 --- a/compose/.apps/synclounge/synclounge.aarch64.yml +++ b/compose/.apps/synclounge/synclounge.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/synclounge:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/synclounge:${_TAG} diff --git a/compose/.apps/synclounge/synclounge.hostname.yml b/compose/.apps/synclounge/synclounge.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/synclounge/synclounge.hostname.yml +++ b/compose/.apps/synclounge/synclounge.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/synclounge/synclounge.labels.yml b/compose/.apps/synclounge/synclounge.labels.yml index fc5190022c..ad0c1b6a8d 100644 --- a/compose/.apps/synclounge/synclounge.labels.yml +++ b/compose/.apps/synclounge/synclounge.labels.yml @@ -1,19 +1,19 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Watch Plex in sync with your friends/family, wherever you are." com.dockstarter.appinfo.nicename: "SyncLounge" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_auth_list: "" - com.dockstarter.appvars.${_appname_}_environment_autojoin_enable: "false" - com.dockstarter.appvars.${_appname_}_environment_autojoin_password: "" - com.dockstarter.appvars.${_appname_}_environment_autojoin_room: "" - com.dockstarter.appvars.${_appname_}_environment_external_server_port: "" - com.dockstarter.appvars.${_appname_}_environment_external_url: "" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8088: "8088" - com.dockstarter.appvars.${_appname_}_port_8089: "8089" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_auth_list: "" + com.dockstarter.appvars._environment_autojoin_enable: "false" + com.dockstarter.appvars._environment_autojoin_password: "" + com.dockstarter.appvars._environment_autojoin_room: "" + com.dockstarter.appvars._environment_external_server_port: "" + com.dockstarter.appvars._environment_external_url: "" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8088: "8088" + com.dockstarter.appvars._port_8089: "8089" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/synclounge/synclounge.netmode.yml b/compose/.apps/synclounge/synclounge.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/synclounge/synclounge.netmode.yml +++ b/compose/.apps/synclounge/synclounge.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/synclounge/synclounge.ports.yml b/compose/.apps/synclounge/synclounge.ports.yml index 0b68b0becd..9f12939192 100644 --- a/compose/.apps/synclounge/synclounge.ports.yml +++ b/compose/.apps/synclounge/synclounge.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8088}:8088 - - ${${_APPNAME_}_PORT_8089}:8089 + - ${_PORT_8088}:8088 + - ${_PORT_8089}:8089 diff --git a/compose/.apps/synclounge/synclounge.x86_64.yml b/compose/.apps/synclounge/synclounge.x86_64.yml index 911e142284..48f4dab2e9 100644 --- a/compose/.apps/synclounge/synclounge.x86_64.yml +++ b/compose/.apps/synclounge/synclounge.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/synclounge:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/synclounge:${_TAG} diff --git a/compose/.apps/synclounge/synclounge.yml b/compose/.apps/synclounge/synclounge.yml index 6dc522ae97..de7b42d995 100644 --- a/compose/.apps/synclounge/synclounge.yml +++ b/compose/.apps/synclounge/synclounge.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - AUTH_LIST=${${_APPNAME_}_ENVIRONMENT_AUTH_LIST} - - AUTOJOIN_ENABLED=${${_APPNAME_}_ENVIRONMENT_AUTOJOIN_ENABLE} - - AUTOJOIN_PASSWORD=${${_APPNAME_}_ENVIRONMENT_AUTOJOIN_PASSWORD} - - AUTOJOIN_ROOM=${${_APPNAME_}_ENVIRONMENT_AUTOJOIN_ROOM} - - EXTERNAL_SERVER_PORT=${${_APPNAME_}_ENVIRONMENT_EXTERNAL_SERVER_PORT} - - EXTERNAL_URL=${${_APPNAME_}_ENVIRONMENT_EXTERNAL_URL} + - AUTH_LIST=${_ENVIRONMENT_AUTH_LIST} + - AUTOJOIN_ENABLED=${_ENVIRONMENT_AUTOJOIN_ENABLE} + - AUTOJOIN_PASSWORD=${_ENVIRONMENT_AUTOJOIN_PASSWORD} + - AUTOJOIN_ROOM=${_ENVIRONMENT_AUTOJOIN_ROOM} + - EXTERNAL_SERVER_PORT=${_ENVIRONMENT_EXTERNAL_SERVER_PORT} + - EXTERNAL_URL=${_ENVIRONMENT_EXTERNAL_URL} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/syncthing/syncthing.aarch64.yml b/compose/.apps/syncthing/syncthing.aarch64.yml index 2e37f8d0dc..a0fcfe9f65 100644 --- a/compose/.apps/syncthing/syncthing.aarch64.yml +++ b/compose/.apps/syncthing/syncthing.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/syncthing:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/syncthing:${_TAG} diff --git a/compose/.apps/syncthing/syncthing.hostname.yml b/compose/.apps/syncthing/syncthing.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/syncthing/syncthing.hostname.yml +++ b/compose/.apps/syncthing/syncthing.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/syncthing/syncthing.labels.yml b/compose/.apps/syncthing/syncthing.labels.yml index 5697027028..d8c8f3cc8f 100644 --- a/compose/.apps/syncthing/syncthing.labels.yml +++ b/compose/.apps/syncthing/syncthing.labels.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Open-source peer-to-peer file synchronization" com.dockstarter.appinfo.nicename: "Syncthing" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_21027: "21027" - com.dockstarter.appvars.${_appname_}_port_22000: "22000" - com.dockstarter.appvars.${_appname_}_port_8384: "8384" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_sourcedir: "/mnt/syncthing" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_21027: "21027" + com.dockstarter.appvars._port_22000: "22000" + com.dockstarter.appvars._port_8384: "8384" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_sourcedir: "/mnt/syncthing" diff --git a/compose/.apps/syncthing/syncthing.netmode.yml b/compose/.apps/syncthing/syncthing.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/syncthing/syncthing.netmode.yml +++ b/compose/.apps/syncthing/syncthing.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/syncthing/syncthing.ports.yml b/compose/.apps/syncthing/syncthing.ports.yml index e13dc8e158..fe0f133bd9 100644 --- a/compose/.apps/syncthing/syncthing.ports.yml +++ b/compose/.apps/syncthing/syncthing.ports.yml @@ -1,6 +1,6 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_21027}:21027/udp - - ${${_APPNAME_}_PORT_22000}:22000 - - ${${_APPNAME_}_PORT_8384}:8384 + - ${_PORT_21027}:21027/udp + - ${_PORT_22000}:22000 + - ${_PORT_8384}:8384 diff --git a/compose/.apps/syncthing/syncthing.x86_64.yml b/compose/.apps/syncthing/syncthing.x86_64.yml index 2e37f8d0dc..a0fcfe9f65 100644 --- a/compose/.apps/syncthing/syncthing.x86_64.yml +++ b/compose/.apps/syncthing/syncthing.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/syncthing:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/syncthing:${_TAG} diff --git a/compose/.apps/syncthing/syncthing.yml b/compose/.apps/syncthing/syncthing.yml index 55fca4b8e4..3fcf40c409 100644 --- a/compose/.apps/syncthing/syncthing.yml +++ b/compose/.apps/syncthing/syncthing.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_SOURCEDIR}:/source + - ${_VOLUME_SOURCEDIR}:/source diff --git a/compose/.apps/tandoor/tandoor.aarch64.yml b/compose/.apps/tandoor/tandoor.aarch64.yml index 1af111ce1c..a73a476d0b 100644 --- a/compose/.apps/tandoor/tandoor.aarch64.yml +++ b/compose/.apps/tandoor/tandoor.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: docker.io/vabene1111/recipes:${${_APPNAME_}_TAG} + : + image: docker.io/vabene1111/recipes:${_TAG} diff --git a/compose/.apps/tandoor/tandoor.hostname.yml b/compose/.apps/tandoor/tandoor.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/tandoor/tandoor.hostname.yml +++ b/compose/.apps/tandoor/tandoor.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/tandoor/tandoor.labels.yml b/compose/.apps/tandoor/tandoor.labels.yml index 5dc3129518..36e47805ac 100644 --- a/compose/.apps/tandoor/tandoor.labels.yml +++ b/compose/.apps/tandoor/tandoor.labels.yml @@ -1,17 +1,17 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "The recipe manager that allows you to manage your ever growing collection of digital recipes." com.dockstarter.appinfo.nicename: "Tandoor" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_allowed_hosts: "*" - com.dockstarter.appvars.${_appname_}_environment_database_url: "sqlite://localhost/data/db.sqlite3" - com.dockstarter.appvars.${_appname_}_environment_debug: "0" - com.dockstarter.appvars.${_appname_}_environment_gunicorn_media: "1" - com.dockstarter.appvars.${_appname_}_environment_secret_key: "change_me" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8080: "8080" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_allowed_hosts: "*" + com.dockstarter.appvars._environment_database_url: "sqlite://localhost/data/db.sqlite3" + com.dockstarter.appvars._environment_debug: "0" + com.dockstarter.appvars._environment_gunicorn_media: "1" + com.dockstarter.appvars._environment_secret_key: "change_me" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8080: "8080" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/tandoor/tandoor.netmode.yml b/compose/.apps/tandoor/tandoor.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/tandoor/tandoor.netmode.yml +++ b/compose/.apps/tandoor/tandoor.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/tandoor/tandoor.ports.yml b/compose/.apps/tandoor/tandoor.ports.yml index 7d1c7e4455..f19f4867cd 100644 --- a/compose/.apps/tandoor/tandoor.ports.yml +++ b/compose/.apps/tandoor/tandoor.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8080}:8080 + - ${_PORT_8080}:8080 diff --git a/compose/.apps/tandoor/tandoor.x86_64.yml b/compose/.apps/tandoor/tandoor.x86_64.yml index 1af111ce1c..a73a476d0b 100644 --- a/compose/.apps/tandoor/tandoor.x86_64.yml +++ b/compose/.apps/tandoor/tandoor.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: docker.io/vabene1111/recipes:${${_APPNAME_}_TAG} + : + image: docker.io/vabene1111/recipes:${_TAG} diff --git a/compose/.apps/tandoor/tandoor.yml b/compose/.apps/tandoor/tandoor.yml index ea20085398..9b3243dc33 100644 --- a/compose/.apps/tandoor/tandoor.yml +++ b/compose/.apps/tandoor/tandoor.yml @@ -1,17 +1,17 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - ALLOWED_HOSTS=${${_APPNAME_}_ENVIRONMENT_ALLOWED_HOSTS} - - DATABASE_URL=${${_APPNAME_}_ENVIRONMENT_DATABASE_URL} - - DEBUG=${${_APPNAME_}_ENVIRONMENT_DEBUG} - - GUNICORN_MEDIA=${${_APPNAME_}_ENVIRONMENT_GUNICORN_MEDIA} - - SECRET_KEY=${${_APPNAME_}_ENVIRONMENT_SECRET_KEY} + - ALLOWED_HOSTS=${_ENVIRONMENT_ALLOWED_HOSTS} + - DATABASE_URL=${_ENVIRONMENT_DATABASE_URL} + - DEBUG=${_ENVIRONMENT_DEBUG} + - GUNICORN_MEDIA=${_ENVIRONMENT_GUNICORN_MEDIA} + - SECRET_KEY=${_ENVIRONMENT_SECRET_KEY} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/staticfiles:/opt/recipes/staticfiles - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/mediafiles:/opt/recipes/mediafiles - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/data:/opt/recipes/data + - ${DOCKER_VOLUME_CONFIG}//staticfiles:/opt/recipes/staticfiles + - ${DOCKER_VOLUME_CONFIG}//mediafiles:/opt/recipes/mediafiles + - ${DOCKER_VOLUME_CONFIG}//data:/opt/recipes/data - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/tautulli/tautulli.aarch64.yml b/compose/.apps/tautulli/tautulli.aarch64.yml index b94e3ad6f6..1a19de3f40 100644 --- a/compose/.apps/tautulli/tautulli.aarch64.yml +++ b/compose/.apps/tautulli/tautulli.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/tautulli:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/tautulli:${_TAG} diff --git a/compose/.apps/tautulli/tautulli.hostname.yml b/compose/.apps/tautulli/tautulli.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/tautulli/tautulli.hostname.yml +++ b/compose/.apps/tautulli/tautulli.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/tautulli/tautulli.labels.yml b/compose/.apps/tautulli/tautulli.labels.yml index c5d98c5741..d8a8349b3a 100644 --- a/compose/.apps/tautulli/tautulli.labels.yml +++ b/compose/.apps/tautulli/tautulli.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Monitoring and tracking tool for Plex Media Server" com.dockstarter.appinfo.nicename: "Tautulli" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8181: "8181" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8181: "8181" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/tautulli/tautulli.netmode.yml b/compose/.apps/tautulli/tautulli.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/tautulli/tautulli.netmode.yml +++ b/compose/.apps/tautulli/tautulli.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/tautulli/tautulli.ports.yml b/compose/.apps/tautulli/tautulli.ports.yml index be7c543d2e..c2eae44bc8 100644 --- a/compose/.apps/tautulli/tautulli.ports.yml +++ b/compose/.apps/tautulli/tautulli.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8181}:8181 + - ${_PORT_8181}:8181 diff --git a/compose/.apps/tautulli/tautulli.x86_64.yml b/compose/.apps/tautulli/tautulli.x86_64.yml index b94e3ad6f6..1a19de3f40 100644 --- a/compose/.apps/tautulli/tautulli.x86_64.yml +++ b/compose/.apps/tautulli/tautulli.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/tautulli:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/tautulli:${_TAG} diff --git a/compose/.apps/tautulli/tautulli.yml b/compose/.apps/tautulli/tautulli.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/tautulli/tautulli.yml +++ b/compose/.apps/tautulli/tautulli.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/tdarr/tdarr.hostname.yml b/compose/.apps/tdarr/tdarr.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/tdarr/tdarr.hostname.yml +++ b/compose/.apps/tdarr/tdarr.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/tdarr/tdarr.labels.yml b/compose/.apps/tdarr/tdarr.labels.yml index 393a143a7c..bb68511416 100644 --- a/compose/.apps/tdarr/tdarr.labels.yml +++ b/compose/.apps/tdarr/tdarr.labels.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Audio/Video Library Analytics & Transcode/Remux Automation" com.dockstarter.appinfo.nicename: "Tdarr" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_serverip: "tdarr" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8265: "8265" - com.dockstarter.appvars.${_appname_}_port_8266: "8266" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_transcode_cache: "~/.config/appdata/tdarr/cache" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_serverip: "tdarr" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8265: "8265" + com.dockstarter.appvars._port_8266: "8266" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_transcode_cache: "~/.config/appdata/tdarr/cache" diff --git a/compose/.apps/tdarr/tdarr.netmode.yml b/compose/.apps/tdarr/tdarr.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/tdarr/tdarr.netmode.yml +++ b/compose/.apps/tdarr/tdarr.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/tdarr/tdarr.ports.yml b/compose/.apps/tdarr/tdarr.ports.yml index 3478a939d5..80e0fe6805 100644 --- a/compose/.apps/tdarr/tdarr.ports.yml +++ b/compose/.apps/tdarr/tdarr.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8265}:8265 - - ${${_APPNAME_}_PORT_8266}:8266 + - ${_PORT_8265}:8265 + - ${_PORT_8266}:8266 diff --git a/compose/.apps/tdarr/tdarr.x86_64.yml b/compose/.apps/tdarr/tdarr.x86_64.yml index a09addd8cb..de8aa0199c 100644 --- a/compose/.apps/tdarr/tdarr.x86_64.yml +++ b/compose/.apps/tdarr/tdarr.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: haveagitgat/tdarr:${${_APPNAME_}_TAG} + : + image: haveagitgat/tdarr:${_TAG} diff --git a/compose/.apps/tdarr/tdarr.yml b/compose/.apps/tdarr/tdarr.yml index fbe46a3394..0467d34fb5 100644 --- a/compose/.apps/tdarr/tdarr.yml +++ b/compose/.apps/tdarr/tdarr.yml @@ -1,16 +1,16 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - - serverIP=${${_APPNAME_}_ENVIRONMENT_SERVERIP} - - serverPort=${${_APPNAME_}_PORT_8266} + - serverIP=${_ENVIRONMENT_SERVERIP} + - serverPort=${_PORT_8266} - TZ=${TZ} - - webUIPort=${${_APPNAME_}_PORT_8265} - restart: ${${_APPNAME_}_RESTART} + - webUIPort=${_PORT_8265} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/app/server + - ${DOCKER_VOLUME_CONFIG}/:/app/server - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_TRANSCODE_CACHE}:/temp + - ${_VOLUME_TRANSCODE_CACHE}:/temp diff --git a/compose/.apps/tdarrnode/tdarrnode.hostname.yml b/compose/.apps/tdarrnode/tdarrnode.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/tdarrnode/tdarrnode.hostname.yml +++ b/compose/.apps/tdarrnode/tdarrnode.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/tdarrnode/tdarrnode.labels.yml b/compose/.apps/tdarrnode/tdarrnode.labels.yml index 230c557b66..c5097a06da 100644 --- a/compose/.apps/tdarrnode/tdarrnode.labels.yml +++ b/compose/.apps/tdarrnode/tdarrnode.labels.yml @@ -1,17 +1,17 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Tdarr Node is a self hosted module used for encoding in conjunction with Tdarr" com.dockstarter.appinfo.nicename: "TdarrNode" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_nodeid: "TdarrNode" - com.dockstarter.appvars.${_appname_}_environment_nodeip: "tdarrnode" - com.dockstarter.appvars.${_appname_}_environment_serverip: "tdarr" - com.dockstarter.appvars.${_appname_}_environment_serverport: "8266" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8267: "8267" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_transcode_cache: "~/.config/appdata/tdarrnode/cache" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_nodeid: "TdarrNode" + com.dockstarter.appvars._environment_nodeip: "tdarrnode" + com.dockstarter.appvars._environment_serverip: "tdarr" + com.dockstarter.appvars._environment_serverport: "8266" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8267: "8267" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_transcode_cache: "~/.config/appdata/tdarrnode/cache" diff --git a/compose/.apps/tdarrnode/tdarrnode.netmode.yml b/compose/.apps/tdarrnode/tdarrnode.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/tdarrnode/tdarrnode.netmode.yml +++ b/compose/.apps/tdarrnode/tdarrnode.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/tdarrnode/tdarrnode.ports.yml b/compose/.apps/tdarrnode/tdarrnode.ports.yml index 305884ef5d..2199c7fb9a 100644 --- a/compose/.apps/tdarrnode/tdarrnode.ports.yml +++ b/compose/.apps/tdarrnode/tdarrnode.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8267}:8267 + - ${_PORT_8267}:8267 diff --git a/compose/.apps/tdarrnode/tdarrnode.x86_64.yml b/compose/.apps/tdarrnode/tdarrnode.x86_64.yml index ea012670da..9cb4e851c1 100644 --- a/compose/.apps/tdarrnode/tdarrnode.x86_64.yml +++ b/compose/.apps/tdarrnode/tdarrnode.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: haveagitgat/tdarr_node:${${_APPNAME_}_TAG} + : + image: haveagitgat/tdarr_node:${_TAG} diff --git a/compose/.apps/tdarrnode/tdarrnode.yml b/compose/.apps/tdarrnode/tdarrnode.yml index 15bb656dd0..2e53424dcc 100644 --- a/compose/.apps/tdarrnode/tdarrnode.yml +++ b/compose/.apps/tdarrnode/tdarrnode.yml @@ -1,17 +1,17 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - nodeID=${${_APPNAME_}_ENVIRONMENT_NODEID} - - nodeIP=${${_APPNAME_}_ENVIRONMENT_NODEIP} - - nodePort=${${_APPNAME_}_PORT_8267} + - nodeID=${_ENVIRONMENT_NODEID} + - nodeIP=${_ENVIRONMENT_NODEIP} + - nodePort=${_PORT_8267} - PGID=${PGID} - PUID=${PUID} - - serverIP=${${_APPNAME_}_ENVIRONMENT_SERVERIP} - - serverPort=${${_APPNAME_}_ENVIRONMENT_SERVERPORT} + - serverIP=${_ENVIRONMENT_SERVERIP} + - serverPort=${_ENVIRONMENT_SERVERPORT} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_TRANSCODE_CACHE}:/temp + - ${_VOLUME_TRANSCODE_CACHE}:/temp diff --git a/compose/.apps/telegraf/telegraf.aarch64.yml b/compose/.apps/telegraf/telegraf.aarch64.yml index 2ecdeea43e..087a024734 100644 --- a/compose/.apps/telegraf/telegraf.aarch64.yml +++ b/compose/.apps/telegraf/telegraf.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: telegraf:${${_APPNAME_}_TAG} + : + image: telegraf:${_TAG} diff --git a/compose/.apps/telegraf/telegraf.hostname.yml b/compose/.apps/telegraf/telegraf.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/telegraf/telegraf.hostname.yml +++ b/compose/.apps/telegraf/telegraf.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/telegraf/telegraf.labels.yml b/compose/.apps/telegraf/telegraf.labels.yml index b0a82996e2..98f4fbd360 100644 --- a/compose/.apps/telegraf/telegraf.labels.yml +++ b/compose/.apps/telegraf/telegraf.labels.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Agent for collecting metrics and writing them to InfluxDB" com.dockstarter.appinfo.nicename: "Telegraf" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8092: "8092" - com.dockstarter.appvars.${_appname_}_port_8094: "8094" - com.dockstarter.appvars.${_appname_}_port_8125: "8125" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8092: "8092" + com.dockstarter.appvars._port_8094: "8094" + com.dockstarter.appvars._port_8125: "8125" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/telegraf/telegraf.netmode.yml b/compose/.apps/telegraf/telegraf.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/telegraf/telegraf.netmode.yml +++ b/compose/.apps/telegraf/telegraf.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/telegraf/telegraf.ports.yml b/compose/.apps/telegraf/telegraf.ports.yml index c5463cf690..f1d4105e89 100644 --- a/compose/.apps/telegraf/telegraf.ports.yml +++ b/compose/.apps/telegraf/telegraf.ports.yml @@ -1,6 +1,6 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8092}:8092/udp - - ${${_APPNAME_}_PORT_8094}:8094 - - ${${_APPNAME_}_PORT_8125}:8125 + - ${_PORT_8092}:8092/udp + - ${_PORT_8094}:8094 + - ${_PORT_8125}:8125 diff --git a/compose/.apps/telegraf/telegraf.x86_64.yml b/compose/.apps/telegraf/telegraf.x86_64.yml index 2ecdeea43e..087a024734 100644 --- a/compose/.apps/telegraf/telegraf.x86_64.yml +++ b/compose/.apps/telegraf/telegraf.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: telegraf:${${_APPNAME_}_TAG} + : + image: telegraf:${_TAG} diff --git a/compose/.apps/telegraf/telegraf.yml b/compose/.apps/telegraf/telegraf.yml index 41f3af8696..39cf751c9e 100644 --- a/compose/.apps/telegraf/telegraf.yml +++ b/compose/.apps/telegraf/telegraf.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - HOST_ETC=/host/etc - HOST_MOUNT_PREFIX=/host - HOST_PROC=/host/proc - HOST_SYS=/host/sys - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /:/host:ro - /etc:/host/etc:ro @@ -15,6 +15,6 @@ services: - /proc:/host/proc:ro - /sys:/host/sys:ro - /var/run/utmp:/var/run/utmp:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/var/lib/telegraf + - ${DOCKER_VOLUME_CONFIG}/:/var/lib/telegraf - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock:ro + - ${_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock:ro diff --git a/compose/.apps/thelounge/thelounge.aarch64.yml b/compose/.apps/thelounge/thelounge.aarch64.yml index a791eee83b..160eb39219 100644 --- a/compose/.apps/thelounge/thelounge.aarch64.yml +++ b/compose/.apps/thelounge/thelounge.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/thelounge:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/thelounge:${_TAG} diff --git a/compose/.apps/thelounge/thelounge.hostname.yml b/compose/.apps/thelounge/thelounge.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/thelounge/thelounge.hostname.yml +++ b/compose/.apps/thelounge/thelounge.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/thelounge/thelounge.labels.yml b/compose/.apps/thelounge/thelounge.labels.yml index a60aaa429e..c92ed9f58a 100644 --- a/compose/.apps/thelounge/thelounge.labels.yml +++ b/compose/.apps/thelounge/thelounge.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Web IRC client that you host on your own server" com.dockstarter.appinfo.nicename: "TheLounge" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_9000: "9000" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_9000: "9000" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/thelounge/thelounge.netmode.yml b/compose/.apps/thelounge/thelounge.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/thelounge/thelounge.netmode.yml +++ b/compose/.apps/thelounge/thelounge.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/thelounge/thelounge.ports.yml b/compose/.apps/thelounge/thelounge.ports.yml index f725dec1dd..dfec7772e1 100644 --- a/compose/.apps/thelounge/thelounge.ports.yml +++ b/compose/.apps/thelounge/thelounge.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_9000}:9000 + - ${_PORT_9000}:9000 diff --git a/compose/.apps/thelounge/thelounge.x86_64.yml b/compose/.apps/thelounge/thelounge.x86_64.yml index a791eee83b..160eb39219 100644 --- a/compose/.apps/thelounge/thelounge.x86_64.yml +++ b/compose/.apps/thelounge/thelounge.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/thelounge:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/thelounge:${_TAG} diff --git a/compose/.apps/thelounge/thelounge.yml b/compose/.apps/thelounge/thelounge.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/thelounge/thelounge.yml +++ b/compose/.apps/thelounge/thelounge.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/timemachine/timemachine.aarch64.yml b/compose/.apps/timemachine/timemachine.aarch64.yml index 63de613252..7438b5fb23 100644 --- a/compose/.apps/timemachine/timemachine.aarch64.yml +++ b/compose/.apps/timemachine/timemachine.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: mbentley/timemachine:${${_APPNAME_}_TAG} + : + image: mbentley/timemachine:${_TAG} diff --git a/compose/.apps/timemachine/timemachine.hostname.yml b/compose/.apps/timemachine/timemachine.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/timemachine/timemachine.hostname.yml +++ b/compose/.apps/timemachine/timemachine.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/timemachine/timemachine.labels.yml b/compose/.apps/timemachine/timemachine.labels.yml index b61875ca64..0250945e15 100644 --- a/compose/.apps/timemachine/timemachine.labels.yml +++ b/compose/.apps/timemachine/timemachine.labels.yml @@ -1,34 +1,34 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Docker image to run Samba to provide a compatible Time Machine for macOS" com.dockstarter.appinfo.nicename: "TimeMachine" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_custom_smb_conf: "false" - com.dockstarter.appvars.${_appname_}_environment_custom_user: "false" - com.dockstarter.appvars.${_appname_}_environment_debug_level: "1" - com.dockstarter.appvars.${_appname_}_environment_external_conf: "" - com.dockstarter.appvars.${_appname_}_environment_hide_shares: "no" - com.dockstarter.appvars.${_appname_}_environment_mimic_model: "TimeCapsule8,119" - com.dockstarter.appvars.${_appname_}_environment_password: "timemachine" - com.dockstarter.appvars.${_appname_}_environment_set_permissions: "false" - com.dockstarter.appvars.${_appname_}_environment_share_name: "TimeMachine" - com.dockstarter.appvars.${_appname_}_environment_smb_inherit_permissions: "no" - com.dockstarter.appvars.${_appname_}_environment_smb_metadata: "stream" - com.dockstarter.appvars.${_appname_}_environment_smb_nfs_aces: "yes" - com.dockstarter.appvars.${_appname_}_environment_smb_port: "445" - com.dockstarter.appvars.${_appname_}_environment_smb_vfs_objects: "acl_xattr fruit streams_xattr" - com.dockstarter.appvars.${_appname_}_environment_tm_groupname: "timemachine" - com.dockstarter.appvars.${_appname_}_environment_tm_username: "timemachine" - com.dockstarter.appvars.${_appname_}_environment_vol_size_limit: "0" - com.dockstarter.appvars.${_appname_}_environment_workgroup: "WORKGROUP" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_137: "137" - com.dockstarter.appvars.${_appname_}_port_138: "138" - com.dockstarter.appvars.${_appname_}_port_139: "139" - com.dockstarter.appvars.${_appname_}_port_445: "445" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_datadir: "/opt/timemachine" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_custom_smb_conf: "false" + com.dockstarter.appvars._environment_custom_user: "false" + com.dockstarter.appvars._environment_debug_level: "1" + com.dockstarter.appvars._environment_external_conf: "" + com.dockstarter.appvars._environment_hide_shares: "no" + com.dockstarter.appvars._environment_mimic_model: "TimeCapsule8,119" + com.dockstarter.appvars._environment_password: "timemachine" + com.dockstarter.appvars._environment_set_permissions: "false" + com.dockstarter.appvars._environment_share_name: "TimeMachine" + com.dockstarter.appvars._environment_smb_inherit_permissions: "no" + com.dockstarter.appvars._environment_smb_metadata: "stream" + com.dockstarter.appvars._environment_smb_nfs_aces: "yes" + com.dockstarter.appvars._environment_smb_port: "445" + com.dockstarter.appvars._environment_smb_vfs_objects: "acl_xattr fruit streams_xattr" + com.dockstarter.appvars._environment_tm_groupname: "timemachine" + com.dockstarter.appvars._environment_tm_username: "timemachine" + com.dockstarter.appvars._environment_vol_size_limit: "0" + com.dockstarter.appvars._environment_workgroup: "WORKGROUP" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_137: "137" + com.dockstarter.appvars._port_138: "138" + com.dockstarter.appvars._port_139: "139" + com.dockstarter.appvars._port_445: "445" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_datadir: "/opt/timemachine" diff --git a/compose/.apps/timemachine/timemachine.netmode.yml b/compose/.apps/timemachine/timemachine.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/timemachine/timemachine.netmode.yml +++ b/compose/.apps/timemachine/timemachine.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/timemachine/timemachine.ports.yml b/compose/.apps/timemachine/timemachine.ports.yml index 5545e23a22..1cc851f85d 100644 --- a/compose/.apps/timemachine/timemachine.ports.yml +++ b/compose/.apps/timemachine/timemachine.ports.yml @@ -1,7 +1,7 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_137}:137/udp - - ${${_APPNAME_}_PORT_138}:138/udp - - ${${_APPNAME_}_PORT_139}:139 - - ${${_APPNAME_}_PORT_445}:445 + - ${_PORT_137}:137/udp + - ${_PORT_138}:138/udp + - ${_PORT_139}:139 + - ${_PORT_445}:445 diff --git a/compose/.apps/timemachine/timemachine.x86_64.yml b/compose/.apps/timemachine/timemachine.x86_64.yml index 63de613252..7438b5fb23 100644 --- a/compose/.apps/timemachine/timemachine.x86_64.yml +++ b/compose/.apps/timemachine/timemachine.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: mbentley/timemachine:${${_APPNAME_}_TAG} + : + image: mbentley/timemachine:${_TAG} diff --git a/compose/.apps/timemachine/timemachine.yml b/compose/.apps/timemachine/timemachine.yml index f1eb6a9aca..472ebec8d5 100644 --- a/compose/.apps/timemachine/timemachine.yml +++ b/compose/.apps/timemachine/timemachine.yml @@ -1,33 +1,33 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - CUSTOM_SMB_CONF=${${_APPNAME_}_ENVIRONMENT_CUSTOM_SMB_CONF} - - CUSTOM_USER=${${_APPNAME_}_ENVIRONMENT_CUSTOM_USER} - - DEBUG_LEVEL=${${_APPNAME_}_ENVIRONMENT_DEBUG_LEVEL} - - EXTERNAL_CONF=${${_APPNAME_}_ENVIRONMENT_EXTERNAL_CONF} - - HIDE_SHARES=${${_APPNAME_}_ENVIRONMENT_HIDE_SHARES} - - MIMIC_MODEL=${${_APPNAME_}_ENVIRONMENT_MIMIC_MODEL} - - PASSWORD=${${_APPNAME_}_ENVIRONMENT_PASSWORD} + - CUSTOM_SMB_CONF=${_ENVIRONMENT_CUSTOM_SMB_CONF} + - CUSTOM_USER=${_ENVIRONMENT_CUSTOM_USER} + - DEBUG_LEVEL=${_ENVIRONMENT_DEBUG_LEVEL} + - EXTERNAL_CONF=${_ENVIRONMENT_EXTERNAL_CONF} + - HIDE_SHARES=${_ENVIRONMENT_HIDE_SHARES} + - MIMIC_MODEL=${_ENVIRONMENT_MIMIC_MODEL} + - PASSWORD=${_ENVIRONMENT_PASSWORD} - PGID=${PGID} - PUID=${PUID} - - SET_PERMISSIONS=${${_APPNAME_}_ENVIRONMENT_SET_PERMISSIONS} - - SHARE_NAME=${${_APPNAME_}_ENVIRONMENT_SHARE_NAME} - - SMB_INHERIT_PERMISSIONS=${${_APPNAME_}_ENVIRONMENT_SMB_INHERIT_PERMISSIONS} - - SMB_METADATA=${${_APPNAME_}_ENVIRONMENT_SMB_METADATA} - - SMB_NFS_ACES=${${_APPNAME_}_ENVIRONMENT_SMB_NFS_ACES} - - SMB_PORT=${${_APPNAME_}_ENVIRONMENT_SMB_PORT} - - SMB_VFS_OBJECTS=${${_APPNAME_}_ENVIRONMENT_SMB_VFS_OBJECTS} - - TM_GROUPNAME=${${_APPNAME_}_ENVIRONMENT_TM_GROUPNAME} - - TM_USERNAME=${${_APPNAME_}_ENVIRONMENT_TM_USERNAME} + - SET_PERMISSIONS=${_ENVIRONMENT_SET_PERMISSIONS} + - SHARE_NAME=${_ENVIRONMENT_SHARE_NAME} + - SMB_INHERIT_PERMISSIONS=${_ENVIRONMENT_SMB_INHERIT_PERMISSIONS} + - SMB_METADATA=${_ENVIRONMENT_SMB_METADATA} + - SMB_NFS_ACES=${_ENVIRONMENT_SMB_NFS_ACES} + - SMB_PORT=${_ENVIRONMENT_SMB_PORT} + - SMB_VFS_OBJECTS=${_ENVIRONMENT_SMB_VFS_OBJECTS} + - TM_GROUPNAME=${_ENVIRONMENT_TM_GROUPNAME} + - TM_USERNAME=${_ENVIRONMENT_TM_USERNAME} - TZ=${TZ} - - VOLUME_SIZE_LIMIT=${${_APPNAME_}_ENVIRONMENT_VOL_SIZE_LIMIT} - - WORKGROUP=${${_APPNAME_}_ENVIRONMENT_WORKGROUP} - restart: ${${_APPNAME_}_RESTART} + - VOLUME_SIZE_LIMIT=${_ENVIRONMENT_VOL_SIZE_LIMIT} + - WORKGROUP=${_ENVIRONMENT_WORKGROUP} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/var-lib-samba:/var/lib/samba - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/var-cache-samba:/var/cache/samba - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/run-samba:/run/samba + - ${DOCKER_VOLUME_CONFIG}//var-lib-samba:/var/lib/samba + - ${DOCKER_VOLUME_CONFIG}//var-cache-samba:/var/cache/samba + - ${DOCKER_VOLUME_CONFIG}//run-samba:/run/samba - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_DATADIR}:/opt/timemachine + - ${_VOLUME_DATADIR}:/opt/timemachine diff --git a/compose/.apps/traefik/traefik.aarch64.yml b/compose/.apps/traefik/traefik.aarch64.yml index a59e4e01dc..81b68e944f 100644 --- a/compose/.apps/traefik/traefik.aarch64.yml +++ b/compose/.apps/traefik/traefik.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: traefik:${${_APPNAME_}_TAG} + : + image: traefik:${_TAG} diff --git a/compose/.apps/traefik/traefik.hostname.yml b/compose/.apps/traefik/traefik.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/traefik/traefik.hostname.yml +++ b/compose/.apps/traefik/traefik.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/traefik/traefik.labels.yml b/compose/.apps/traefik/traefik.labels.yml index f29ba51a3d..35908c9343 100644 --- a/compose/.apps/traefik/traefik.labels.yml +++ b/compose/.apps/traefik/traefik.labels.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A modern HTTP reverse proxy and load balancer that makes deploying microservices easy" com.dockstarter.appinfo.nicename: "Traefik" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_443: "443" - com.dockstarter.appvars.${_appname_}_port_80: "80" - com.dockstarter.appvars.${_appname_}_port_8080: "8080" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_443: "443" + com.dockstarter.appvars._port_80: "80" + com.dockstarter.appvars._port_8080: "8080" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/traefik/traefik.netmode.yml b/compose/.apps/traefik/traefik.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/traefik/traefik.netmode.yml +++ b/compose/.apps/traefik/traefik.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/traefik/traefik.ports.yml b/compose/.apps/traefik/traefik.ports.yml index 17baad09d6..74052ce964 100644 --- a/compose/.apps/traefik/traefik.ports.yml +++ b/compose/.apps/traefik/traefik.ports.yml @@ -1,6 +1,6 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_443}:443 - - ${${_APPNAME_}_PORT_8080}:8080 - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_443}:443 + - ${_PORT_8080}:8080 + - ${_PORT_80}:80 diff --git a/compose/.apps/traefik/traefik.x86_64.yml b/compose/.apps/traefik/traefik.x86_64.yml index a59e4e01dc..81b68e944f 100644 --- a/compose/.apps/traefik/traefik.x86_64.yml +++ b/compose/.apps/traefik/traefik.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: traefik:${${_APPNAME_}_TAG} + : + image: traefik:${_TAG} diff --git a/compose/.apps/traefik/traefik.yml b/compose/.apps/traefik/traefik.yml index 1eedc37267..313e5e9fee 100644 --- a/compose/.apps/traefik/traefik.yml +++ b/compose/.apps/traefik/traefik.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/etc/traefik + - ${DOCKER_VOLUME_CONFIG}/:/etc/traefik - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock:ro + - ${_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock:ro diff --git a/compose/.apps/traktarr/traktarr.aarch64.yml b/compose/.apps/traktarr/traktarr.aarch64.yml index 9ed8cd7639..1530266e23 100644 --- a/compose/.apps/traktarr/traktarr.aarch64.yml +++ b/compose/.apps/traktarr/traktarr.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: eafxx/traktarr:${${_APPNAME_}_TAG} + : + image: eafxx/traktarr:${_TAG} diff --git a/compose/.apps/traktarr/traktarr.hostname.yml b/compose/.apps/traktarr/traktarr.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/traktarr/traktarr.hostname.yml +++ b/compose/.apps/traktarr/traktarr.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/traktarr/traktarr.labels.yml b/compose/.apps/traktarr/traktarr.labels.yml index 1372b20c08..71cc1e0d00 100644 --- a/compose/.apps/traktarr/traktarr.labels.yml +++ b/compose/.apps/traktarr/traktarr.labels.yml @@ -1,11 +1,11 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Traktarr uses Trakt.tv to find shows and movies to add in to Sonarr and Radarr, respectively." com.dockstarter.appinfo.nicename: "Traktarr" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/traktarr/traktarr.netmode.yml b/compose/.apps/traktarr/traktarr.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/traktarr/traktarr.netmode.yml +++ b/compose/.apps/traktarr/traktarr.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/traktarr/traktarr.x86_64.yml b/compose/.apps/traktarr/traktarr.x86_64.yml index 9ed8cd7639..1530266e23 100644 --- a/compose/.apps/traktarr/traktarr.x86_64.yml +++ b/compose/.apps/traktarr/traktarr.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: eafxx/traktarr:${${_APPNAME_}_TAG} + : + image: eafxx/traktarr:${_TAG} diff --git a/compose/.apps/traktarr/traktarr.yml b/compose/.apps/traktarr/traktarr.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/traktarr/traktarr.yml +++ b/compose/.apps/traktarr/traktarr.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/transmission/transmission.aarch64.yml b/compose/.apps/transmission/transmission.aarch64.yml index f5c5d0abdd..51c3fd3580 100644 --- a/compose/.apps/transmission/transmission.aarch64.yml +++ b/compose/.apps/transmission/transmission.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/transmission:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/transmission:${_TAG} diff --git a/compose/.apps/transmission/transmission.hostname.yml b/compose/.apps/transmission/transmission.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/transmission/transmission.hostname.yml +++ b/compose/.apps/transmission/transmission.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/transmission/transmission.labels.yml b/compose/.apps/transmission/transmission.labels.yml index f122cc9145..dfc9aa7ae5 100644 --- a/compose/.apps/transmission/transmission.labels.yml +++ b/compose/.apps/transmission/transmission.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Fast, easy, and free BitTorrent client" com.dockstarter.appinfo.nicename: "Transmission" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_51413: "51413" - com.dockstarter.appvars.${_appname_}_port_6881: "6881" - com.dockstarter.appvars.${_appname_}_port_9091: "9091" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_51413: "51413" + com.dockstarter.appvars._port_6881: "6881" + com.dockstarter.appvars._port_9091: "9091" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/transmission/transmission.netmode.yml b/compose/.apps/transmission/transmission.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/transmission/transmission.netmode.yml +++ b/compose/.apps/transmission/transmission.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/transmission/transmission.ports.yml b/compose/.apps/transmission/transmission.ports.yml index b83fd425d4..477d278e9a 100644 --- a/compose/.apps/transmission/transmission.ports.yml +++ b/compose/.apps/transmission/transmission.ports.yml @@ -1,8 +1,8 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_51413}:51413 - - ${${_APPNAME_}_PORT_51413}:51413/udp - - ${${_APPNAME_}_PORT_6881}:6881 - - ${${_APPNAME_}_PORT_6881}:6881/udp - - ${${_APPNAME_}_PORT_9091}:9091 + - ${_PORT_51413}:51413 + - ${_PORT_51413}:51413/udp + - ${_PORT_6881}:6881 + - ${_PORT_6881}:6881/udp + - ${_PORT_9091}:9091 diff --git a/compose/.apps/transmission/transmission.x86_64.yml b/compose/.apps/transmission/transmission.x86_64.yml index f5c5d0abdd..51c3fd3580 100644 --- a/compose/.apps/transmission/transmission.x86_64.yml +++ b/compose/.apps/transmission/transmission.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/transmission:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/transmission:${_TAG} diff --git a/compose/.apps/transmission/transmission.yml b/compose/.apps/transmission/transmission.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/transmission/transmission.yml +++ b/compose/.apps/transmission/transmission.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/transmissionvpn/transmissionvpn.aarch64.yml b/compose/.apps/transmissionvpn/transmissionvpn.aarch64.yml index 89df27282b..d325514351 100644 --- a/compose/.apps/transmissionvpn/transmissionvpn.aarch64.yml +++ b/compose/.apps/transmissionvpn/transmissionvpn.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: haugene/transmission-openvpn:${${_APPNAME_}_TAG} + : + image: haugene/transmission-openvpn:${_TAG} diff --git a/compose/.apps/transmissionvpn/transmissionvpn.hostname.yml b/compose/.apps/transmissionvpn/transmissionvpn.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/transmissionvpn/transmissionvpn.hostname.yml +++ b/compose/.apps/transmissionvpn/transmissionvpn.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/transmissionvpn/transmissionvpn.labels.yml b/compose/.apps/transmissionvpn/transmissionvpn.labels.yml index f64fbdc8e8..3954df2493 100644 --- a/compose/.apps/transmissionvpn/transmissionvpn.labels.yml +++ b/compose/.apps/transmissionvpn/transmissionvpn.labels.yml @@ -1,20 +1,20 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Transmission with OpenVPN" com.dockstarter.appinfo.nicename: "TransmissionVPN" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_download_dir: "/storage/downloads/completed" - com.dockstarter.appvars.${_appname_}_environment_home: "/config" - com.dockstarter.appvars.${_appname_}_environment_incomplete_dir: "/storage/downloads/incomplete" - com.dockstarter.appvars.${_appname_}_environment_local_network: "192.168.x.x/24" - com.dockstarter.appvars.${_appname_}_environment_openvpn_password: "your-vpn-pass" - com.dockstarter.appvars.${_appname_}_environment_openvpn_provider: "custom" - com.dockstarter.appvars.${_appname_}_environment_openvpn_username: "your-vpn-user" - com.dockstarter.appvars.${_appname_}_environment_watch_dir: "/storage/downloads/watch" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_9091: "9091" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_download_dir: "/storage/downloads/completed" + com.dockstarter.appvars._environment_home: "/config" + com.dockstarter.appvars._environment_incomplete_dir: "/storage/downloads/incomplete" + com.dockstarter.appvars._environment_local_network: "192.168.x.x/24" + com.dockstarter.appvars._environment_openvpn_password: "your-vpn-pass" + com.dockstarter.appvars._environment_openvpn_provider: "custom" + com.dockstarter.appvars._environment_openvpn_username: "your-vpn-user" + com.dockstarter.appvars._environment_watch_dir: "/storage/downloads/watch" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_9091: "9091" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/transmissionvpn/transmissionvpn.netmode.yml b/compose/.apps/transmissionvpn/transmissionvpn.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/transmissionvpn/transmissionvpn.netmode.yml +++ b/compose/.apps/transmissionvpn/transmissionvpn.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/transmissionvpn/transmissionvpn.ports.yml b/compose/.apps/transmissionvpn/transmissionvpn.ports.yml index 49f5572e80..140ccb5161 100644 --- a/compose/.apps/transmissionvpn/transmissionvpn.ports.yml +++ b/compose/.apps/transmissionvpn/transmissionvpn.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_9091}:9091 + - ${_PORT_9091}:9091 diff --git a/compose/.apps/transmissionvpn/transmissionvpn.x86_64.yml b/compose/.apps/transmissionvpn/transmissionvpn.x86_64.yml index 89df27282b..d325514351 100644 --- a/compose/.apps/transmissionvpn/transmissionvpn.x86_64.yml +++ b/compose/.apps/transmissionvpn/transmissionvpn.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: haugene/transmission-openvpn:${${_APPNAME_}_TAG} + : + image: haugene/transmission-openvpn:${_TAG} diff --git a/compose/.apps/transmissionvpn/transmissionvpn.yml b/compose/.apps/transmissionvpn/transmissionvpn.yml index 550b4fa210..9004467459 100644 --- a/compose/.apps/transmissionvpn/transmissionvpn.yml +++ b/compose/.apps/transmissionvpn/transmissionvpn.yml @@ -1,22 +1,22 @@ services: - ${_appname_}: + : cap_add: - NET_ADMIN - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} environment: - - LOCAL_NETWORK=${${_APPNAME_}_ENVIRONMENT_LOCAL_NETWORK} - - OPENVPN_PASSWORD=${${_APPNAME_}_ENVIRONMENT_OPENVPN_PASSWORD} - - OPENVPN_PROVIDER=${${_APPNAME_}_ENVIRONMENT_OPENVPN_PROVIDER} - - OPENVPN_USERNAME=${${_APPNAME_}_ENVIRONMENT_OPENVPN_USERNAME} + - LOCAL_NETWORK=${_ENVIRONMENT_LOCAL_NETWORK} + - OPENVPN_PASSWORD=${_ENVIRONMENT_OPENVPN_PASSWORD} + - OPENVPN_PROVIDER=${_ENVIRONMENT_OPENVPN_PROVIDER} + - OPENVPN_USERNAME=${_ENVIRONMENT_OPENVPN_USERNAME} - PGID=${PGID} - PUID=${PUID} - - TRANSMISSION_DOWNLOAD_DIR=${${_APPNAME_}_ENVIRONMENT_DOWNLOAD_DIR} - - TRANSMISSION_HOME=${${_APPNAME_}_ENVIRONMENT_HOME} - - TRANSMISSION_INCOMPLETE_DIR=${${_APPNAME_}_ENVIRONMENT_INCOMPLETE_DIR} - - TRANSMISSION_WATCH_DIR=${${_APPNAME_}_ENVIRONMENT_WATCH_DIR} + - TRANSMISSION_DOWNLOAD_DIR=${_ENVIRONMENT_DOWNLOAD_DIR} + - TRANSMISSION_HOME=${_ENVIRONMENT_HOME} + - TRANSMISSION_INCOMPLETE_DIR=${_ENVIRONMENT_INCOMPLETE_DIR} + - TRANSMISSION_WATCH_DIR=${_ENVIRONMENT_WATCH_DIR} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/tvheadend/tvheadend.aarch64.yml b/compose/.apps/tvheadend/tvheadend.aarch64.yml index 5286bcf5d7..ed3c52d617 100644 --- a/compose/.apps/tvheadend/tvheadend.aarch64.yml +++ b/compose/.apps/tvheadend/tvheadend.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/tvheadend:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/tvheadend:${_TAG} diff --git a/compose/.apps/tvheadend/tvheadend.hostname.yml b/compose/.apps/tvheadend/tvheadend.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/tvheadend/tvheadend.hostname.yml +++ b/compose/.apps/tvheadend/tvheadend.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/tvheadend/tvheadend.labels.yml b/compose/.apps/tvheadend/tvheadend.labels.yml index 9102b508c9..008c1eb12e 100644 --- a/compose/.apps/tvheadend/tvheadend.labels.yml +++ b/compose/.apps/tvheadend/tvheadend.labels.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "TV streaming server and recorder" com.dockstarter.appinfo.nicename: "Tvheadend" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_run_opts: "" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_9981: "9981" - com.dockstarter.appvars.${_appname_}_port_9982: "9982" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_recordingsdir: "/mnt/recordings" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_run_opts: "" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_9981: "9981" + com.dockstarter.appvars._port_9982: "9982" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_recordingsdir: "/mnt/recordings" diff --git a/compose/.apps/tvheadend/tvheadend.netmode.yml b/compose/.apps/tvheadend/tvheadend.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/tvheadend/tvheadend.netmode.yml +++ b/compose/.apps/tvheadend/tvheadend.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/tvheadend/tvheadend.ports.yml b/compose/.apps/tvheadend/tvheadend.ports.yml index c1384b9975..7958093fc8 100644 --- a/compose/.apps/tvheadend/tvheadend.ports.yml +++ b/compose/.apps/tvheadend/tvheadend.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_9981}:9981 - - ${${_APPNAME_}_PORT_9982}:9982 + - ${_PORT_9981}:9981 + - ${_PORT_9982}:9982 diff --git a/compose/.apps/tvheadend/tvheadend.x86_64.yml b/compose/.apps/tvheadend/tvheadend.x86_64.yml index 5286bcf5d7..ed3c52d617 100644 --- a/compose/.apps/tvheadend/tvheadend.x86_64.yml +++ b/compose/.apps/tvheadend/tvheadend.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/tvheadend:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/tvheadend:${_TAG} diff --git a/compose/.apps/tvheadend/tvheadend.yml b/compose/.apps/tvheadend/tvheadend.yml index e14a536390..340ca85572 100644 --- a/compose/.apps/tvheadend/tvheadend.yml +++ b/compose/.apps/tvheadend/tvheadend.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - - RUN_OPTS=${${_APPNAME_}_ENVIRONMENT_RUN_OPTS} + - RUN_OPTS=${_ENVIRONMENT_RUN_OPTS} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_RECORDINGSDIR}:/recordings + - ${_VOLUME_RECORDINGSDIR}:/recordings diff --git a/compose/.apps/ubooquity/ubooquity.aarch64.yml b/compose/.apps/ubooquity/ubooquity.aarch64.yml index bccf5e161c..5e68093132 100644 --- a/compose/.apps/ubooquity/ubooquity.aarch64.yml +++ b/compose/.apps/ubooquity/ubooquity.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/ubooquity:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/ubooquity:${_TAG} diff --git a/compose/.apps/ubooquity/ubooquity.hostname.yml b/compose/.apps/ubooquity/ubooquity.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/ubooquity/ubooquity.hostname.yml +++ b/compose/.apps/ubooquity/ubooquity.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/ubooquity/ubooquity.labels.yml b/compose/.apps/ubooquity/ubooquity.labels.yml index bf0a5a839e..368ea5dc5f 100644 --- a/compose/.apps/ubooquity/ubooquity.labels.yml +++ b/compose/.apps/ubooquity/ubooquity.labels.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Home server for your comics and ebooks" com.dockstarter.appinfo.nicename: "Ubooquity" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_maxmem: "512" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_2202: "2202" - com.dockstarter.appvars.${_appname_}_port_2203: "2203" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_filesdir: "/mnt/ubooquity" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_maxmem: "512" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_2202: "2202" + com.dockstarter.appvars._port_2203: "2203" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_filesdir: "/mnt/ubooquity" diff --git a/compose/.apps/ubooquity/ubooquity.netmode.yml b/compose/.apps/ubooquity/ubooquity.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/ubooquity/ubooquity.netmode.yml +++ b/compose/.apps/ubooquity/ubooquity.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/ubooquity/ubooquity.ports.yml b/compose/.apps/ubooquity/ubooquity.ports.yml index b306aaec80..3f37ab0eb6 100644 --- a/compose/.apps/ubooquity/ubooquity.ports.yml +++ b/compose/.apps/ubooquity/ubooquity.ports.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_2202}:2202 - - ${${_APPNAME_}_PORT_2203}:2203 + - ${_PORT_2202}:2202 + - ${_PORT_2203}:2203 diff --git a/compose/.apps/ubooquity/ubooquity.x86_64.yml b/compose/.apps/ubooquity/ubooquity.x86_64.yml index bccf5e161c..5e68093132 100644 --- a/compose/.apps/ubooquity/ubooquity.x86_64.yml +++ b/compose/.apps/ubooquity/ubooquity.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/ubooquity:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/ubooquity:${_TAG} diff --git a/compose/.apps/ubooquity/ubooquity.yml b/compose/.apps/ubooquity/ubooquity.yml index 09bb21c059..435e6de552 100644 --- a/compose/.apps/ubooquity/ubooquity.yml +++ b/compose/.apps/ubooquity/ubooquity.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - MAXMEM=${${_APPNAME_}_ENVIRONMENT_MAXMEM} + - MAXMEM=${_ENVIRONMENT_MAXMEM} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_FILESDIR}:/files + - ${_VOLUME_FILESDIR}:/files diff --git a/compose/.apps/unifi/unifi.aarch64.yml b/compose/.apps/unifi/unifi.aarch64.yml index b92c9ee070..0374ac8d86 100644 --- a/compose/.apps/unifi/unifi.aarch64.yml +++ b/compose/.apps/unifi/unifi.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/unifi-controller:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/unifi-controller:${_TAG} diff --git a/compose/.apps/unifi/unifi.hostname.yml b/compose/.apps/unifi/unifi.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/unifi/unifi.hostname.yml +++ b/compose/.apps/unifi/unifi.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/unifi/unifi.labels.yml b/compose/.apps/unifi/unifi.labels.yml index 431f34cfc5..bc536cf6f0 100644 --- a/compose/.apps/unifi/unifi.labels.yml +++ b/compose/.apps/unifi/unifi.labels.yml @@ -1,5 +1,5 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "true" com.dockstarter.appinfo.description: "(DEPRECATED) Use UnifiController" diff --git a/compose/.apps/unifi/unifi.netmode.yml b/compose/.apps/unifi/unifi.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/unifi/unifi.netmode.yml +++ b/compose/.apps/unifi/unifi.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/unifi/unifi.ports.yml b/compose/.apps/unifi/unifi.ports.yml index ba626f829d..db13ade5c2 100644 --- a/compose/.apps/unifi/unifi.ports.yml +++ b/compose/.apps/unifi/unifi.ports.yml @@ -1,11 +1,11 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_10001}:10001/udp - - ${${_APPNAME_}_PORT_3478}:3478/udp - - ${${_APPNAME_}_PORT_6789}:6789 - - ${${_APPNAME_}_PORT_8080}:8080 - - ${${_APPNAME_}_PORT_8081}:8081 - - ${${_APPNAME_}_PORT_8443}:8443 - - ${${_APPNAME_}_PORT_8843}:8843 - - ${${_APPNAME_}_PORT_8880}:8880 + - ${_PORT_10001}:10001/udp + - ${_PORT_3478}:3478/udp + - ${_PORT_6789}:6789 + - ${_PORT_8080}:8080 + - ${_PORT_8081}:8081 + - ${_PORT_8443}:8443 + - ${_PORT_8843}:8843 + - ${_PORT_8880}:8880 diff --git a/compose/.apps/unifi/unifi.x86_64.yml b/compose/.apps/unifi/unifi.x86_64.yml index b92c9ee070..0374ac8d86 100644 --- a/compose/.apps/unifi/unifi.x86_64.yml +++ b/compose/.apps/unifi/unifi.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/unifi-controller:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/unifi-controller:${_TAG} diff --git a/compose/.apps/unifi/unifi.yml b/compose/.apps/unifi/unifi.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/unifi/unifi.yml +++ b/compose/.apps/unifi/unifi.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/unificontroller/unificontroller.aarch64.yml b/compose/.apps/unificontroller/unificontroller.aarch64.yml index b92c9ee070..0374ac8d86 100644 --- a/compose/.apps/unificontroller/unificontroller.aarch64.yml +++ b/compose/.apps/unificontroller/unificontroller.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/unifi-controller:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/unifi-controller:${_TAG} diff --git a/compose/.apps/unificontroller/unificontroller.hostname.yml b/compose/.apps/unificontroller/unificontroller.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/unificontroller/unificontroller.hostname.yml +++ b/compose/.apps/unificontroller/unificontroller.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/unificontroller/unificontroller.labels.yml b/compose/.apps/unificontroller/unificontroller.labels.yml index 3d4ba3935d..f16b37540f 100644 --- a/compose/.apps/unificontroller/unificontroller.labels.yml +++ b/compose/.apps/unificontroller/unificontroller.labels.yml @@ -1,19 +1,19 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Controller software for wireless networks" com.dockstarter.appinfo.nicename: "UnifiController" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_10001: "10001" - com.dockstarter.appvars.${_appname_}_port_3478: "3478" - com.dockstarter.appvars.${_appname_}_port_6789: "6789" - com.dockstarter.appvars.${_appname_}_port_8080: "8080" - com.dockstarter.appvars.${_appname_}_port_8081: "8081" - com.dockstarter.appvars.${_appname_}_port_8443: "8443" - com.dockstarter.appvars.${_appname_}_port_8843: "8843" - com.dockstarter.appvars.${_appname_}_port_8880: "8880" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_10001: "10001" + com.dockstarter.appvars._port_3478: "3478" + com.dockstarter.appvars._port_6789: "6789" + com.dockstarter.appvars._port_8080: "8080" + com.dockstarter.appvars._port_8081: "8081" + com.dockstarter.appvars._port_8443: "8443" + com.dockstarter.appvars._port_8843: "8843" + com.dockstarter.appvars._port_8880: "8880" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/unificontroller/unificontroller.netmode.yml b/compose/.apps/unificontroller/unificontroller.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/unificontroller/unificontroller.netmode.yml +++ b/compose/.apps/unificontroller/unificontroller.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/unificontroller/unificontroller.ports.yml b/compose/.apps/unificontroller/unificontroller.ports.yml index ba626f829d..db13ade5c2 100644 --- a/compose/.apps/unificontroller/unificontroller.ports.yml +++ b/compose/.apps/unificontroller/unificontroller.ports.yml @@ -1,11 +1,11 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_10001}:10001/udp - - ${${_APPNAME_}_PORT_3478}:3478/udp - - ${${_APPNAME_}_PORT_6789}:6789 - - ${${_APPNAME_}_PORT_8080}:8080 - - ${${_APPNAME_}_PORT_8081}:8081 - - ${${_APPNAME_}_PORT_8443}:8443 - - ${${_APPNAME_}_PORT_8843}:8843 - - ${${_APPNAME_}_PORT_8880}:8880 + - ${_PORT_10001}:10001/udp + - ${_PORT_3478}:3478/udp + - ${_PORT_6789}:6789 + - ${_PORT_8080}:8080 + - ${_PORT_8081}:8081 + - ${_PORT_8443}:8443 + - ${_PORT_8843}:8843 + - ${_PORT_8880}:8880 diff --git a/compose/.apps/unificontroller/unificontroller.x86_64.yml b/compose/.apps/unificontroller/unificontroller.x86_64.yml index b92c9ee070..0374ac8d86 100644 --- a/compose/.apps/unificontroller/unificontroller.x86_64.yml +++ b/compose/.apps/unificontroller/unificontroller.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/unifi-controller:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/unifi-controller:${_TAG} diff --git a/compose/.apps/unificontroller/unificontroller.yml b/compose/.apps/unificontroller/unificontroller.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/unificontroller/unificontroller.yml +++ b/compose/.apps/unificontroller/unificontroller.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/unmanic/unmanic.hostname.yml b/compose/.apps/unmanic/unmanic.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/unmanic/unmanic.hostname.yml +++ b/compose/.apps/unmanic/unmanic.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/unmanic/unmanic.labels.yml b/compose/.apps/unmanic/unmanic.labels.yml index c18ba1d951..0049c08144 100644 --- a/compose/.apps/unmanic/unmanic.labels.yml +++ b/compose/.apps/unmanic/unmanic.labels.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Tool for optimising your video library to a single format" com.dockstarter.appinfo.nicename: "Unmanic" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8888: "8888" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_encodedir: "/tmp/unmanic_encode" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8888: "8888" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_encodedir: "/tmp/unmanic_encode" diff --git a/compose/.apps/unmanic/unmanic.netmode.yml b/compose/.apps/unmanic/unmanic.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/unmanic/unmanic.netmode.yml +++ b/compose/.apps/unmanic/unmanic.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/unmanic/unmanic.ports.yml b/compose/.apps/unmanic/unmanic.ports.yml index d7391c5781..94d59ce3ba 100644 --- a/compose/.apps/unmanic/unmanic.ports.yml +++ b/compose/.apps/unmanic/unmanic.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8888}:8888 + - ${_PORT_8888}:8888 diff --git a/compose/.apps/unmanic/unmanic.x86_64.yml b/compose/.apps/unmanic/unmanic.x86_64.yml index 81308a42c0..f674acec75 100644 --- a/compose/.apps/unmanic/unmanic.x86_64.yml +++ b/compose/.apps/unmanic/unmanic.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: josh5/unmanic:${${_APPNAME_}_TAG} + : + image: josh5/unmanic:${_TAG} diff --git a/compose/.apps/unmanic/unmanic.yml b/compose/.apps/unmanic/unmanic.yml index 5aeea29665..ac6b0d66ff 100644 --- a/compose/.apps/unmanic/unmanic.yml +++ b/compose/.apps/unmanic/unmanic.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_ENCODEDIR}:/tmp/unmanic + - ${_VOLUME_ENCODEDIR}:/tmp/unmanic diff --git a/compose/.apps/unpackerr/unpackerr.aarch64.yml b/compose/.apps/unpackerr/unpackerr.aarch64.yml index c874a7fb86..aaceddaa88 100644 --- a/compose/.apps/unpackerr/unpackerr.aarch64.yml +++ b/compose/.apps/unpackerr/unpackerr.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/hotio/unpackerr:${${_APPNAME_}_TAG} + : + image: ghcr.io/hotio/unpackerr:${_TAG} diff --git a/compose/.apps/unpackerr/unpackerr.hostname.yml b/compose/.apps/unpackerr/unpackerr.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/unpackerr/unpackerr.hostname.yml +++ b/compose/.apps/unpackerr/unpackerr.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/unpackerr/unpackerr.labels.yml b/compose/.apps/unpackerr/unpackerr.labels.yml index 4619cae15e..e57417988c 100644 --- a/compose/.apps/unpackerr/unpackerr.labels.yml +++ b/compose/.apps/unpackerr/unpackerr.labels.yml @@ -1,22 +1,22 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Checks for completed downloads and extracts them so Radarr, Lidarr, Sonarr, and Readarr may import them" com.dockstarter.appinfo.nicename: "Unpackerr" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_delete_after: "0" - com.dockstarter.appvars.${_appname_}_environment_delete_original: "false" - com.dockstarter.appvars.${_appname_}_environment_folder_path: "/storage/torrents" - com.dockstarter.appvars.${_appname_}_environment_interval: "2m" - com.dockstarter.appvars.${_appname_}_environment_lidarr_api_key: "" - com.dockstarter.appvars.${_appname_}_environment_lidarr_url: "http://lidarr:8686" - com.dockstarter.appvars.${_appname_}_environment_move_back: "true" - com.dockstarter.appvars.${_appname_}_environment_radarr_api_key: "" - com.dockstarter.appvars.${_appname_}_environment_radarr_url: "http://radarr:7878" - com.dockstarter.appvars.${_appname_}_environment_sonarr_api_key: "" - com.dockstarter.appvars.${_appname_}_environment_sonarr_url: "http://sonarr:8989" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_delete_after: "0" + com.dockstarter.appvars._environment_delete_original: "false" + com.dockstarter.appvars._environment_folder_path: "/storage/torrents" + com.dockstarter.appvars._environment_interval: "2m" + com.dockstarter.appvars._environment_lidarr_api_key: "" + com.dockstarter.appvars._environment_lidarr_url: "http://lidarr:8686" + com.dockstarter.appvars._environment_move_back: "true" + com.dockstarter.appvars._environment_radarr_api_key: "" + com.dockstarter.appvars._environment_radarr_url: "http://radarr:7878" + com.dockstarter.appvars._environment_sonarr_api_key: "" + com.dockstarter.appvars._environment_sonarr_url: "http://sonarr:8989" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/unpackerr/unpackerr.netmode.yml b/compose/.apps/unpackerr/unpackerr.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/unpackerr/unpackerr.netmode.yml +++ b/compose/.apps/unpackerr/unpackerr.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/unpackerr/unpackerr.x86_64.yml b/compose/.apps/unpackerr/unpackerr.x86_64.yml index c874a7fb86..aaceddaa88 100644 --- a/compose/.apps/unpackerr/unpackerr.x86_64.yml +++ b/compose/.apps/unpackerr/unpackerr.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/hotio/unpackerr:${${_APPNAME_}_TAG} + : + image: ghcr.io/hotio/unpackerr:${_TAG} diff --git a/compose/.apps/unpackerr/unpackerr.yml b/compose/.apps/unpackerr/unpackerr.yml index 1a83336585..765d558d08 100644 --- a/compose/.apps/unpackerr/unpackerr.yml +++ b/compose/.apps/unpackerr/unpackerr.yml @@ -1,23 +1,23 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - UN_FOLDER_0_DELETE_AFTER=${${_APPNAME_}_ENVIRONMENT_DELETE_AFTER} - - UN_FOLDER_0_DELETE_ORIGINAL=${${_APPNAME_}_ENVIRONMENT_DELETE_ORIGINAL} - - UN_FOLDER_0_MOVE_BACK=${${_APPNAME_}_ENVIRONMENT_MOVE_BACK} - - UN_FOLDER_0_PATH=${${_APPNAME_}_ENVIRONMENT_FOLDER_PATH} - - UN_INTERVAL=${${_APPNAME_}_ENVIRONMENT_INTERVAL} - - UN_LIDARR_0_API_KEY=${${_APPNAME_}_ENVIRONMENT_LIDARR_API_KEY} - - UN_LIDARR_0_URL=${${_APPNAME_}_ENVIRONMENT_LIDARR_URL} - - UN_RADARR_0_API_KEY=${${_APPNAME_}_ENVIRONMENT_RADARR_API_KEY} - - UN_RADARR_0_URL=${${_APPNAME_}_ENVIRONMENT_RADARR_URL} - - UN_SONARR_0_API_KEY=${${_APPNAME_}_ENVIRONMENT_SONARR_API_KEY} - - UN_SONARR_0_URL=${${_APPNAME_}_ENVIRONMENT_SONARR_URL} - restart: ${${_APPNAME_}_RESTART} + - UN_FOLDER_0_DELETE_AFTER=${_ENVIRONMENT_DELETE_AFTER} + - UN_FOLDER_0_DELETE_ORIGINAL=${_ENVIRONMENT_DELETE_ORIGINAL} + - UN_FOLDER_0_MOVE_BACK=${_ENVIRONMENT_MOVE_BACK} + - UN_FOLDER_0_PATH=${_ENVIRONMENT_FOLDER_PATH} + - UN_INTERVAL=${_ENVIRONMENT_INTERVAL} + - UN_LIDARR_0_API_KEY=${_ENVIRONMENT_LIDARR_API_KEY} + - UN_LIDARR_0_URL=${_ENVIRONMENT_LIDARR_URL} + - UN_RADARR_0_API_KEY=${_ENVIRONMENT_RADARR_API_KEY} + - UN_RADARR_0_URL=${_ENVIRONMENT_RADARR_URL} + - UN_SONARR_0_API_KEY=${_ENVIRONMENT_SONARR_API_KEY} + - UN_SONARR_0_URL=${_ENVIRONMENT_SONARR_URL} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/uptimekuma/uptimekuma.aarch64.yml b/compose/.apps/uptimekuma/uptimekuma.aarch64.yml index 7c1bc31ff6..7979768d2d 100644 --- a/compose/.apps/uptimekuma/uptimekuma.aarch64.yml +++ b/compose/.apps/uptimekuma/uptimekuma.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: louislam/uptime-kuma:${${_APPNAME_}_TAG} + : + image: louislam/uptime-kuma:${_TAG} diff --git a/compose/.apps/uptimekuma/uptimekuma.hostname.yml b/compose/.apps/uptimekuma/uptimekuma.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/uptimekuma/uptimekuma.hostname.yml +++ b/compose/.apps/uptimekuma/uptimekuma.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/uptimekuma/uptimekuma.labels.yml b/compose/.apps/uptimekuma/uptimekuma.labels.yml index 47d822c46e..51f0e2e849 100644 --- a/compose/.apps/uptimekuma/uptimekuma.labels.yml +++ b/compose/.apps/uptimekuma/uptimekuma.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "A self-hosted monitoring tool like Uptime Robot" com.dockstarter.appinfo.nicename: "UptimeKuma" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_3001: "3001" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_3001: "3001" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/uptimekuma/uptimekuma.netmode.yml b/compose/.apps/uptimekuma/uptimekuma.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/uptimekuma/uptimekuma.netmode.yml +++ b/compose/.apps/uptimekuma/uptimekuma.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/uptimekuma/uptimekuma.ports.yml b/compose/.apps/uptimekuma/uptimekuma.ports.yml index dd6146abe3..f021dc8be1 100644 --- a/compose/.apps/uptimekuma/uptimekuma.ports.yml +++ b/compose/.apps/uptimekuma/uptimekuma.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_3001}:3001 + - ${_PORT_3001}:3001 diff --git a/compose/.apps/uptimekuma/uptimekuma.x86_64.yml b/compose/.apps/uptimekuma/uptimekuma.x86_64.yml index 7c1bc31ff6..7979768d2d 100644 --- a/compose/.apps/uptimekuma/uptimekuma.x86_64.yml +++ b/compose/.apps/uptimekuma/uptimekuma.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: louislam/uptime-kuma:${${_APPNAME_}_TAG} + : + image: louislam/uptime-kuma:${_TAG} diff --git a/compose/.apps/uptimekuma/uptimekuma.yml b/compose/.apps/uptimekuma/uptimekuma.yml index 164d83d2a6..e0d96b46e0 100644 --- a/compose/.apps/uptimekuma/uptimekuma.yml +++ b/compose/.apps/uptimekuma/uptimekuma.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/app/data + - ${DOCKER_VOLUME_CONFIG}/:/app/data - ${DOCKER_VOLUME_STORAGE}:/storage - /etc/localtime:/etc/localtime:ro diff --git a/compose/.apps/varken/varken.aarch64.yml b/compose/.apps/varken/varken.aarch64.yml index 6eec70f615..495ca84634 100644 --- a/compose/.apps/varken/varken.aarch64.yml +++ b/compose/.apps/varken/varken.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: boerderij/varken:${${_APPNAME_}_TAG} + : + image: boerderij/varken:${_TAG} diff --git a/compose/.apps/varken/varken.hostname.yml b/compose/.apps/varken/varken.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/varken/varken.hostname.yml +++ b/compose/.apps/varken/varken.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/varken/varken.labels.yml b/compose/.apps/varken/varken.labels.yml index 1cde77eec7..3e9d7dd6b0 100644 --- a/compose/.apps/varken/varken.labels.yml +++ b/compose/.apps/varken/varken.labels.yml @@ -1,11 +1,11 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Utility to aggregate data from the Plex ecosystem" com.dockstarter.appinfo.nicename: "Varken" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/varken/varken.netmode.yml b/compose/.apps/varken/varken.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/varken/varken.netmode.yml +++ b/compose/.apps/varken/varken.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/varken/varken.x86_64.yml b/compose/.apps/varken/varken.x86_64.yml index 6eec70f615..495ca84634 100644 --- a/compose/.apps/varken/varken.x86_64.yml +++ b/compose/.apps/varken/varken.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: boerderij/varken:${${_APPNAME_}_TAG} + : + image: boerderij/varken:${_TAG} diff --git a/compose/.apps/varken/varken.yml b/compose/.apps/varken/varken.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/varken/varken.yml +++ b/compose/.apps/varken/varken.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/vsftpd/vsftpd.hostname.yml b/compose/.apps/vsftpd/vsftpd.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/vsftpd/vsftpd.hostname.yml +++ b/compose/.apps/vsftpd/vsftpd.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/vsftpd/vsftpd.labels.yml b/compose/.apps/vsftpd/vsftpd.labels.yml index f619ee3dca..0b31849852 100644 --- a/compose/.apps/vsftpd/vsftpd.labels.yml +++ b/compose/.apps/vsftpd/vsftpd.labels.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Probably the most secure and fastest FTP server for UNIX-like systems" com.dockstarter.appinfo.nicename: "vsftpd" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_ftp_pass: "" - com.dockstarter.appvars.${_appname_}_environment_ftp_user: "" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_21: "21" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_datadir: "/mnt/vsftpd" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_ftp_pass: "" + com.dockstarter.appvars._environment_ftp_user: "" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_21: "21" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_datadir: "/mnt/vsftpd" diff --git a/compose/.apps/vsftpd/vsftpd.netmode.yml b/compose/.apps/vsftpd/vsftpd.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/vsftpd/vsftpd.netmode.yml +++ b/compose/.apps/vsftpd/vsftpd.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/vsftpd/vsftpd.ports.yml b/compose/.apps/vsftpd/vsftpd.ports.yml index b3d4e27c28..178959aa91 100644 --- a/compose/.apps/vsftpd/vsftpd.ports.yml +++ b/compose/.apps/vsftpd/vsftpd.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_21}:21 + - ${_PORT_21}:21 diff --git a/compose/.apps/vsftpd/vsftpd.x86_64.yml b/compose/.apps/vsftpd/vsftpd.x86_64.yml index 79e29295e0..5b0eeda0d7 100644 --- a/compose/.apps/vsftpd/vsftpd.x86_64.yml +++ b/compose/.apps/vsftpd/vsftpd.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: fauria/vsftpd:${${_APPNAME_}_TAG} + : + image: fauria/vsftpd:${_TAG} diff --git a/compose/.apps/vsftpd/vsftpd.yml b/compose/.apps/vsftpd/vsftpd.yml index 06b95e0ec2..647e0e4fe4 100644 --- a/compose/.apps/vsftpd/vsftpd.yml +++ b/compose/.apps/vsftpd/vsftpd.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - FTP_USER=${${_APPNAME_}_ENVIRONMENT_FTP_USER} - - FTP_PASS=${${_APPNAME_}_ENVIRONMENT_FTP_PASS} + - FTP_USER=${_ENVIRONMENT_FTP_USER} + - FTP_PASS=${_ENVIRONMENT_FTP_PASS} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_DATADIR}:/home/vsftpd + - ${_VOLUME_DATADIR}:/home/vsftpd diff --git a/compose/.apps/watchtower/watchtower.aarch64.yml b/compose/.apps/watchtower/watchtower.aarch64.yml index 310581bb35..215aae2925 100644 --- a/compose/.apps/watchtower/watchtower.aarch64.yml +++ b/compose/.apps/watchtower/watchtower.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/containrrr/watchtower:${${_APPNAME_}_TAG} + : + image: ghcr.io/containrrr/watchtower:${_TAG} diff --git a/compose/.apps/watchtower/watchtower.hostname.yml b/compose/.apps/watchtower/watchtower.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/watchtower/watchtower.hostname.yml +++ b/compose/.apps/watchtower/watchtower.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/watchtower/watchtower.labels.yml b/compose/.apps/watchtower/watchtower.labels.yml index 777bcaa2cb..83ca41b87f 100644 --- a/compose/.apps/watchtower/watchtower.labels.yml +++ b/compose/.apps/watchtower/watchtower.labels.yml @@ -1,23 +1,23 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Automatically update running Docker containers" com.dockstarter.appinfo.nicename: "Watchtower" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "true" - com.dockstarter.appvars.${_appname_}_environment_cleanup: "true" - com.dockstarter.appvars.${_appname_}_environment_include_stopped: "false" - com.dockstarter.appvars.${_appname_}_environment_monitor_only: "false" - com.dockstarter.appvars.${_appname_}_environment_notification_template: "{{range .}}{{.Message}}{{println}}{{end}}" - com.dockstarter.appvars.${_appname_}_environment_notification_url: "" - com.dockstarter.appvars.${_appname_}_environment_notifications: "shoutrrr" - com.dockstarter.appvars.${_appname_}_environment_notifications_level: "info" - com.dockstarter.appvars.${_appname_}_environment_repo_pass: "" - com.dockstarter.appvars.${_appname_}_environment_repo_user: "" - com.dockstarter.appvars.${_appname_}_environment_schedule: "0 0 4 * * *" - com.dockstarter.appvars.${_appname_}_environment_timeout: "10s" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "true" + com.dockstarter.appvars._environment_cleanup: "true" + com.dockstarter.appvars._environment_include_stopped: "false" + com.dockstarter.appvars._environment_monitor_only: "false" + com.dockstarter.appvars._environment_notification_template: "{{range .}}{{.Message}}{{println}}{{end}}" + com.dockstarter.appvars._environment_notification_url: "" + com.dockstarter.appvars._environment_notifications: "shoutrrr" + com.dockstarter.appvars._environment_notifications_level: "info" + com.dockstarter.appvars._environment_repo_pass: "" + com.dockstarter.appvars._environment_repo_user: "" + com.dockstarter.appvars._environment_schedule: "0 0 4 * * *" + com.dockstarter.appvars._environment_timeout: "10s" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/watchtower/watchtower.netmode.yml b/compose/.apps/watchtower/watchtower.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/watchtower/watchtower.netmode.yml +++ b/compose/.apps/watchtower/watchtower.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/watchtower/watchtower.x86_64.yml b/compose/.apps/watchtower/watchtower.x86_64.yml index 310581bb35..215aae2925 100644 --- a/compose/.apps/watchtower/watchtower.x86_64.yml +++ b/compose/.apps/watchtower/watchtower.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/containrrr/watchtower:${${_APPNAME_}_TAG} + : + image: ghcr.io/containrrr/watchtower:${_TAG} diff --git a/compose/.apps/watchtower/watchtower.yml b/compose/.apps/watchtower/watchtower.yml index bd6577466c..77eef93213 100644 --- a/compose/.apps/watchtower/watchtower.yml +++ b/compose/.apps/watchtower/watchtower.yml @@ -1,21 +1,21 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - REPO_PASS=${${_APPNAME_}_ENVIRONMENT_REPO_PASS} - - REPO_USER=${${_APPNAME_}_ENVIRONMENT_REPO_USER} + - REPO_PASS=${_ENVIRONMENT_REPO_PASS} + - REPO_USER=${_ENVIRONMENT_REPO_USER} - TZ=${TZ} - - WATCHTOWER_CLEANUP=${${_APPNAME_}_ENVIRONMENT_CLEANUP} - - WATCHTOWER_INCLUDE_STOPPED=${${_APPNAME_}_ENVIRONMENT_INCLUDE_STOPPED} - - WATCHTOWER_MONITOR_ONLY=${${_APPNAME_}_ENVIRONMENT_MONITOR_ONLY} - - WATCHTOWER_NOTIFICATION_TEMPLATE=${${_APPNAME_}_ENVIRONMENT_NOTIFICATION_TEMPLATE} - - WATCHTOWER_NOTIFICATION_URL=${${_APPNAME_}_ENVIRONMENT_NOTIFICATION_URL} - - WATCHTOWER_NOTIFICATIONS_LEVEL=${${_APPNAME_}_ENVIRONMENT_NOTIFICATIONS_LEVEL} - - WATCHTOWER_NOTIFICATIONS=${${_APPNAME_}_ENVIRONMENT_NOTIFICATIONS} - - WATCHTOWER_SCHEDULE=${${_APPNAME_}_ENVIRONMENT_SCHEDULE} - - WATCHTOWER_TIMEOUT=${${_APPNAME_}_ENVIRONMENT_TIMEOUT} - restart: ${${_APPNAME_}_RESTART} + - WATCHTOWER_CLEANUP=${_ENVIRONMENT_CLEANUP} + - WATCHTOWER_INCLUDE_STOPPED=${_ENVIRONMENT_INCLUDE_STOPPED} + - WATCHTOWER_MONITOR_ONLY=${_ENVIRONMENT_MONITOR_ONLY} + - WATCHTOWER_NOTIFICATION_TEMPLATE=${_ENVIRONMENT_NOTIFICATION_TEMPLATE} + - WATCHTOWER_NOTIFICATION_URL=${_ENVIRONMENT_NOTIFICATION_URL} + - WATCHTOWER_NOTIFICATIONS_LEVEL=${_ENVIRONMENT_NOTIFICATIONS_LEVEL} + - WATCHTOWER_NOTIFICATIONS=${_ENVIRONMENT_NOTIFICATIONS} + - WATCHTOWER_SCHEDULE=${_ENVIRONMENT_SCHEDULE} + - WATCHTOWER_TIMEOUT=${_ENVIRONMENT_TIMEOUT} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock + - ${_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock diff --git a/compose/.apps/wireguard/wireguard.aarch64.yml b/compose/.apps/wireguard/wireguard.aarch64.yml index f29ba57298..c78ba5b93d 100644 --- a/compose/.apps/wireguard/wireguard.aarch64.yml +++ b/compose/.apps/wireguard/wireguard.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/wireguard:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/wireguard:${_TAG} diff --git a/compose/.apps/wireguard/wireguard.hostname.yml b/compose/.apps/wireguard/wireguard.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/wireguard/wireguard.hostname.yml +++ b/compose/.apps/wireguard/wireguard.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/wireguard/wireguard.labels.yml b/compose/.apps/wireguard/wireguard.labels.yml index b9cc7e0cd9..78377e4f7c 100644 --- a/compose/.apps/wireguard/wireguard.labels.yml +++ b/compose/.apps/wireguard/wireguard.labels.yml @@ -1,17 +1,17 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "WireGuard is an extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography." com.dockstarter.appinfo.nicename: "Wireguard" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_allowed_ips: "0.0.0.0/0" - com.dockstarter.appvars.${_appname_}_environment_internal_subnet: "10.13.13.0" - com.dockstarter.appvars.${_appname_}_environment_peer_dns: "auto" - com.dockstarter.appvars.${_appname_}_environment_peers: "1" - com.dockstarter.appvars.${_appname_}_environment_server_url: "auto" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_51820: "51820" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_allowed_ips: "0.0.0.0/0" + com.dockstarter.appvars._environment_internal_subnet: "10.13.13.0" + com.dockstarter.appvars._environment_peer_dns: "auto" + com.dockstarter.appvars._environment_peers: "1" + com.dockstarter.appvars._environment_server_url: "auto" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_51820: "51820" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/wireguard/wireguard.netmode.yml b/compose/.apps/wireguard/wireguard.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/wireguard/wireguard.netmode.yml +++ b/compose/.apps/wireguard/wireguard.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/wireguard/wireguard.ports.yml b/compose/.apps/wireguard/wireguard.ports.yml index 9c9929567a..681268bec8 100644 --- a/compose/.apps/wireguard/wireguard.ports.yml +++ b/compose/.apps/wireguard/wireguard.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_51820}:${${_APPNAME_}_PORT_51820}/udp + - ${_PORT_51820}:${_PORT_51820}/udp diff --git a/compose/.apps/wireguard/wireguard.x86_64.yml b/compose/.apps/wireguard/wireguard.x86_64.yml index f29ba57298..c78ba5b93d 100644 --- a/compose/.apps/wireguard/wireguard.x86_64.yml +++ b/compose/.apps/wireguard/wireguard.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/wireguard:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/wireguard:${_TAG} diff --git a/compose/.apps/wireguard/wireguard.yml b/compose/.apps/wireguard/wireguard.yml index 97bc45045b..6b1c55eade 100644 --- a/compose/.apps/wireguard/wireguard.yml +++ b/compose/.apps/wireguard/wireguard.yml @@ -1,24 +1,24 @@ services: - ${_appname_}: + : cap_add: - NET_ADMIN - SYS_MODULE - container_name: ${${_APPNAME_}_CONTAINER_NAME} + container_name: ${_CONTAINER_NAME} environment: - - ALLOWEDIPS=${${_APPNAME_}_ENVIRONMENT_ALLOWED_IPS} - - INTERNAL_SUBNET=${${_APPNAME_}_ENVIRONMENT_INTERNAL_SUBNET} - - PEERDNS=${${_APPNAME_}_ENVIRONMENT_PEER_DNS} - - PEERS=${${_APPNAME_}_ENVIRONMENT_PEERS} + - ALLOWEDIPS=${_ENVIRONMENT_ALLOWED_IPS} + - INTERNAL_SUBNET=${_ENVIRONMENT_INTERNAL_SUBNET} + - PEERDNS=${_ENVIRONMENT_PEER_DNS} + - PEERS=${_ENVIRONMENT_PEERS} - PGID=${PGID} - PUID=${PUID} - - SERVERPORT=${${_APPNAME_}_PORT_51820} - - SERVERURL=${${_APPNAME_}_ENVIRONMENT_SERVER_URL} + - SERVERPORT=${_PORT_51820} + - SERVERURL=${_ENVIRONMENT_SERVER_URL} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} sysctls: - net.ipv4.conf.all.src_valid_mark=1 volumes: - /etc/localtime:/etc/localtime:ro - /lib/modules:/lib/modules - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/xbackbone/xbackbone.aarch64.yml b/compose/.apps/xbackbone/xbackbone.aarch64.yml index 5839435a9e..9ac9cb0cfd 100644 --- a/compose/.apps/xbackbone/xbackbone.aarch64.yml +++ b/compose/.apps/xbackbone/xbackbone.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/linuxserver/xbackbone:${${_APPNAME_}_TAG} + : + image: ghcr.io/linuxserver/xbackbone:${_TAG} diff --git a/compose/.apps/xbackbone/xbackbone.hostname.yml b/compose/.apps/xbackbone/xbackbone.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/xbackbone/xbackbone.hostname.yml +++ b/compose/.apps/xbackbone/xbackbone.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/xbackbone/xbackbone.labels.yml b/compose/.apps/xbackbone/xbackbone.labels.yml index 49a6e8839d..93d323452c 100644 --- a/compose/.apps/xbackbone/xbackbone.labels.yml +++ b/compose/.apps/xbackbone/xbackbone.labels.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "XBackBone is a simple, self-hosted, lightweight PHP file manager that support the instant sharing tool ShareX" com.dockstarter.appinfo.nicename: "xbackbone" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_80: "80" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_uploaddir: "/mnt/xbackbone" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_80: "80" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_uploaddir: "/mnt/xbackbone" diff --git a/compose/.apps/xbackbone/xbackbone.netmode.yml b/compose/.apps/xbackbone/xbackbone.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/xbackbone/xbackbone.netmode.yml +++ b/compose/.apps/xbackbone/xbackbone.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/xbackbone/xbackbone.ports.yml b/compose/.apps/xbackbone/xbackbone.ports.yml index c37afbebb5..32f14e45fb 100644 --- a/compose/.apps/xbackbone/xbackbone.ports.yml +++ b/compose/.apps/xbackbone/xbackbone.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_80}:80 + - ${_PORT_80}:80 diff --git a/compose/.apps/xbackbone/xbackbone.x86_64.yml b/compose/.apps/xbackbone/xbackbone.x86_64.yml index 5839435a9e..9ac9cb0cfd 100644 --- a/compose/.apps/xbackbone/xbackbone.x86_64.yml +++ b/compose/.apps/xbackbone/xbackbone.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: ghcr.io/linuxserver/xbackbone:${${_APPNAME_}_TAG} + : + image: ghcr.io/linuxserver/xbackbone:${_TAG} diff --git a/compose/.apps/xbackbone/xbackbone.yml b/compose/.apps/xbackbone/xbackbone.yml index 7f8b901c19..0c6751a65b 100644 --- a/compose/.apps/xbackbone/xbackbone.yml +++ b/compose/.apps/xbackbone/xbackbone.yml @@ -1,13 +1,13 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_UPLOADDIR}:/config/www/xbackbone/storage + - ${_VOLUME_UPLOADDIR}:/config/www/xbackbone/storage diff --git a/compose/.apps/xteve/xteve.hostname.yml b/compose/.apps/xteve/xteve.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/xteve/xteve.hostname.yml +++ b/compose/.apps/xteve/xteve.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/xteve/xteve.labels.yml b/compose/.apps/xteve/xteve.labels.yml index 7414e49637..6430c5384b 100644 --- a/compose/.apps/xteve/xteve.labels.yml +++ b/compose/.apps/xteve/xteve.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "xTeVe is a M3U proxy server for Plex, Emby and any client and provider which supports the .TS and .M3U8 (HLS) streaming formats." com.dockstarter.appinfo.nicename: "xTeVe" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_branch: "master" - com.dockstarter.appvars.${_appname_}_environment_debug: "0" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_34400: "34400" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_branch: "master" + com.dockstarter.appvars._environment_debug: "0" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_34400: "34400" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/xteve/xteve.netmode.yml b/compose/.apps/xteve/xteve.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/xteve/xteve.netmode.yml +++ b/compose/.apps/xteve/xteve.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/xteve/xteve.ports.yml b/compose/.apps/xteve/xteve.ports.yml index 1f566c49d7..0e15a37e73 100644 --- a/compose/.apps/xteve/xteve.ports.yml +++ b/compose/.apps/xteve/xteve.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_34400}:34400 + - ${_PORT_34400}:34400 diff --git a/compose/.apps/xteve/xteve.x86_64.yml b/compose/.apps/xteve/xteve.x86_64.yml index 0f2ad91da4..1857d2c956 100644 --- a/compose/.apps/xteve/xteve.x86_64.yml +++ b/compose/.apps/xteve/xteve.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: dnsforge/xteve:${${_APPNAME_}_TAG} + : + image: dnsforge/xteve:${_TAG} diff --git a/compose/.apps/xteve/xteve.yml b/compose/.apps/xteve/xteve.yml index 8c6a440cb2..31b48e40e5 100644 --- a/compose/.apps/xteve/xteve.yml +++ b/compose/.apps/xteve/xteve.yml @@ -1,15 +1,15 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - XTEVE_BRANCH=${${_APPNAME_}_ENVIRONMENT_BRANCH} - - XTEVE_DEBUG=${${_APPNAME_}_ENVIRONMENT_DEBUG} - restart: ${${_APPNAME_}_RESTART} + - XTEVE_BRANCH=${_ENVIRONMENT_BRANCH} + - XTEVE_DEBUG=${_ENVIRONMENT_DEBUG} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/home/xteve/conf - - ${DOCKER_VOLUME_CONFIG}/${_appname_}/tmp:/tmp/xteve + - ${DOCKER_VOLUME_CONFIG}/:/home/xteve/conf + - ${DOCKER_VOLUME_CONFIG}//tmp:/tmp/xteve - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/yacht/yacht.aarch64.yml b/compose/.apps/yacht/yacht.aarch64.yml index 283ce45516..a21735a8d5 100644 --- a/compose/.apps/yacht/yacht.aarch64.yml +++ b/compose/.apps/yacht/yacht.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: selfhostedpro/yacht:${${_APPNAME_}_TAG} + : + image: selfhostedpro/yacht:${_TAG} diff --git a/compose/.apps/yacht/yacht.hostname.yml b/compose/.apps/yacht/yacht.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/yacht/yacht.hostname.yml +++ b/compose/.apps/yacht/yacht.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/yacht/yacht.labels.yml b/compose/.apps/yacht/yacht.labels.yml index 5db8d768d7..4b2cb8cd56 100644 --- a/compose/.apps/yacht/yacht.labels.yml +++ b/compose/.apps/yacht/yacht.labels.yml @@ -1,16 +1,16 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Yacht is a container management UI with a focus on templates and 1-click deployments." com.dockstarter.appinfo.nicename: "Yacht" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_admin_email: "admin@yacht.local" - com.dockstarter.appvars.${_appname_}_environment_disable_auth: "false" - com.dockstarter.appvars.${_appname_}_environment_secret_key: "pass" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8000: "8000" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" - com.dockstarter.appvars.${_appname_}_volume_docker_socket: "/var/run/docker.sock" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_admin_email: "admin@yacht.local" + com.dockstarter.appvars._environment_disable_auth: "false" + com.dockstarter.appvars._environment_secret_key: "pass" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8000: "8000" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" + com.dockstarter.appvars._volume_docker_socket: "/var/run/docker.sock" diff --git a/compose/.apps/yacht/yacht.netmode.yml b/compose/.apps/yacht/yacht.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/yacht/yacht.netmode.yml +++ b/compose/.apps/yacht/yacht.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/yacht/yacht.ports.yml b/compose/.apps/yacht/yacht.ports.yml index 33070f8cee..384ad2ee98 100644 --- a/compose/.apps/yacht/yacht.ports.yml +++ b/compose/.apps/yacht/yacht.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8000}:8000 + - ${_PORT_8000}:8000 diff --git a/compose/.apps/yacht/yacht.x86_64.yml b/compose/.apps/yacht/yacht.x86_64.yml index 283ce45516..a21735a8d5 100644 --- a/compose/.apps/yacht/yacht.x86_64.yml +++ b/compose/.apps/yacht/yacht.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: selfhostedpro/yacht:${${_APPNAME_}_TAG} + : + image: selfhostedpro/yacht:${_TAG} diff --git a/compose/.apps/yacht/yacht.yml b/compose/.apps/yacht/yacht.yml index d9541dcc50..73db0c1d47 100644 --- a/compose/.apps/yacht/yacht.yml +++ b/compose/.apps/yacht/yacht.yml @@ -1,16 +1,16 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - - ADMIN_EMAIL=${${_APPNAME_}_ENVIRONMENT_ADMIN_EMAIL} - - DISABLE_AUTH=${${_APPNAME_}_ENVIRONMENT_DISABLE_AUTH} + - ADMIN_EMAIL=${_ENVIRONMENT_ADMIN_EMAIL} + - DISABLE_AUTH=${_ENVIRONMENT_DISABLE_AUTH} - PGID=${PGID} - PUID=${PUID} - - SECRET_KEY=${${_APPNAME_}_ENVIRONMENT_SECRET_KEY} + - SECRET_KEY=${_ENVIRONMENT_SECRET_KEY} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${${_APPNAME_}_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock + - ${_VOLUME_DOCKER_SOCKET}:/var/run/docker.sock diff --git a/compose/.apps/youtubedl/youtubedl.hostname.yml b/compose/.apps/youtubedl/youtubedl.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/youtubedl/youtubedl.hostname.yml +++ b/compose/.apps/youtubedl/youtubedl.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/youtubedl/youtubedl.labels.yml b/compose/.apps/youtubedl/youtubedl.labels.yml index ccc65f0116..99d27240ed 100644 --- a/compose/.apps/youtubedl/youtubedl.labels.yml +++ b/compose/.apps/youtubedl/youtubedl.labels.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "Simple Web and REST interface for downloading YouTube videos onto a server." com.dockstarter.appinfo.nicename: "YoutubeDL" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_environment_config_path: "/youtube-dl/config.yml" - com.dockstarter.appvars.${_appname_}_environment_debug: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_8080: "8080" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._environment_config_path: "/youtube-dl/config.yml" + com.dockstarter.appvars._environment_debug: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_8080: "8080" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/youtubedl/youtubedl.netmode.yml b/compose/.apps/youtubedl/youtubedl.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/youtubedl/youtubedl.netmode.yml +++ b/compose/.apps/youtubedl/youtubedl.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/youtubedl/youtubedl.ports.yml b/compose/.apps/youtubedl/youtubedl.ports.yml index 7d1c7e4455..f19f4867cd 100644 --- a/compose/.apps/youtubedl/youtubedl.ports.yml +++ b/compose/.apps/youtubedl/youtubedl.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_8080}:8080 + - ${_PORT_8080}:8080 diff --git a/compose/.apps/youtubedl/youtubedl.x86_64.yml b/compose/.apps/youtubedl/youtubedl.x86_64.yml index da55592a5b..adbc466a40 100644 --- a/compose/.apps/youtubedl/youtubedl.x86_64.yml +++ b/compose/.apps/youtubedl/youtubedl.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: nbr23/youtube-dl-server:${${_APPNAME_}_TAG} + : + image: nbr23/youtube-dl-server:${_TAG} diff --git a/compose/.apps/youtubedl/youtubedl.yml b/compose/.apps/youtubedl/youtubedl.yml index fca8e6fb8a..a44bdef99c 100644 --- a/compose/.apps/youtubedl/youtubedl.yml +++ b/compose/.apps/youtubedl/youtubedl.yml @@ -1,14 +1,14 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - YDL_DEBUG=${${_APPNAME_}_ENVIRONMENT_DEBUG} - - YDL_CONFIG_PATH=${${_APPNAME_}_ENVIRONMENT_CONFIG_PATH} - restart: ${${_APPNAME_}_RESTART} + - YDL_DEBUG=${_ENVIRONMENT_DEBUG} + - YDL_CONFIG_PATH=${_ENVIRONMENT_CONFIG_PATH} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/youtube-dl + - ${DOCKER_VOLUME_CONFIG}/:/youtube-dl - ${DOCKER_VOLUME_STORAGE}:/storage diff --git a/compose/.apps/znc/znc.aarch64.yml b/compose/.apps/znc/znc.aarch64.yml index 12fe4e0d65..465a7d9948 100644 --- a/compose/.apps/znc/znc.aarch64.yml +++ b/compose/.apps/znc/znc.aarch64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/znc:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/znc:${_TAG} diff --git a/compose/.apps/znc/znc.hostname.yml b/compose/.apps/znc/znc.hostname.yml index 4dc53c3782..0bf7de6a29 100644 --- a/compose/.apps/znc/znc.hostname.yml +++ b/compose/.apps/znc/znc.hostname.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: + : hostname: ${DOCKER_HOSTNAME} diff --git a/compose/.apps/znc/znc.labels.yml b/compose/.apps/znc/znc.labels.yml index 4dd882e3ac..9ed2f67665 100644 --- a/compose/.apps/znc/znc.labels.yml +++ b/compose/.apps/znc/znc.labels.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: + : labels: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "IRC network bouncer or BNC" com.dockstarter.appinfo.nicename: "ZNC" - com.dockstarter.appvars.${_appname_}_container_name: "${_appname_}" - com.dockstarter.appvars.${_appname_}_enabled: "false" - com.dockstarter.appvars.${_appname_}_network_mode: "" - com.dockstarter.appvars.${_appname_}_port_6501: "6501" - com.dockstarter.appvars.${_appname_}_restart: "unless-stopped" - com.dockstarter.appvars.${_appname_}_tag: "latest" + com.dockstarter.appvars._container_name: "" + com.dockstarter.appvars._enabled: "false" + com.dockstarter.appvars._network_mode: "" + com.dockstarter.appvars._port_6501: "6501" + com.dockstarter.appvars._restart: "unless-stopped" + com.dockstarter.appvars._tag: "latest" diff --git a/compose/.apps/znc/znc.netmode.yml b/compose/.apps/znc/znc.netmode.yml index f36884ffb9..d85f43f693 100644 --- a/compose/.apps/znc/znc.netmode.yml +++ b/compose/.apps/znc/znc.netmode.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - network_mode: ${${_APPNAME_}_NETWORK_MODE} + : + network_mode: ${_NETWORK_MODE} diff --git a/compose/.apps/znc/znc.ports.yml b/compose/.apps/znc/znc.ports.yml index c38d9a7b28..2dfb94eb92 100644 --- a/compose/.apps/znc/znc.ports.yml +++ b/compose/.apps/znc/znc.ports.yml @@ -1,4 +1,4 @@ services: - ${_appname_}: + : ports: - - ${${_APPNAME_}_PORT_6501}:6501 + - ${_PORT_6501}:6501 diff --git a/compose/.apps/znc/znc.x86_64.yml b/compose/.apps/znc/znc.x86_64.yml index 12fe4e0d65..465a7d9948 100644 --- a/compose/.apps/znc/znc.x86_64.yml +++ b/compose/.apps/znc/znc.x86_64.yml @@ -1,3 +1,3 @@ services: - ${_appname_}: - image: lscr.io/linuxserver/znc:${${_APPNAME_}_TAG} + : + image: lscr.io/linuxserver/znc:${_TAG} diff --git a/compose/.apps/znc/znc.yml b/compose/.apps/znc/znc.yml index ace6d5d0ab..ba94be17c0 100644 --- a/compose/.apps/znc/znc.yml +++ b/compose/.apps/znc/znc.yml @@ -1,12 +1,12 @@ services: - ${_appname_}: - container_name: ${${_APPNAME_}_CONTAINER_NAME} + : + container_name: ${_CONTAINER_NAME} environment: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - restart: ${${_APPNAME_}_RESTART} + restart: ${_RESTART} volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/${_appname_}:/config + - ${DOCKER_VOLUME_CONFIG}/:/config - ${DOCKER_VOLUME_STORAGE}:/storage