From 2f60c21fc26dd790c4cb032671a59b477d0197e1 Mon Sep 17 00:00:00 2001 From: Danny Smit Date: Mon, 17 May 2021 13:49:05 +0200 Subject: [PATCH 1/2] fix(config): replace URLs to bintray.com by github.com --- docker/defaults.yaml | 4 ++-- docker/osfamilymap.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/defaults.yaml b/docker/defaults.yaml index c81856b2..30de942b 100644 --- a/docker/defaults.yaml +++ b/docker/defaults.yaml @@ -79,8 +79,8 @@ docker: binary: options: '' # yamllint disable-line rule:line-length - source: 'https://dl.bintray.com/docker-compose/master/docker-compose-Linux-x86_64' - source_hash: '3c96b57ea8e0027aee7e1a3023f7599bcecae54e77bcfd5f4e65a59672637e54' + source: 'https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64' + source_hash: 'f3f10cf3dbb8107e9ba2ea5f23c1d2159ff7321d16f0a23051d68d8e2547b323' networks: {} containers: diff --git a/docker/osfamilymap.yaml b/docker/osfamilymap.yaml index f9f7e127..a1ebabf9 100644 --- a/docker/osfamilymap.yaml +++ b/docker/osfamilymap.yaml @@ -95,8 +95,8 @@ MacOS: name: docker-compose # homebrew use_upstream: package # Docker Desktop archive: - source: 'https://dl.bintray.com/docker-compose/master/docker-compose-Darwin-x86_64' - source_hash: 'c5e326611efa45cbaf5b338bf352cbf27e9eb7dff0619f77639cae1158f6571f' + source: 'https://github.com/docker/compose/releases/download/v1.29.2/docker-compose-Darwin-x86_64' + source_hash: '21924dff117140a8c4b599c502829a8b75d1ba942e4cf5734a2a27f9d82d16f6' Windows: div: '\' From d434e2570dbf775b34e2c98d835f9c0378709a63 Mon Sep 17 00:00:00 2001 From: Danny Smit Date: Wed, 19 May 2021 11:00:31 +0200 Subject: [PATCH 2/2] fix(config): use 'latest' docker-compose versions from github --- docker/defaults.yaml | 4 ++-- docker/map.jinja | 1 + docker/osfamilymap.yaml | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docker/defaults.yaml b/docker/defaults.yaml index 30de942b..e7965f52 100644 --- a/docker/defaults.yaml +++ b/docker/defaults.yaml @@ -79,8 +79,8 @@ docker: binary: options: '' # yamllint disable-line rule:line-length - source: 'https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64' - source_hash: 'f3f10cf3dbb8107e9ba2ea5f23c1d2159ff7321d16f0a23051d68d8e2547b323' + source: 'https://github.com/docker/compose/releases/latest/download/docker-compose-Linux-x86_64' + source_hash: null networks: {} containers: diff --git a/docker/map.jinja b/docker/map.jinja index 037d03cd..f1ea9baa 100644 --- a/docker/map.jinja +++ b/docker/map.jinja @@ -62,6 +62,7 @@ {%- if 'source_hash' in p.binary and p.binary.source_hash %} {%- do p.binary.update({'name': p.path, 'source_hash': p.binary.source_hash}) %} {%- else %} + {%- set url = p.binary.source %} {%- do p.binary.update({'name': p.path, 'source_hash': url ~ '.sha256'}) %} {%- endif %} diff --git a/docker/osfamilymap.yaml b/docker/osfamilymap.yaml index a1ebabf9..aa970854 100644 --- a/docker/osfamilymap.yaml +++ b/docker/osfamilymap.yaml @@ -95,8 +95,8 @@ MacOS: name: docker-compose # homebrew use_upstream: package # Docker Desktop archive: - source: 'https://github.com/docker/compose/releases/download/v1.29.2/docker-compose-Darwin-x86_64' - source_hash: '21924dff117140a8c4b599c502829a8b75d1ba942e4cf5734a2a27f9d82d16f6' + source: 'https://github.com/docker/compose/releases/latest/download/docker-compose-Darwin-x86_64' + source_hash: null Windows: div: '\'