From 8d05ef46548f336ac236df070f1ef3ae1ae95d90 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Wed, 10 Nov 2021 11:00:07 +0100 Subject: [PATCH] Update to 2021-11-10 11:00 --- roles/docker_compose/defaults/main.yml | 3 ++- roles/docker_compose/tasks/main.yml | 18 ++++++++++++++++++ roles/metabase/defaults/main.yml | 4 ++-- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/roles/docker_compose/defaults/main.yml b/roles/docker_compose/defaults/main.yml index d71ec6c..ebc12b8 100644 --- a/roles/docker_compose/defaults/main.yml +++ b/roles/docker_compose/defaults/main.yml @@ -1,3 +1,4 @@ --- -docker_compose_version: 1.25.5 +docker_compose_version: 1.29.2 +docker_compose_bin_sha256: f3f10cf3dbb8107e9ba2ea5f23c1d2159ff7321d16f0a23051d68d8e2547b323 diff --git a/roles/docker_compose/tasks/main.yml b/roles/docker_compose/tasks/main.yml index bf981d0..712db5b 100644 --- a/roles/docker_compose/tasks/main.yml +++ b/roles/docker_compose/tasks/main.yml @@ -1,10 +1,28 @@ --- +- name: Check if docker-compose is installed + stat: path=/usr/local/bin/docker-compose + register: docker_compose_bin + tags: docker + +- name: Detect docker-compose version + shell: docker-compose -v | perl -ne '/version (\d+(\.\d+)+),/ && print "$1\n"' + register: docker_compose_current_version + changed_when: False + when: docker_compose_bin.stat.exists + tags: docker + +- name: Remove docker-compose + file: path=/usr/local/bin/docker-compose state=absent + when: docker_compose_bin.stat.exists and docker_compose_current_version.stdout != docker_compose_version + tags: docker + - name: Install docker-compose 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 + checksum: sha256:{{ docker_compose_bin_sha256 }} environment: - https_proxy: "{{ system_proxy | default('') }}" tags: docker diff --git a/roles/metabase/defaults/main.yml b/roles/metabase/defaults/main.yml index 3dfcf8a..6e3d84c 100644 --- a/roles/metabase/defaults/main.yml +++ b/roles/metabase/defaults/main.yml @@ -1,11 +1,11 @@ --- # Version to deploy -metabase_version: 0.41.1 +metabase_version: 0.41.2 # URL to fetch the jar metabase_jar_url: https://downloads.metabase.com/v{{ metabase_version }}/metabase.jar # Expected sha1 of the jar -metabase_jar_sha256: 8a222bf5b255dc80eb783a85b003b44835e24b739ae9e110e1ba0f583d86fd42 +metabase_jar_sha256: d2303557342f3d88437d634fd38bd4b3657b7a31e5ad891e45b001801c121bf5 # Should ansible handle upgrades ? If set to false, only the initial install (and the config) will be handled metabase_manage_upgrade: True