[CORD-1481]
Update Ansible and docker-compose
Change-Id: Ifc48827de42a1677d19b2826c6d1047d96a21bcf
diff --git a/ansible/roles/docker/tasks/debian.yml b/ansible/roles/docker/tasks/debian.yml
index 40539f9..86fe7db 100644
--- a/ansible/roles/docker/tasks/debian.yml
+++ b/ansible/roles/docker/tasks/debian.yml
@@ -1,13 +1,19 @@
+---
+
+- name: Trust docker apt key
+ apt_key:
+ data={{ lookup('file', 'docker_apt_key.gpg') }}
+
- name: Debian add Docker repository and update apt cache
apt_repository:
- repo: "{{ docker_apt_repo | default('deb https://apt.dockerproject.org/repo ubuntu-{{ debian_version }} main') }}"
+ repo: "deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable"
update_cache: yes
state: present
tags: [docker]
- name: Debian Docker is present
apt:
- name: docker-engine=1.12*
+ name: "docker-ce=17.06.*"
state: present
force: yes
tags: [docker]
@@ -18,8 +24,7 @@
- name: Debian docker-py is present
pip:
- name: docker-py
- version: 1.6.0
+ name: "docker==2.4.2"
state: present
tags: [docker]
@@ -50,7 +55,7 @@
tags: [docker]
- name: DockerUI is running
- docker:
+ docker_container:
image: abh1nav/dockerui
name: dockerui
ports: 9000:9000