Merge pull request #290 from danny-smit/bintray2github

Retrieve binary releases from github instead of bintray
saltstack-formulas · May 19, 2021 · 2fd5157 · 2fd5157
2 parents 4cc1e70 + d434e25
commit 2fd5157
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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/latest/download/docker-compose-Linux-x86_64'
+        source_hash: null
 
   networks: {}
   containers:

diff --git 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
@@ -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/latest/download/docker-compose-Darwin-x86_64'
+        source_hash: null
 
 Windows:
   div: '\'