From 7eb3f3d8adcaa66910839f320b860eaa05ebec4f Mon Sep 17 00:00:00 2001 From: panda Date: Sat, 14 Mar 2020 01:02:30 +0100 Subject: [PATCH] add options for compose version in readme --- roles/docker/tasks/ubuntu.yml | 6 +++++- variables.yml | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/roles/docker/tasks/ubuntu.yml b/roles/docker/tasks/ubuntu.yml index b0906d8..909ee77 100644 --- a/roles/docker/tasks/ubuntu.yml +++ b/roles/docker/tasks/ubuntu.yml @@ -1,3 +1,7 @@ +- name: Include variables + include_vars: + file: "../../../variables.yml" + - name: Install docker prerequsistes apt: pkg: @@ -24,7 +28,7 @@ #install compose: - name: download compose - shell: curl -L https://github.com/docker/compose/releases/download/1.21.2/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose + shell: curl -L https://github.com/docker/compose/releases/download/{{ compose_ver }}/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose - name: link compose shell: chmod +x /usr/local/bin/docker-compose diff --git a/variables.yml b/variables.yml index 4e216c7..51ca86f 100644 --- a/variables.yml +++ b/variables.yml @@ -2,3 +2,4 @@ users: - commonuser tinc_vpn: vpn hostname: common_hostname +compose_ver: 1.25.4