From fb374b732be3752a8ddfaba3ba54c5e06575d9cd Mon Sep 17 00:00:00 2001 From: ace <ace@0xace.cc> Date: Thu, 30 Mar 2023 12:38:11 +0300 Subject: [PATCH] add docker_install_official_repo flag for custom repos --- defaults/main.yaml | 1 + tasks/Debian.yaml | 2 ++ tasks/RedHat.yaml | 1 + 3 files changed, 4 insertions(+) diff --git a/defaults/main.yaml b/defaults/main.yaml index aa976aa..6bed1b9 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -1,2 +1,3 @@ --- docker_version: "20.10.23" +docker_install_official_repo: true diff --git a/tasks/Debian.yaml b/tasks/Debian.yaml index 5e5de22..1d46405 100644 --- a/tasks/Debian.yaml +++ b/tasks/Debian.yaml @@ -10,6 +10,7 @@ url: "{{ item.url }}" keyring: "{{ item.keyring }}" loop: "{{ docker_apt_key }}" + when: docker_install_official_repo - name: Add Docker repository ansible.builtin.apt_repository: @@ -18,6 +19,7 @@ filename: "{{ item.filename }}" update_cache: yes loop: "{{ docker_apt_repository }}" + when: docker_install_official_repo - name: Ensure {{ docker_package }} installed apt: diff --git a/tasks/RedHat.yaml b/tasks/RedHat.yaml index f92ab00..79da021 100644 --- a/tasks/RedHat.yaml +++ b/tasks/RedHat.yaml @@ -11,6 +11,7 @@ gpgkey: "{{ item.gpgkey | default('omit') }}" async: "{{ item.async | default('yes') }}" loop: "{{ docker_rpm_repository }}" + when: docker_install_official_repo - name: Ensure {{ docker_package }} is installed yum: