From b3cc69762a6506f8d0e9423b8d1f39b2d6297f2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niko=C5=9B?= Date: Wed, 18 Jun 2025 19:45:47 +0200 Subject: [PATCH 1/4] Drop usage of apt_key --- ansible/deploy-playbook.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/ansible/deploy-playbook.yml b/ansible/deploy-playbook.yml index cb115642..f603105e 100644 --- a/ansible/deploy-playbook.yml +++ b/ansible/deploy-playbook.yml @@ -34,20 +34,21 @@ - name: Install Docker block: - - name: Add Docker GPG key - apt_key: - url: https://download.docker.com/linux/ubuntu/gpg - state: present - - - name: Add Docker repository - apt_repository: - repo: deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ ansible_lsb.codename }} stable - state: present + - name: Add Docker repository (deb822 format) + deb822_repository: + filename: docker-ce + repo_content: | + Types: deb + URIs: https://download.docker.com/linux/ubuntu + Suites: {{ ansible_lsb.codename }} + Components: stable + Architectures: amd64 - name: Install Docker apt: name: docker-ce state: present + update_cache: yes - name: Clone repository git: From 6e6ee5eb175978de33c6f3fed6e7c8bc5c7c56c3 Mon Sep 17 00:00:00 2001 From: Niko Date: Wed, 18 Jun 2025 23:48:50 +0200 Subject: [PATCH 2/4] pre-commit --- ansible/deploy-playbook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/deploy-playbook.yml b/ansible/deploy-playbook.yml index f603105e..ef7a9ac0 100644 --- a/ansible/deploy-playbook.yml +++ b/ansible/deploy-playbook.yml @@ -39,7 +39,7 @@ filename: docker-ce repo_content: | Types: deb - URIs: https://download.docker.com/linux/ubuntu + URIs: https://download.docker.com/linux/ubuntu Suites: {{ ansible_lsb.codename }} Components: stable Architectures: amd64 From df15ccce314ace8afba0f1d2a6f48b6a087313e9 Mon Sep 17 00:00:00 2001 From: Niko Date: Thu, 19 Jun 2025 12:37:02 +0200 Subject: [PATCH 3/4] Use docker from stable 22_04 --- ansible/deploy-playbook.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/ansible/deploy-playbook.yml b/ansible/deploy-playbook.yml index ef7a9ac0..8b25e63c 100644 --- a/ansible/deploy-playbook.yml +++ b/ansible/deploy-playbook.yml @@ -34,15 +34,16 @@ - name: Install Docker block: - - name: Add Docker repository (deb822 format) - deb822_repository: - filename: docker-ce - repo_content: | - Types: deb - URIs: https://download.docker.com/linux/ubuntu - Suites: {{ ansible_lsb.codename }} - Components: stable - Architectures: amd64 + - name: Add docker APT repository (Ubuntu 22_04) + ansible.builtin.deb822_repository: + name: docker + types: [ deb ] + uris: "https://download.docker.com/linux/ubuntu" + signed_by: "https://download.docker.com/linux/ubuntu/gpg" + suites: ["jammy"] + components: [stable] + state: present + enabled: yes - name: Install Docker apt: From 7e841dc510a809c90e1952033e4bc698e6c9ed25 Mon Sep 17 00:00:00 2001 From: Niklas Mertsch <49114330+NMertsch@users.noreply.github.com> Date: Fri, 20 Jun 2025 16:01:55 +0200 Subject: [PATCH 4/4] Ubuntu 22.04 -> 24.04 --- ansible/deploy-playbook.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/deploy-playbook.yml b/ansible/deploy-playbook.yml index 8b25e63c..ecaea84d 100644 --- a/ansible/deploy-playbook.yml +++ b/ansible/deploy-playbook.yml @@ -34,13 +34,13 @@ - name: Install Docker block: - - name: Add docker APT repository (Ubuntu 22_04) + - name: Add docker APT repository (Ubuntu 24.04) ansible.builtin.deb822_repository: name: docker types: [ deb ] uris: "https://download.docker.com/linux/ubuntu" signed_by: "https://download.docker.com/linux/ubuntu/gpg" - suites: ["jammy"] + suites: ["noble"] components: [stable] state: present enabled: yes