From 61687cf5ad6a201dd137aba8654e6799561d387c Mon Sep 17 00:00:00 2001 From: Hermes Date: Thu, 21 May 2026 06:47:34 +0000 Subject: [PATCH] =?UTF-8?q?audiomuse:=20fix=20.org=20source=20=E2=80=94=20?= =?UTF-8?q?entrypoints,=20no=20bouncer,=20port=3D8000,=20bridge=20network?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Plus new tubearchivist yaml configs --- audiomuse.yaml | 4 +-- tubearchivist.yaml | 63 ++++++++++++++++++++++++++++++++++++++ tubearchivist_fixed.yaml | 65 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 130 insertions(+), 2 deletions(-) create mode 100644 tubearchivist.yaml create mode 100644 tubearchivist_fixed.yaml diff --git a/audiomuse.yaml b/audiomuse.yaml index 1c7afd5..9f856d8 100644 --- a/audiomuse.yaml +++ b/audiomuse.yaml @@ -26,9 +26,9 @@ services: - traefik.enable=true - traefik.http.routers.audiomuse.service=audiomuse - traefik.http.routers.audiomuse.rule=Host(`audiomuse.${CLOUDFLARE_DNS_ZONE:?err}`) - - traefik.http.routers.audiomuse.entrypoints=tunnel + - traefik.http.routers.audiomuse.entrypoints=tunnel,web,secureweb - traefik.http.routers.audiomuse.middlewares=authentik-forwardauth@file,security-headers@file - - traefik.http.services.audiomuse.loadbalancer.server.scheme=http + - traefik.http.services.audiomuse.loadbalancer.server.port=8000 - traefik.http.services.audiomuse.loadbalancer.server.port=8000 audiomuse-worker: diff --git a/tubearchivist.yaml b/tubearchivist.yaml new file mode 100644 index 0000000..c7cce45 --- /dev/null +++ b/tubearchivist.yaml @@ -0,0 +1,63 @@ +services: + tubearchivist: + image: bbilly1/tubearchivist:latest + container_name: tubearchivist + restart: unless-stopped + depends_on: + gluetun: + condition: service_healthy + restart: true + network_mode: service:gluetun + volumes: + - ${FOLDER_FOR_MORE:?err}/media/youtube:/youtube + - ${FOLDER_FOR_DATA:?err}/tubearchivist/cache:/cache + environment: + - TZ=${TIMEZONE:?err} + - TA_USERNAME=${TA_USERNAME:?err} + - TA_PASSWORD=${TA_PASSWORD:?err} + - ES_URL=http://tubearchivist-es:9200 + - REDIS_CON=redis://tubearchivist-redis:6379 + - TA_HOST=https://tubearchivist.gharbeia.net + - ELASTIC_PASSWORD=tubearchivist + labels: + - traefik.enable=true + - traefik.http.routers.tubearchivist.service=tubearchivist + - traefik.http.routers.tubearchivist.rule=Host(`tubearchivist.${CLOUDFLARE_DNS_ZONE:?err}`) + - traefik.http.routers.tubearchivist.entrypoints=tunnel + - traefik.http.routers.tubearchivist.middlewares=authentik-forwardauth@file,security-headers@file,traefik-bouncer@file + - traefik.http.services.tubearchivist.loadbalancer.server.scheme=http + - traefik.http.services.tubearchivist.loadbalancer.server.port=8000 + + tubearchivist-es: + image: docker.elastic.co/elasticsearch/elasticsearch:8.17.0 + container_name: tubearchivist-es + restart: unless-stopped + networks: + - networking + environment: + - discovery.type=single-node + - ES_JAVA_OPTS=-Xms512m -Xmx512m + - xpack.security.enabled=false + - path.repo=/usr/share/elasticsearch/data/snapshot + volumes: + - ${FOLDER_FOR_DATA:?err}/tubearchivist/es:/usr/share/elasticsearch/data + healthcheck: + test: curl -s http://localhost:9200/_cluster/health | grep -vq '"status":"red"' + interval: 30s + timeout: 10s + retries: 3 + + tubearchivist-redis: + image: redis:7-alpine + container_name: tubearchivist-redis + restart: unless-stopped + networks: + - networking + command: --save 60 1 --loglevel warning + volumes: + - ${FOLDER_FOR_DATA:?err}/tubearchivist/redis:/data + healthcheck: + test: redis-cli ping | grep PONG + interval: 30s + timeout: 10s + retries: 3 diff --git a/tubearchivist_fixed.yaml b/tubearchivist_fixed.yaml new file mode 100644 index 0000000..42e7ef4 --- /dev/null +++ b/tubearchivist_fixed.yaml @@ -0,0 +1,65 @@ +services: + tubearchivist: + image: bbilly1/tubearchivist:latest + container_name: tubearchivist + restart: unless-stopped + depends_on: + gluetun: + condition: service_healthy + restart: true + network_mode: service:gluetun + volumes: + - ${FOLDER_FOR_MORE:?err}/media/youtube:/youtube + - ${FOLDER_FOR_DATA:?err}/tubearchivist/cache:/cache + environment: + - TZ=${TIMEZONE:?err} + - TA_USERNAME=${TA_USERNAME:?err} + - TA_PASSWORD=${TA_PASSWORD:?err} + - ES_URL=http://tubearchivist-es:9200 + - REDIS_CON=redis://tubearchivist-redis:6379 + - TA_HOST=https://tubearchivist.gharbeia.net + - ELASTIC_PASSWORD=tubearchivist + - HOST_UID=${PUID:?err} + - HOST_GID=${PGID:?err} + labels: + - traefik.enable=true + - traefik.http.routers.tubearchivist.service=tubearchivist + - traefik.http.routers.tubearchivist.rule=Host(`tubearchivist.${CLOUDFLARE_DNS_ZONE:?err}`) + - traefik.http.routers.tubearchivist.entrypoints=tunnel + - traefik.http.routers.tubearchivist.middlewares=authentik-forwardauth@file,security-headers@file,traefik-bouncer@file + - traefik.http.services.tubearchivist.loadbalancer.server.scheme=http + - traefik.http.services.tubearchivist.loadbalancer.server.port=8000 + + tubearchivist-es: + image: docker.elastic.co/elasticsearch/elasticsearch:8.17.0 + container_name: tubearchivist-es + restart: unless-stopped + networks: + - networking + environment: + - discovery.type=single-node + - ES_JAVA_OPTS=-Xms512m -Xmx512m + - xpack.security.enabled=false + - path.repo=/usr/share/elasticsearch/data/snapshot + volumes: + - ${FOLDER_FOR_DATA:?err}/tubearchivist/es:/usr/share/elasticsearch/data + healthcheck: + test: curl -s http://localhost:9200/_cluster/health | grep -vq '"status":"red"' + interval: 30s + timeout: 10s + retries: 3 + + tubearchivist-redis: + image: redis:7-alpine + container_name: tubearchivist-redis + restart: unless-stopped + networks: + - networking + command: --save 60 1 --loglevel warning + volumes: + - ${FOLDER_FOR_DATA:?err}/tubearchivist/redis:/data + healthcheck: + test: redis-cli ping | grep PONG + interval: 30s + timeout: 10s + retries: 3