From a6f9885e89c172dd9961cf329a56e5d4667094ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibaud=20Lepr=C3=AAtre?= Date: Tue, 18 Jul 2017 12:47:56 +0200 Subject: [PATCH] Fix adding docker GPG key & repo on Centos 7.1 Same problem as #7 --- tasks/setup-RedHat.yml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml index 1d44e7b..4bbc0af 100644 --- a/tasks/setup-RedHat.yml +++ b/tasks/setup-RedHat.yml @@ -12,6 +12,28 @@ rpm_key: key: https://download.docker.com/linux/centos/gpg state: present + register: add_repository_key + ignore_errors: true + +- name: Ensure curl is present (on older systems without SNI). + package: name=curl state=present + when: add_repository_key|failed + +- name: Download GPG key (alternative for older systems without SNI). + shell: 'curl -sSL https://download.docker.com/linux/ubuntu/gpg -o /tmp/docker-gpg' + args: + warn: no + when: add_repository_key|failed + +- name: Add Docker GPG key (alternative for older systems without SNI). + shell: 'rpm --import /tmp/docker-gpg' + args: + warn: no + when: add_repository_key|failed + +- file: + path: '/tmp/docker-gpg' + state: absent - name: Add Docker repository. get_url: @@ -20,6 +42,23 @@ owner: root group: root mode: 0644 + register: add_repository + ignore_errors: true + +- name: Add Docker repository (on older systems without SNI). + shell: 'curl -sSL {{ docker_yum_repo_url }} -o /etc/yum.repos.d/docker-{{ docker_edition }}.repo' + args: + warn: no + when: add_repository|failed + +- name: Set permission on .repo file (on older systems without SNI). + file: + path: '/etc/yum.repos.d/docker-{{ docker_edition }}.repo' + state: file + owner: root + group: root + mode: 0644 + when: add_repository|failed - name: Configure Docker Edge repo. ini_file: