From 045506a9ab129ef78ddceb47a7fdeb4f245b839b Mon Sep 17 00:00:00 2001 From: Paul Brinkmeier Date: Thu, 15 Sep 2022 13:58:48 +0200 Subject: [PATCH] Turn shell task into smaller Ansible tasks --- ansible/roles/docker/tasks/main.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/ansible/roles/docker/tasks/main.yaml b/ansible/roles/docker/tasks/main.yaml index 8c71d08..3312785 100644 --- a/ansible/roles/docker/tasks/main.yaml +++ b/ansible/roles/docker/tasks/main.yaml @@ -11,14 +11,21 @@ - gnupg - lsb-release -- name: Add Docker GPG key # noqa command-instead-of-module risky-shell-pipe +- name: Retrieve Docker GPG key + ansible.builtin.uri: + url: https://download.docker.com/linux/debian/gpg + return_content: true + register: docker_gpg_key + +- name: Install Docker GPG key become: true - ansible.builtin.shell: "curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg" + ansible.builtin.command: "gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg" args: + stdin: "{{ docker_gpg_key.content }}" creates: /usr/share/keyrings/docker-archive-keyring.gpg -- name: Retrieve dpkg architecture # noqa command-instead-of-shell - ansible.builtin.shell: dpkg --print-architecture +- name: Retrieve dpkg architecture + ansible.builtin.command: dpkg --print-architecture register: dpkg_architecture changed_when: false