From b98a9adff272f9fb5e77124e9cea644b2defaf48 Mon Sep 17 00:00:00 2001 From: Colin Hebert Date: Fri, 6 Jan 2023 16:52:36 +0100 Subject: [PATCH] Remove gotify --- collectors.docker-compose.yml | 7 ----- docker/secrets/gotify/README.md | 4 --- docker/volumes/gotify/data/entrypoint.sh | 28 ----------------- docs/utilities.md | 4 +++ downloads.docker-compose.yml | 3 -- notifications.docker-compose.yml | 39 ------------------------ utilities.docker-compose.yml | 12 +------- 7 files changed, 5 insertions(+), 92 deletions(-) delete mode 100644 docker/secrets/gotify/README.md delete mode 100755 docker/volumes/gotify/data/entrypoint.sh create mode 100644 docs/utilities.md delete mode 100644 notifications.docker-compose.yml diff --git a/collectors.docker-compose.yml b/collectors.docker-compose.yml index 9ebace4..99fd815 100644 --- a/collectors.docker-compose.yml +++ b/collectors.docker-compose.yml @@ -9,7 +9,6 @@ services: PGID: ${NASCOMPOSE_GID?} networks: - traefik - - gotify - downloads volumes: - mylar_config:/config/ @@ -26,7 +25,6 @@ services: PGID: ${NASCOMPOSE_GID?} networks: - traefik - - gotify - downloads volumes: - lazylibrarian_config:/config/ @@ -42,7 +40,6 @@ services: PGID: ${NASCOMPOSE_GID?} networks: - traefik - - gotify - downloads volumes: - sonarr_config:/config/ @@ -58,7 +55,6 @@ services: PGID: ${NASCOMPOSE_GID?} networks: - traefik - - gotify - downloads volumes: - radarr_config:/config/ @@ -74,7 +70,6 @@ services: PGID: ${NASCOMPOSE_GID?} networks: - traefik - - gotify volumes: - bazarr_config:/config/ - data:/data @@ -99,8 +94,6 @@ services: networks: traefik: external: true - gotify: - external: true downloads: external: true diff --git a/docker/secrets/gotify/README.md b/docker/secrets/gotify/README.md deleted file mode 100644 index 84fac33..0000000 --- a/docker/secrets/gotify/README.md +++ /dev/null @@ -1,4 +0,0 @@ -Contains the file `admin_password` - -Environment variable file for the default admin password, this is because gotify doesn't support docker secrets yet -https://github.com/gotify/server/issues/392 diff --git a/docker/volumes/gotify/data/entrypoint.sh b/docker/volumes/gotify/data/entrypoint.sh deleted file mode 100755 index 784aeca..0000000 --- a/docker/volumes/gotify/data/entrypoint.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -# usage: file_env VAR [DEFAULT] -# ie: file_env 'XYZ_DB_PASSWORD' 'example' -# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of -# "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature) -file_env() { - local var="$1" - local fileVar="${var}_FILE" - local def="${2:-}" - if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then - mysql_error "Both $var and $fileVar are set (but are exclusive)" - fi - local val="$def" - if [ "${!var:-}" ]; then - val="${!var}" - elif [ "${!fileVar:-}" ]; then - val="$(< "${!fileVar}")" - fi - export "$var"="$val" - unset "$fileVar" -} - -cd /app - -file_env 'GOTIFY_DEFAULTUSER_PASS' - -./gotify-app "$@" diff --git a/docs/utilities.md b/docs/utilities.md new file mode 100644 index 0000000..2aa8221 --- /dev/null +++ b/docs/utilities.md @@ -0,0 +1,4 @@ +# Bootstrap + +### Environment variables +- `NASCOMPOSE_SERVICES`: Absolute path to the `services` folder diff --git a/downloads.docker-compose.yml b/downloads.docker-compose.yml index f31d950..9909908 100644 --- a/downloads.docker-compose.yml +++ b/downloads.docker-compose.yml @@ -9,7 +9,6 @@ services: networks: - default - traefik - - gotify - downloads dns: - 1.1.1.1 @@ -86,8 +85,6 @@ networks: traefik: external: true - gotify: - external: true volumes: torrents: diff --git a/notifications.docker-compose.yml b/notifications.docker-compose.yml deleted file mode 100644 index dedca0b..0000000 --- a/notifications.docker-compose.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Notifications - -services: - gotify: - image: gotify/server - entrypoint: ./data/entrypoint.sh - environment: - GOTIFY_SERVER_PORT: 8080 - GOTIFY_DEFAULTUSER_PASS_FILE: /run/secrets/gotify_admin_password - user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?} - networks: - - gotify - - traefik - volumes: - - gotify_data:/app/data/ - secrets: - - gotify_admin_password - restart: unless-stopped - labels: - traefik.enable: true - traefik.http.services.gotify.loadbalancer.server.port: 8080 - -networks: - gotify: - name: gotify - - traefik: - external: true - -volumes: - gotify_data: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/volumes/gotify/data/ - -secrets: - gotify_admin_password: - file: ${NASCOMPOSE_SERVICES?}/secrets/gotify/admin_password diff --git a/utilities.docker-compose.yml b/utilities.docker-compose.yml index a9dd5a8..4ce7983 100644 --- a/utilities.docker-compose.yml +++ b/utilities.docker-compose.yml @@ -6,15 +6,9 @@ services: WATCHTOWER_INCLUDE_RESTARTING: true WATCHTOWER_INCLUDE_STOPPED: true WATCHTOWER_MONITOR_ONLY: true - WATCHTOWER_NOTIFICATIONS: gotify - WATCHTOWER_NOTIFICATION_GOTIFY_URL: http://gotify - WATCHTOWER_NOTIFICATION_GOTIFY_TOKEN: /run/secrets/gotify_token + # TODO: Set notification to Discord networks: - docker - - gotify - secrets: - - source: watchtower_gotify_token - target: gotify_token restart: unless-stopped smokeping: @@ -56,8 +50,6 @@ services: networks: docker: external: true - gotify: - external: true traefik: external: true @@ -79,7 +71,5 @@ volumes: device: ${NASCOMPOSE_SERVICES?}/volumes/heimdall/config/ secrets: - watchtower_gotify_token: - file: ${NASCOMPOSE_SERVICES?}/secrets/watchtower/gotify_token duckdns_token: file: ${NASCOMPOSE_SERVICES?}/secrets/duckdns/duckdns_token