From 7b60ae1c2885213514d086c42be2cf2755bcdc39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sat, 23 Jul 2022 15:42:51 +0200 Subject: [PATCH] Switch from ouroboros to watchtower. Close #82. --- playbook.yml | 2 +- roles/docker/tasks/services/netdata.yml | 2 +- roles/docker/tasks/services/tt-rss.yml | 2 +- roles/docker/tasks/services/ulovliglogning-dk.yml | 2 +- .../services/{ouroboros.yml => watchtower.yml} | 13 +++++-------- roles/docker/tasks/services/websites.yml | 11 ++++++----- 6 files changed, 15 insertions(+), 17 deletions(-) rename roles/docker/tasks/services/{ouroboros.yml => watchtower.yml} (54%) diff --git a/playbook.yml b/playbook.yml index 79ba5da..597f0aa 100644 --- a/playbook.yml +++ b/playbook.yml @@ -24,7 +24,7 @@ - drone - websites - ulovliglogning-dk - - ouroboros + - watchtower - mailu - portainer - mastodon diff --git a/roles/docker/tasks/services/netdata.yml b/roles/docker/tasks/services/netdata.yml index 80068eb..c1eb396 100644 --- a/roles/docker/tasks/services/netdata.yml +++ b/roles/docker/tasks/services/netdata.yml @@ -22,6 +22,6 @@ LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" PGID: "999" labels: - com.ouroboros.enable: "true" + com.centurylinklabs.watchtower.enable: "true" diff --git a/roles/docker/tasks/services/tt-rss.yml b/roles/docker/tasks/services/tt-rss.yml index e4e7c8a..c10023b 100644 --- a/roles/docker/tasks/services/tt-rss.yml +++ b/roles/docker/tasks/services/tt-rss.yml @@ -43,7 +43,7 @@ LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" TZ: "Europe/Copenhagen" labels: - com.ouroboros.enable: "true" + com.centurylinklabs.watchtower.enable: "true" networks: external_services: diff --git a/roles/docker/tasks/services/ulovliglogning-dk.yml b/roles/docker/tasks/services/ulovliglogning-dk.yml index 7ae903f..0258df6 100644 --- a/roles/docker/tasks/services/ulovliglogning-dk.yml +++ b/roles/docker/tasks/services/ulovliglogning-dk.yml @@ -10,4 +10,4 @@ LETSENCRYPT_HOST: "{{ ulovliglogning_website.domains|join(',') }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" labels: - com.ouroboros.enable: "true" + com.centurylinklabs.watchtower.enable: "true" diff --git a/roles/docker/tasks/services/ouroboros.yml b/roles/docker/tasks/services/watchtower.yml similarity index 54% rename from roles/docker/tasks/services/ouroboros.yml rename to roles/docker/tasks/services/watchtower.yml index a85f074..2529565 100644 --- a/roles/docker/tasks/services/ouroboros.yml +++ b/roles/docker/tasks/services/watchtower.yml @@ -1,8 +1,8 @@ --- -- name: ouroboros container +- name: watchtower container docker_container: - name: ouroboros - image: pyouroboros/ouroboros + name: watchtower + image: containrrr/watchtower:1.4.0 restart_policy: unless-stopped networks: - name: external_services @@ -10,9 +10,6 @@ - /var/run/docker.sock:/var/run/docker.sock - /root/.docker/config.json:/root/.docker/config.json env: - LABEL_ENABLE: "true" - LABELS_ONLY: "true" - CLEANUP: "true" - LATEST: "true" - CRON: "*/10 * * * *" + WATCHTOWER_LABEL_ENABLE: "true" + WATCHTOWER_POLL_INTERVAL: "600" \ No newline at end of file diff --git a/roles/docker/tasks/services/websites.yml b/roles/docker/tasks/services/websites.yml index 77e0e2a..e3571a1 100644 --- a/roles/docker/tasks/services/websites.yml +++ b/roles/docker/tasks/services/websites.yml @@ -12,7 +12,8 @@ LETSENCRYPT_HOST: "{{ data_coop_website.domains|join(',') }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" labels: - com.ouroboros.enable: "true" + com.centurylinklabs.watchtower.enable: "true" + - name: setup new data.coop website using hugo docker_container: @@ -26,7 +27,7 @@ LETSENCRYPT_HOST: "new.{{ data_coop_website.domains|join(',') }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" labels: - com.ouroboros.enable: "true" + com.centurylinklabs.watchtower.enable: "true" - name: setup new-new data.coop website using unipi docker_container: @@ -47,7 +48,7 @@ devices: - "/dev/net/tun" labels: - com.ouroboros.enable: "true" + com.centurylinklabs.watchtower.enable: "true" - name: setup cryptohagen.dk website docker container @@ -62,7 +63,7 @@ LETSENCRYPT_HOST: "{{ cryptohagen_website.domains|join(',') }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" labels: - com.ouroboros.enable: "true" + com.centurylinklabs.watchtower.enable: "true" - name: setup cryptoaarhus.dk website docker container docker_container: @@ -76,4 +77,4 @@ LETSENCRYPT_HOST: "{{ cryptoaarhus_website.domains|join(',') }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" labels: - com.ouroboros.enable: "true" + com.centurylinklabs.watchtower.enable: "true"