From a7da30d9a118c5b36ed17fd83c8dd288911ee808 Mon Sep 17 00:00:00 2001 From: Jacob Cody Wimer Date: Fri, 12 May 2017 22:38:33 -0400 Subject: [PATCH] Moved docker-compose version to a group_var and updated to 1.13.0 --- group_vars/all | 2 +- roles/common/tasks/main.yml | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/group_vars/all b/group_vars/all index aeb4c83..03f1103 100644 --- a/group_vars/all +++ b/group_vars/all @@ -1,4 +1,4 @@ --- # Variables listed here are applicable to all host groups -example_password: somethingSecret +docker_compose_version_to_install: 1.13.0 diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index ffafec3..a24ece7 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -55,13 +55,20 @@ shell: curl -sSL https://get.docker.com/ | sh when: docker_installed.stdout == "" +- name: Docker compose version + shell: docker-compose --version + register: docker_compose_version + failed_when: "docker_compose_version.rc ==2 or docker_compose_version.rc == 3" + - name: Get docker compose - shell: curl -L https://github.com/docker/compose/releases/download/1.5.0/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose - when: docker_installed.stdout == "" + shell: curl -L https://github.com/docker/compose/releases/download/{{docker_compose_version_to_install}}/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose + when: >- + docker_compose_version.stdout != "docker-compose version: {{docker_compose_version_to_install}}" - name: Link docker compose shell: chmod +x /usr/local/bin/docker-compose - when: docker_installed.stdout == "" + when: >- + docker_compose_version.stdout != "docker-compose version: {{docker_compose_version_to_install}}" - name: Set timezone to NewYork shell: timedatectl set-timezone America/New_York