From 5afc14edf46c839843a057740537be4786214c8c Mon Sep 17 00:00:00 2001 From: pizzaniels Date: Sun, 5 Feb 2023 17:08:54 +0100 Subject: [PATCH 1/9] add watchtower container. elke dag om 5 uur worden de containers ge-update door watchtower indien nodig. --- playbooks/all.yml | 1 + roles/watchtower/files/docker-compose.yml | 7 +++++++ roles/watchtower/meta/main.yml | 4 ++++ roles/watchtower/tasks/main.yml | 14 ++++++++++++++ roles/watchtower/vars/main.yml | 2 ++ 5 files changed, 28 insertions(+) create mode 100644 roles/watchtower/files/docker-compose.yml create mode 100644 roles/watchtower/meta/main.yml create mode 100644 roles/watchtower/tasks/main.yml create mode 100644 roles/watchtower/vars/main.yml diff --git a/playbooks/all.yml b/playbooks/all.yml index 1868667..502f97f 100644 --- a/playbooks/all.yml +++ b/playbooks/all.yml @@ -2,6 +2,7 @@ hosts: homeserver roles: - {role: 'ssh', tags: 'ssh'} + - {role: 'watchtower', tags: 'watchtower'} - {role: 'borg', tags: 'borg'} - {role: 'nsd', tags: 'nsd'} - {role: 'forgejo', tags: 'forgejo'} diff --git a/roles/watchtower/files/docker-compose.yml b/roles/watchtower/files/docker-compose.yml new file mode 100644 index 0000000..3a1cf0f --- /dev/null +++ b/roles/watchtower/files/docker-compose.yml @@ -0,0 +1,7 @@ +version: "3" +services: + watchtower: + image: containrrr/watchtower + volumes: + - /var/run/docker.sock:/var/run/docker.sock + command: --schedule "0 0 4 * * *" # 4 uur UTC = 5 uur NL tijd diff --git a/roles/watchtower/meta/main.yml b/roles/watchtower/meta/main.yml new file mode 100644 index 0000000..7f5b1d3 --- /dev/null +++ b/roles/watchtower/meta/main.yml @@ -0,0 +1,4 @@ +dependencies: + - role: common + - role: docker + \ No newline at end of file diff --git a/roles/watchtower/tasks/main.yml b/roles/watchtower/tasks/main.yml new file mode 100644 index 0000000..2518ba7 --- /dev/null +++ b/roles/watchtower/tasks/main.yml @@ -0,0 +1,14 @@ +- name: Create app directory + file: + path: "{{ service_dir }}" + state: directory +- name: Copy Docker Compose script + copy: + src: "{{ role_path }}/files/docker-compose.yml" + dest: "{{ service_dir }}/docker-compose.yml" +- name: Start the Docker Compose + docker_compose: + project_src: "{{ service_dir }}" + pull: true + remove_orphans: true + diff --git a/roles/watchtower/vars/main.yml b/roles/watchtower/vars/main.yml new file mode 100644 index 0000000..6b39621 --- /dev/null +++ b/roles/watchtower/vars/main.yml @@ -0,0 +1,2 @@ +service_name: watchtower +service_dir: "{{ base_service_dir }}/{{ service_name }}" From 1110b667bc305861bae797c6ccb923071d5b9186 Mon Sep 17 00:00:00 2001 From: pizzaniels Date: Sun, 5 Feb 2023 17:27:28 +0100 Subject: [PATCH 2/9] fixated syncthing on version 1.23 in docker compose --- roles/syncthing/templates/docker-compose.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/syncthing/templates/docker-compose.yml.j2 b/roles/syncthing/templates/docker-compose.yml.j2 index 512eef6..65c44e8 100644 --- a/roles/syncthing/templates/docker-compose.yml.j2 +++ b/roles/syncthing/templates/docker-compose.yml.j2 @@ -2,7 +2,7 @@ version: "2.1" services: syncthing: - image: lscr.io/linuxserver/syncthing:latest + image: lscr.io/linuxserver/syncthing:1.23 container_name: syncthing hostname: syncthing environment: From 444400ada549c6b19884c9f24d6ddf817d89f31d Mon Sep 17 00:00:00 2001 From: pizzaniels Date: Sun, 5 Feb 2023 17:33:02 +0100 Subject: [PATCH 3/9] syncthing tag verwijderd, gings stuk --- roles/syncthing/templates/docker-compose.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/syncthing/templates/docker-compose.yml.j2 b/roles/syncthing/templates/docker-compose.yml.j2 index 65c44e8..512eef6 100644 --- a/roles/syncthing/templates/docker-compose.yml.j2 +++ b/roles/syncthing/templates/docker-compose.yml.j2 @@ -2,7 +2,7 @@ version: "2.1" services: syncthing: - image: lscr.io/linuxserver/syncthing:1.23 + image: lscr.io/linuxserver/syncthing:latest container_name: syncthing hostname: syncthing environment: From 46c89400b2a1f0ad03c475fd063a3b8adfc14388 Mon Sep 17 00:00:00 2001 From: pizzaniels Date: Sun, 5 Feb 2023 17:37:38 +0100 Subject: [PATCH 4/9] added label to Syncthing for exclusion by Watchtower: labels: - "com.centurylinklabs.watchtower.enable=false" --- roles/syncthing/templates/docker-compose.yml.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/syncthing/templates/docker-compose.yml.j2 b/roles/syncthing/templates/docker-compose.yml.j2 index 512eef6..c8e1a5f 100644 --- a/roles/syncthing/templates/docker-compose.yml.j2 +++ b/roles/syncthing/templates/docker-compose.yml.j2 @@ -4,6 +4,8 @@ services: syncthing: image: lscr.io/linuxserver/syncthing:latest container_name: syncthing + labels: + - "com.centurylinklabs.watchtower.enable=false" hostname: syncthing environment: - PUID=1000 From 32efb21f49374eaff704e0475e71cb2a985d014f Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Mon, 6 Feb 2023 13:04:47 +0000 Subject: [PATCH 5/9] Update 'README.md' --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b938fa7..0ac6686 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,7 @@ All services below are running under Docker, except NSD and Borg. - Delegate pim.kunis.nl to my server - Host tobb website? - Move from Ubuntu to Debian +- security.txt ### NSD From 919fa74fe01523c6e51dac29a10131b992a150b0 Mon Sep 17 00:00:00 2001 From: pizzaniels Date: Mon, 6 Feb 2023 20:57:43 +0100 Subject: [PATCH 6/9] set watchtower restart:always --- roles/watchtower/files/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/watchtower/files/docker-compose.yml b/roles/watchtower/files/docker-compose.yml index 3a1cf0f..2f2a6ad 100644 --- a/roles/watchtower/files/docker-compose.yml +++ b/roles/watchtower/files/docker-compose.yml @@ -5,3 +5,4 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock command: --schedule "0 0 4 * * *" # 4 uur UTC = 5 uur NL tijd + restart: always From a875bd784694fa4859b33eb3b305d4dab8d251e4 Mon Sep 17 00:00:00 2001 From: pizzaniels Date: Mon, 6 Feb 2023 21:10:47 +0100 Subject: [PATCH 7/9] added watchtower flags: --include-restarting --cleanup --include-stopped --- roles/watchtower/files/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/watchtower/files/docker-compose.yml b/roles/watchtower/files/docker-compose.yml index 2f2a6ad..c2d5047 100644 --- a/roles/watchtower/files/docker-compose.yml +++ b/roles/watchtower/files/docker-compose.yml @@ -4,5 +4,5 @@ services: image: containrrr/watchtower volumes: - /var/run/docker.sock:/var/run/docker.sock - command: --schedule "0 0 4 * * *" # 4 uur UTC = 5 uur NL tijd + command: --schedule "0 0 4 * * *" --include-restarting --cleanup --include-stopped restart: always From 1d6e52adf42b745411fb2da822be5eebcc251398 Mon Sep 17 00:00:00 2001 From: pizzaniels Date: Mon, 6 Feb 2023 21:22:01 +0100 Subject: [PATCH 8/9] watchtower flags --- roles/watchtower/files/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/watchtower/files/docker-compose.yml b/roles/watchtower/files/docker-compose.yml index c2d5047..28f892e 100644 --- a/roles/watchtower/files/docker-compose.yml +++ b/roles/watchtower/files/docker-compose.yml @@ -4,5 +4,5 @@ services: image: containrrr/watchtower volumes: - /var/run/docker.sock:/var/run/docker.sock - command: --schedule "0 0 4 * * *" --include-restarting --cleanup --include-stopped + command: --schedule "0 0 4 * * *" --include-restarting --cleanup --include-stopped --no-startup-message restart: always From 9cf2de65ac97cc40a3e6fbd98522a627cd733c05 Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Tue, 7 Feb 2023 13:25:06 +0000 Subject: [PATCH 9/9] Update 'README.md' --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0ac6686..13acbdf 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,8 @@ All services below are running under Docker, except NSD and Borg. - Host tobb website? - Move from Ubuntu to Debian - security.txt +- Podman +- Remove watchtower with Podman features ### NSD