From 082c3742cb78043098c74e397c7a99372e0c6d21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kucharczyk?= Date: Sun, 21 Apr 2024 12:50:16 +0200 Subject: [PATCH] remove profiles from all services --- docker-compose.yml | 61 +--------------------------------------- services/bazarr.yml | 2 -- services/drone/drone.yml | 4 --- services/jellyfin.yml | 2 -- services/jelu.yml | 2 -- services/komga.yml | 2 -- services/miniflux.yml | 2 -- services/netbootxyz.yml | 2 -- services/nextcloud.yml | 2 -- services/openldap.yml | 2 -- services/portainer.yml | 2 -- services/postgres.yml | 5 +--- services/prowlarr.yml | 2 -- services/radarr.yml | 2 -- services/registry.yml | 2 -- services/sabnzbd.yml | 2 -- services/sonarr.yml | 8 +----- services/uptime-kuma.yml | 2 -- 18 files changed, 3 insertions(+), 103 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0232960..8c912a7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,5 @@ --- -# todo: remove profiles from this file and from the dce/dc alias include: - services/bazarr.yml - services/jellyfin.yml @@ -39,9 +38,6 @@ services: networks: public: ipv4_address: 192.168.240.2 - profiles: - - infra - - base restart: unless-stopped # cap_drop: # - ALL @@ -64,8 +60,6 @@ services: networks: public: ipv4_address: 192.168.240.3 - profiles: - - base restart: unless-stopped trilium: @@ -81,8 +75,6 @@ services: networks: public: ipv4_address: 192.168.240.4 - profiles: - - base ntfy: image: binwiederhier/ntfy @@ -100,9 +92,6 @@ services: networks: public: ipv4_address: 192.168.240.5 - profiles: - - base - - infra restart: unless-stopped audiobookshelf: @@ -122,8 +111,6 @@ services: networks: public: ipv4_address: 192.168.240.6 - profiles: - - disabled restart: unless-stopped beets: @@ -142,8 +129,6 @@ services: networks: public: ipv4_address: 192.168.240.7 - profiles: - - base restart: unless-stopped mealie: @@ -185,8 +170,6 @@ services: networks: public: ipv4_address: 192.168.240.9 - profiles: - - base restart: unless-stopped webhook: @@ -204,9 +187,6 @@ services: networks: public: ipv4_address: 192.168.240.10 - profiles: - - base - - infra restart: unless-stopped valheim: @@ -224,8 +204,6 @@ services: networks: public: ipv4_address: 192.168.240.11 - profiles: - - disabled restart: unless-stopped 7daystodie: @@ -240,8 +218,6 @@ services: networks: public: ipv4_address: 192.168.240.12 - profiles: - - disabled restart: unless-stopped stash: @@ -282,8 +258,6 @@ services: networks: public: ipv4_address: 192.168.240.13 - profiles: - - base restart: unless-stopped navidrome: @@ -300,8 +274,6 @@ services: networks: public: ipv4_address: 192.168.240.14 - profiles: - - base restart: unless-stopped maloja: @@ -317,8 +289,6 @@ services: networks: public: ipv4_address: 192.168.240.15 - profiles: - - base restart: unless-stopped redis: @@ -344,8 +314,6 @@ services: networks: public: ipv4_address: 192.168.240.16 - profiles: - - base healthcheck: test: [ @@ -381,8 +349,6 @@ services: ipv4_address: 192.168.240.17 # The gotenberg chromium route is used to convert .eml files. We do not # want to allow external content like tracking pixels or even javascript. - profiles: - - base command: - "gotenberg" - "--chromium-disable-javascript=true" @@ -393,8 +359,6 @@ services: networks: public: ipv4_address: 192.168.240.18 - profiles: - - base restart: unless-stopped homer: @@ -405,8 +369,6 @@ services: networks: public: ipv4_address: 192.168.240.19 - profiles: - - base volumes: - "${DOCKER_STORAGE_PATH}/homer:/www/assets" environment: @@ -429,8 +391,6 @@ services: - "PUID=${PUID}" - "PGID=${PGID}" restart: unless-stopped - profiles: - - base networks: public: ipv4_address: 192.168.240.20 @@ -449,8 +409,6 @@ services: - "${DOCKER_STORAGE_PATH}/mediawiki/images:/var/www/html/images" - "${DOCKER_STORAGE_PATH}/mediawiki/extensions:/var/www/html/extensions" - "${DOCKER_STORAGE_PATH}/mediawiki/LocalSettings.php:/var/www/html/LocalSettings.php" - profiles: - - base restart: unless-stopped photoprism: @@ -469,8 +427,6 @@ services: - "${PHOTOS_STORAGE_PATH}/import:/photoprism/import" - "${PHOTOS_STORAGE_PATH}/originals:/photoprism/originals" - "${PHOTOS_STORAGE_PATH}/storage:/photoprism/storage" - profiles: - - base restart: unless-stopped mariadb: @@ -485,9 +441,6 @@ services: - "${DOCKER_STORAGE_PATH}/mariadb:/config" - sockets:/run/mysqld/ restart: unless-stopped - profiles: - - infra - - base baserow: container_name: baserow @@ -502,8 +455,6 @@ services: volumes: - "${DOCKER_STORAGE_PATH}/baserow:/baserow/data" restart: unless-stopped - profiles: - - base gitea: container_name: gitea @@ -519,8 +470,6 @@ services: volumes: - "${DOCKER_STORAGE_PATH}/gitea:/data" restart: unless-stopped - profiles: - - base gitearunner: container_name: gitearunner @@ -543,9 +492,6 @@ services: - GITEA_RUNNER_REGISTRATION_TOKEN=92U7bIiADtqkILwjjj9rffjz8vyNp0zo7uaOgrIG - GITEA_RUNNER_LABELS="ubuntu-latest:docker://catthehacker/ubuntu:act-latest" - GITEA_RUNNER_NAME="NAS_CONTAINER" - profiles: - - base - - infrastructure restart: unless-stopped linkace: @@ -572,8 +518,6 @@ services: - ${DOCKER_STORAGE_PATH}/linkace/backups:/app/storage/app/backups - ${DOCKER_STORAGE_PATH}/linkace/logs:/app/storage/logs restart: unless-stopped - profiles: - - base # ghost: # image: "ghost:latest" @@ -606,10 +550,7 @@ services: volumes: - ${DOCKER_STORAGE_PATH}/vaultwarden:/data restart: unless-stopped - profiles: - - base - - infra - + networks: public: diff --git a/services/bazarr.yml b/services/bazarr.yml index aa0914a..58adbc1 100644 --- a/services/bazarr.yml +++ b/services/bazarr.yml @@ -15,6 +15,4 @@ services: - "${DOCKER_STORAGE_PATH}/bazarr:/config" - "${MOVIE_PATH}:/movies" - "${TV_PATH}:/tv" - profiles: - - base restart: unless-stopped diff --git a/services/drone/drone.yml b/services/drone/drone.yml index ea87927..f4c8493 100644 --- a/services/drone/drone.yml +++ b/services/drone/drone.yml @@ -19,8 +19,6 @@ services: - DRONE_GITEA_SERVER=https://git.${DOMAIN} - DRONE_SERVER_PROTO=https - DRONE_USER_CREATE=username:lukas,admin:true - profiles: - - base restart: unless-stopped drone-runner: @@ -40,6 +38,4 @@ services: - DRONE_RPC_PROTO=https - DRONE_RUNNER_CAPACITY=1 - DRONE_RUNNER_NAME=nas-docker-runner - profiles: - - base restart: unless-stopped diff --git a/services/jellyfin.yml b/services/jellyfin.yml index 7c1b9a8..7e0c5ab 100644 --- a/services/jellyfin.yml +++ b/services/jellyfin.yml @@ -17,6 +17,4 @@ services: - "JELLYFIN_PublishedServerUrl=https://jellyfin.${DOMAIN}" - PUID=${PUID} - PGID=${PGID} - profiles: - - base restart: unless-stopped diff --git a/services/jelu.yml b/services/jelu.yml index 0528717..cd1fffa 100644 --- a/services/jelu.yml +++ b/services/jelu.yml @@ -21,8 +21,6 @@ services: SPRING_DATASOURCE_USERNAME: lukas SPRING_DATASOURCE_PASSWORD: Q^k5i2^hN!wmEr6JLkYP9ME JELU_CORS_ALLOWED-ORIGINS: https://jelu.${DOMAIN} - profiles: - - base restart: unless-stopped configs: diff --git a/services/komga.yml b/services/komga.yml index c9d4b89..50fa4cb 100644 --- a/services/komga.yml +++ b/services/komga.yml @@ -12,6 +12,4 @@ services: - "${DOCKER_STORAGE_PATH}/komga:/config" - "${COMIC_PATH}:/data" - "${TORRENTS_SEED_PATH}:/import" - profiles: - - base restart: unless-stopped diff --git a/services/miniflux.yml b/services/miniflux.yml index e888369..374b0e6 100644 --- a/services/miniflux.yml +++ b/services/miniflux.yml @@ -11,6 +11,4 @@ services: environment: - BASE_URL=https://miniflux.${DOMAIN} - DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres/miniflux?sslmode=disable - profiles: - - base restart: unless-stopped diff --git a/services/netbootxyz.yml b/services/netbootxyz.yml index 1d3997b..9dce36a 100644 --- a/services/netbootxyz.yml +++ b/services/netbootxyz.yml @@ -9,6 +9,4 @@ services: volumes: - "${DOCKER_STORAGE_PATH}/netbootxyz:/config" - "${DOCKER_STORAGE_PATH_SLOW}/netbootxyz:/assets" - profiles: - - base restart: unless-stopped diff --git a/services/nextcloud.yml b/services/nextcloud.yml index 7719ec1..0741300 100644 --- a/services/nextcloud.yml +++ b/services/nextcloud.yml @@ -15,6 +15,4 @@ services: environment: # caddy - TRUSTED_PROXIES=192.168.240.2 - profiles: - - base restart: unless-stopped diff --git a/services/openldap.yml b/services/openldap.yml index 8aa9c13..9bb665d 100644 --- a/services/openldap.yml +++ b/services/openldap.yml @@ -21,6 +21,4 @@ services: - LDAP_READONLY_USER=true - LDAP_READONLY_USER_USERNAME=readonly - LDAP_READONLY_USER_PASSWORD=readonly - profiles: - - base restart: unless-stopped diff --git a/services/portainer.yml b/services/portainer.yml index d1d2e71..5205c06 100644 --- a/services/portainer.yml +++ b/services/portainer.yml @@ -11,8 +11,6 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock - portainer_data:/data - profiles: - - base restart: unless-stopped volumes: diff --git a/services/postgres.yml b/services/postgres.yml index 63701c3..5d8408b 100644 --- a/services/postgres.yml +++ b/services/postgres.yml @@ -8,7 +8,4 @@ services: ipv4_address: 192.168.240.25 volumes: - "${DOCKER_STORAGE_PATH}/postgres:/var/lib/postgresql/data" - restart: unless-stopped - profiles: - - base - - infra \ No newline at end of file + restart: unless-stopped \ No newline at end of file diff --git a/services/prowlarr.yml b/services/prowlarr.yml index 8e3ee89..e05d5df 100644 --- a/services/prowlarr.yml +++ b/services/prowlarr.yml @@ -8,6 +8,4 @@ services: ipv4_address: 192.168.240.43 volumes: - "${DOCKER_STORAGE_PATH}/prowlarr:/config" - profiles: - - base restart: unless-stopped diff --git a/services/radarr.yml b/services/radarr.yml index 3434e70..8f2c0e9 100644 --- a/services/radarr.yml +++ b/services/radarr.yml @@ -16,6 +16,4 @@ services: - "${NZB_DOWNLOADS_PATH}:/downloads" - "${TORRENTS_SEED_PATH}:/seed" - "${MOVIE_PATH}:/movies" - profiles: - - base restart: unless-stopped diff --git a/services/registry.yml b/services/registry.yml index 682b35a..a036fab 100644 --- a/services/registry.yml +++ b/services/registry.yml @@ -9,6 +9,4 @@ services: volumes: - "${DOCKER_STORAGE_PATH}/registry/data:/var/lib/registry" - "${DOCKER_STORAGE_PATH}/registry/config.yml:/etc/docker/registry/config.yml" - profiles: - - base restart: unless-stopped diff --git a/services/sabnzbd.yml b/services/sabnzbd.yml index 099c774..2305672 100644 --- a/services/sabnzbd.yml +++ b/services/sabnzbd.yml @@ -16,6 +16,4 @@ services: - "${DOWNLOADS_PATH}/sabnzbd:/downloads" - "${DOWNLOADS_PATH}/sabnzbd-incomplete:/incomplete-downloads" - "${MEDIA_PATH}:/media" - profiles: - - base restart: unless-stopped diff --git a/services/sonarr.yml b/services/sonarr.yml index c6a86fe..b97cc04 100644 --- a/services/sonarr.yml +++ b/services/sonarr.yml @@ -19,9 +19,6 @@ services: - "${TORRENTS_SEED_PATH}:/seed" - "${TORRENTS_SEED_PATH}/incomplete:/data/incomplete" restart: unless-stopped - profiles: - - base - - media sonarr_anime: container_name: sonarr_anime @@ -40,7 +37,4 @@ services: - "${NZB_DOWNLOADS_PATH}:/downloads" - "${TORRENTS_SEED_PATH}:/seed" - "${TORRENTS_SEED_PATH}/incomplete:/data/incomplete" - restart: unless-stopped - profiles: - - base - - media \ No newline at end of file + restart: unless-stopped \ No newline at end of file diff --git a/services/uptime-kuma.yml b/services/uptime-kuma.yml index 2e1d4f5..c79d306 100644 --- a/services/uptime-kuma.yml +++ b/services/uptime-kuma.yml @@ -9,6 +9,4 @@ services: networks: public: ipv4_address: 192.168.240.39 - profiles: - - base restart: unless-stopped \ No newline at end of file