From 2f2c4ffddaef1c0508abc34acc23c1593f6fe697 Mon Sep 17 00:00:00 2001 From: Aleksandr Kostyrev Date: Wed, 24 May 2017 02:05:34 +0300 Subject: [PATCH 1/2] Fix adding docker apt key on Ubuntu 14.04 --- tasks/setup-Debian.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 1213773..8e479a1 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -20,6 +20,12 @@ url: https://download.docker.com/linux/ubuntu/gpg id: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88 state: present + register: add_repository_key + ignore_errors: true + +- name: Alternative | Add Docker apt key. + shell: "curl -sSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -" + when: add_repository_key|failed - name: Add Docker repository. apt_repository: From 894cdd2cdf7e0632999d1d322b531ff8ec4d7a14 Mon Sep 17 00:00:00 2001 From: Aleksandr Kostyrev Date: Wed, 24 May 2017 02:30:19 +0300 Subject: [PATCH 2/2] Add ubuntu1404 to .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f85f3dd..25e8152 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ services: docker env: - distro: centos7 - distro: ubuntu1604 + - distro: ubuntu1404 - distro: debian8 script: