From d072a187e4fb66431347012ff5ef87db6928c1c4 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 3 May 2017 10:51:04 -0500 Subject: [PATCH] Fixes #2: Allow for Docker Compose version upgrades. --- defaults/main.yml | 2 +- tasks/docker-compose.yml | 18 ++++++++++++++++++ tasks/main.yml | 6 +----- 3 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 tasks/docker-compose.yml diff --git a/defaults/main.yml b/defaults/main.yml index 863d74f..9771cf3 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -3,7 +3,7 @@ docker_package: "docker-engine" # Docker Compose options. docker_install_compose: true -docker_compose_version: "1.11.2" +docker_compose_version: "1.13.0" # Used only for Debian/Ubuntu. Add 'testing' if you don't want stable. docker_apt_repository: "deb https://apt.dockerproject.org/repo {{ ansible_distribution|lower }}-{{ ansible_distribution_release }} main" diff --git a/tasks/docker-compose.yml b/tasks/docker-compose.yml new file mode 100644 index 0000000..5b4fb8e --- /dev/null +++ b/tasks/docker-compose.yml @@ -0,0 +1,18 @@ +--- +- name: Check current docker-compose version. + command: docker-compose --version + register: docker_compose_current_version + changed_when: false + failed_when: false + +- name: Delete existing docker-compose version if it's different. + file: + path: /usr/local/bin/docker-compose + state: absent + when: docker_compose_version not in docker_compose_current_version.stdout + +- name: Install Docker Compose (if configured). + get_url: + url: https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64 + dest: /usr/local/bin/docker-compose + mode: 0755 diff --git a/tasks/main.yml b/tasks/main.yml index 985c8ad..9abd2ed 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -14,9 +14,5 @@ state: started enabled: yes -- name: Install Docker Compose (if configured). - get_url: - url: https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64 - dest: /usr/local/bin/docker-compose - mode: 0755 +- include: docker-compose.yml when: docker_install_compose