From 14c2df041820ee6d699099331e5e777f75f62ae2 Mon Sep 17 00:00:00 2001 From: Erwan Miran Date: Tue, 6 Nov 2018 20:07:11 +0100 Subject: [PATCH] Replace raw module with shell to avoid warning (#3652) --- roles/download/tasks/download_prep.yml | 3 +-- roles/download/tasks/set_docker_image_facts.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/roles/download/tasks/download_prep.yml b/roles/download/tasks/download_prep.yml index 0cb46f35f..40ee8e981 100644 --- a/roles/download/tasks/download_prep.yml +++ b/roles/download/tasks/download_prep.yml @@ -1,13 +1,12 @@ --- - name: Register docker images info - raw: >- + shell: >- {{ docker_bin_dir }}/docker images -q | xargs {{ docker_bin_dir }}/docker inspect -f "{{ '{{' }} (index .RepoTags 0) {{ '}}' }},{{ '{{' }} (index .RepoDigests 0) {{ '}}' }}" | tr '\n' ',' no_log: true register: docker_images failed_when: false changed_when: false check_mode: no - environment: {} when: download_container - name: container_download | Create dest directory for saved/loaded container images diff --git a/roles/download/tasks/set_docker_image_facts.yml b/roles/download/tasks/set_docker_image_facts.yml index b40f649c9..6fbdd5a12 100644 --- a/roles/download/tasks/set_docker_image_facts.yml +++ b/roles/download/tasks/set_docker_image_facts.yml @@ -8,14 +8,13 @@ {%- if pull_by_digest %}{{download.repo}}@sha256:{{download.sha256}}{%- else -%}{{download.repo}}:{{download.tag}}{%- endif -%} - name: Register docker images info - raw: >- + shell: >- {{ docker_bin_dir }}/docker images -q | xargs {{ docker_bin_dir }}/docker inspect -f "{{ '{{' }} if .RepoTags {{ '}}' }}{{ '{{' }} (index .RepoTags 0) {{ '}}' }}{{ '{{' }} end {{ '}}' }}{{ '{{' }} if .RepoDigests {{ '}}' }},{{ '{{' }} (index .RepoDigests 0) {{ '}}' }}{{ '{{' }} end {{ '}}' }}" | tr '\n' ',' no_log: true register: docker_images failed_when: false changed_when: false check_mode: no - environment: {} when: not download_always_pull - set_fact: