From 5c0726e7d2ff191246af4c1305345e58e948b0d3 Mon Sep 17 00:00:00 2001 From: berthin Date: Wed, 9 Nov 2022 14:10:22 +0100 Subject: [PATCH] Update setup-Debian.yml to support Ubuntu16 (#2) * Add conditions to use apt-key for old versions of ubuntu (16.04 and older) --- tasks/setup-Debian.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index da69dae..32520b3 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -33,17 +33,22 @@ force: true register: add_repository_key ignore_errors: "{{ docker_apt_ignore_key_error }}" + when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('18.04', '>=') - name: Ensure curl is present (on older systems without SNI). package: name=curl state=present - when: add_repository_key is failed + when: > + (add_repository_key is skipped) + or (add_repository_key is failed) - name: Add Docker apt key (alternative for older systems without SNI). shell: > curl -sSL {{ docker_apt_gpg_key }} | apt-key add - args: warn: false - when: add_repository_key is failed + when: > + (add_repository_key is skipped) + or (add_repository_key is failed) - name: Add Docker repository. apt_repository: