From df3d2c33bacb868b00159e4919209537a6760d7f Mon Sep 17 00:00:00 2001 From: Stille Date: Mon, 27 Jun 2022 11:32:18 +0800 Subject: [PATCH] fix watchtower list --- compose_files/arm/freshrss-http.yml | 2 -- compose_files/arm/freshrss-https.yml | 3 --- compose_files/arm/freshrss-rsshub-http.yml | 4 +--- compose_files/arm/freshrss-rsshub-https.yml | 5 +---- compose_files/arm/ttrss-https.yml | 1 - compose_files/arm/ttrss-rsshub-http.yml | 2 +- compose_files/arm/ttrss-rsshub-https.yml | 3 +-- compose_files/x86/freshrss-http.yml | 2 -- compose_files/x86/freshrss-https.yml | 3 --- compose_files/x86/freshrss-rsshub-http.yml | 4 +--- compose_files/x86/freshrss-rsshub-https.yml | 5 +---- compose_files/x86/ttrss-https.yml | 1 - compose_files/x86/ttrss-rsshub-http.yml | 2 +- compose_files/x86/ttrss-rsshub-https.yml | 3 +-- 14 files changed, 8 insertions(+), 32 deletions(-) diff --git a/compose_files/arm/freshrss-http.yml b/compose_files/arm/freshrss-http.yml index 86a5ca5..6b6be01 100644 --- a/compose_files/arm/freshrss-http.yml +++ b/compose_files/arm/freshrss-http.yml @@ -37,7 +37,6 @@ services: # ---------------------------------------- ttrss ---------------------------------------- # freshrss.db: image: postgres:12-alpine - # container_name: freshrss.db hostname: freshrss.db restart: unless-stopped volumes: @@ -51,7 +50,6 @@ services: service.rss: image: freshrss/freshrss:${FRESHRSS_ARM_VERSION} - # container_name: freshrss-app hostname: freshrss-app restart: unless-stopped depends_on: diff --git a/compose_files/arm/freshrss-https.yml b/compose_files/arm/freshrss-https.yml index c4ad0bd..6f83783 100644 --- a/compose_files/arm/freshrss-https.yml +++ b/compose_files/arm/freshrss-https.yml @@ -37,7 +37,6 @@ services: # ---------------------------------------- ttrss ---------------------------------------- # freshrss.db: image: postgres:12-alpine - # container_name: freshrss.db hostname: freshrss.db restart: unless-stopped volumes: @@ -51,7 +50,6 @@ services: service.rss: image: freshrss/freshrss:${FRESHRSS_ARM_VERSION} - # container_name: freshrss-app hostname: freshrss-app restart: unless-stopped depends_on: @@ -68,7 +66,6 @@ services: # ---------------------------------------- acme.sh ---------------------------------------- # acme: image: neilpang/acme.sh - # container_name: acme volumes: - ./acme:/conf - ./nginx/ssl:/ssl diff --git a/compose_files/arm/freshrss-rsshub-http.yml b/compose_files/arm/freshrss-rsshub-http.yml index 6066574..6db4fde 100644 --- a/compose_files/arm/freshrss-rsshub-http.yml +++ b/compose_files/arm/freshrss-rsshub-http.yml @@ -38,7 +38,6 @@ services: # ---------------------------------------- ttrss ---------------------------------------- # freshrss.db: image: postgres:12-alpine - # container_name: freshrss.db hostname: freshrss.db restart: unless-stopped volumes: @@ -52,7 +51,6 @@ services: service.rss: image: freshrss/freshrss:${FRESHRSS_ARM_VERSION} - # container_name: freshrss-app hostname: freshrss-app restart: unless-stopped depends_on: @@ -110,7 +108,7 @@ services: - WATCHTOWER_CLEANUP=true - WATCHTOWER_SCHEDULE=0 0 10 * * * restart: always - command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 + command: rssforever-acme-1 rssforever-watchtower-1 rssforever-rsshub-1 rssforever-redis-1 rssforever-browserless-1 networks: - rssforever diff --git a/compose_files/arm/freshrss-rsshub-https.yml b/compose_files/arm/freshrss-rsshub-https.yml index 0041a60..cedf545 100644 --- a/compose_files/arm/freshrss-rsshub-https.yml +++ b/compose_files/arm/freshrss-rsshub-https.yml @@ -38,7 +38,6 @@ services: # ---------------------------------------- ttrss ---------------------------------------- # freshrss.db: image: postgres:12-alpine - # container_name: freshrss.db hostname: freshrss.db restart: unless-stopped volumes: @@ -52,7 +51,6 @@ services: service.rss: image: freshrss/freshrss:${FRESHRSS_ARM_VERSION} - # container_name: freshrss-app hostname: freshrss-app restart: unless-stopped depends_on: @@ -110,7 +108,7 @@ services: - WATCHTOWER_CLEANUP=true - WATCHTOWER_SCHEDULE=0 0 10 * * * restart: always - command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 + command: rssforever-acme-1 rssforever-watchtower-1 rssforever-rsshub-1 rssforever-redis-1 rssforever-browserless-1 networks: - rssforever @@ -118,7 +116,6 @@ services: # ---------------------------------------- acme.sh ---------------------------------------- # acme: image: neilpang/acme.sh - # container_name: acme volumes: - ./acme:/conf - ./nginx/ssl:/ssl diff --git a/compose_files/arm/ttrss-https.yml b/compose_files/arm/ttrss-https.yml index 517357d..95f76aa 100644 --- a/compose_files/arm/ttrss-https.yml +++ b/compose_files/arm/ttrss-https.yml @@ -63,7 +63,6 @@ services: # ---------------------------------------- acme.sh ---------------------------------------- # acme: image: neilpang/acme.sh - # container_name: acme volumes: - ./acme:/conf - ./nginx/ssl:/ssl diff --git a/compose_files/arm/ttrss-rsshub-http.yml b/compose_files/arm/ttrss-rsshub-http.yml index f40c557..ce75010 100644 --- a/compose_files/arm/ttrss-rsshub-http.yml +++ b/compose_files/arm/ttrss-rsshub-http.yml @@ -105,7 +105,7 @@ services: - WATCHTOWER_CLEANUP=true - WATCHTOWER_SCHEDULE=0 0 10 * * * restart: always - command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 + command: rssforever-acme-1 rssforever-watchtower-1 rssforever-rsshub-1 rssforever-redis-1 rssforever-browserless-1 networks: - rssforever diff --git a/compose_files/arm/ttrss-rsshub-https.yml b/compose_files/arm/ttrss-rsshub-https.yml index f7ebd06..b00fa67 100644 --- a/compose_files/arm/ttrss-rsshub-https.yml +++ b/compose_files/arm/ttrss-rsshub-https.yml @@ -105,7 +105,7 @@ services: - WATCHTOWER_CLEANUP=true - WATCHTOWER_SCHEDULE=0 0 10 * * * restart: always - command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 + command: rssforever-acme-1 rssforever-watchtower-1 rssforever-rsshub-1 rssforever-redis-1 rssforever-browserless-1 networks: - rssforever @@ -113,7 +113,6 @@ services: # ---------------------------------------- acme.sh ---------------------------------------- # acme: image: neilpang/acme.sh - # container_name: acme volumes: - ./acme:/conf - ./nginx/ssl:/ssl diff --git a/compose_files/x86/freshrss-http.yml b/compose_files/x86/freshrss-http.yml index 192d0b1..dcb9e1e 100644 --- a/compose_files/x86/freshrss-http.yml +++ b/compose_files/x86/freshrss-http.yml @@ -37,7 +37,6 @@ services: # ---------------------------------------- ttrss ---------------------------------------- # freshrss.db: image: postgres:12-alpine - # container_name: freshrss.db hostname: freshrss.db restart: unless-stopped volumes: @@ -51,7 +50,6 @@ services: service.rss: image: freshrss/freshrss:${FRESHRSS_X86_VERSION} - # container_name: freshrss-app hostname: freshrss-app restart: unless-stopped depends_on: diff --git a/compose_files/x86/freshrss-https.yml b/compose_files/x86/freshrss-https.yml index f5244e1..795c2af 100644 --- a/compose_files/x86/freshrss-https.yml +++ b/compose_files/x86/freshrss-https.yml @@ -37,7 +37,6 @@ services: # ---------------------------------------- ttrss ---------------------------------------- # freshrss.db: image: postgres:12-alpine - # container_name: freshrss.db hostname: freshrss.db restart: unless-stopped volumes: @@ -51,7 +50,6 @@ services: service.rss: image: freshrss/freshrss:${FRESHRSS_X86_VERSION} - # container_name: freshrss-app hostname: freshrss-app restart: unless-stopped depends_on: @@ -68,7 +66,6 @@ services: # ---------------------------------------- acme.sh ---------------------------------------- # acme: image: neilpang/acme.sh - # container_name: acme volumes: - ./acme:/conf - ./nginx/ssl:/ssl diff --git a/compose_files/x86/freshrss-rsshub-http.yml b/compose_files/x86/freshrss-rsshub-http.yml index 577be5c..100c8ee 100644 --- a/compose_files/x86/freshrss-rsshub-http.yml +++ b/compose_files/x86/freshrss-rsshub-http.yml @@ -38,7 +38,6 @@ services: # ---------------------------------------- ttrss ---------------------------------------- # freshrss.db: image: postgres:12-alpine - # container_name: freshrss.db hostname: freshrss.db restart: unless-stopped volumes: @@ -52,7 +51,6 @@ services: service.rss: image: freshrss/freshrss:${FRESHRSS_X86_VERSION} - # container_name: freshrss-app hostname: freshrss-app restart: unless-stopped depends_on: @@ -114,7 +112,7 @@ services: - WATCHTOWER_CLEANUP=true - WATCHTOWER_SCHEDULE=0 0 10 * * * restart: always - command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 + command: rssforever-acme-1 rssforever-watchtower-1 rssforever-rsshub-1 rssforever-redis-1 rssforever-browserless-1 networks: - rssforever diff --git a/compose_files/x86/freshrss-rsshub-https.yml b/compose_files/x86/freshrss-rsshub-https.yml index b5fd3b0..16dae9b 100644 --- a/compose_files/x86/freshrss-rsshub-https.yml +++ b/compose_files/x86/freshrss-rsshub-https.yml @@ -38,7 +38,6 @@ services: # ---------------------------------------- ttrss ---------------------------------------- # freshrss.db: image: postgres:12-alpine - # container_name: freshrss.db hostname: freshrss.db restart: unless-stopped volumes: @@ -52,7 +51,6 @@ services: service.rss: image: freshrss/freshrss:${FRESHRSS_X86_VERSION} - # container_name: freshrss-app hostname: freshrss-app restart: unless-stopped depends_on: @@ -114,7 +112,7 @@ services: - WATCHTOWER_CLEANUP=true - WATCHTOWER_SCHEDULE=0 0 10 * * * restart: always - command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 + command: rssforever-acme-1 rssforever-watchtower-1 rssforever-rsshub-1 rssforever-redis-1 rssforever-browserless-1 networks: - rssforever @@ -122,7 +120,6 @@ services: # ---------------------------------------- acme.sh ---------------------------------------- # acme: image: neilpang/acme.sh - # container_name: acme volumes: - ./acme:/conf - ./nginx/ssl:/ssl diff --git a/compose_files/x86/ttrss-https.yml b/compose_files/x86/ttrss-https.yml index 3a14ccb..bb5173e 100644 --- a/compose_files/x86/ttrss-https.yml +++ b/compose_files/x86/ttrss-https.yml @@ -80,7 +80,6 @@ services: # ---------------------------------------- acme.sh ---------------------------------------- # acme: image: neilpang/acme.sh - # container_name: acme volumes: - ./acme:/conf - ./nginx/ssl:/ssl diff --git a/compose_files/x86/ttrss-rsshub-http.yml b/compose_files/x86/ttrss-rsshub-http.yml index bc4af11..6effeed 100644 --- a/compose_files/x86/ttrss-rsshub-http.yml +++ b/compose_files/x86/ttrss-rsshub-http.yml @@ -125,6 +125,6 @@ services: - WATCHTOWER_CLEANUP=true - WATCHTOWER_SCHEDULE=0 0 10 * * * restart: always - command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 + command: rssforever-acme-1 rssforever-watchtower-1 rssforever-rsshub-1 rssforever-redis-1 rssforever-browserless-1 networks: - rssforever diff --git a/compose_files/x86/ttrss-rsshub-https.yml b/compose_files/x86/ttrss-rsshub-https.yml index 03ae060..10be6ee 100644 --- a/compose_files/x86/ttrss-rsshub-https.yml +++ b/compose_files/x86/ttrss-rsshub-https.yml @@ -125,7 +125,7 @@ services: - WATCHTOWER_CLEANUP=true - WATCHTOWER_SCHEDULE=0 0 10 * * * restart: always - command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 + command: rssforever-acme-1 rssforever-watchtower-1 rssforever-rsshub-1 rssforever-redis-1 rssforever-browserless-1 networks: - rssforever @@ -133,7 +133,6 @@ services: # ---------------------------------------- acme.sh ---------------------------------------- # acme: image: neilpang/acme.sh - # container_name: acme volumes: - ./acme:/conf - ./nginx/ssl:/ssl