fix(config): use 'latest' docker-compose versions from github

saltstack-formulas · May 19, 2021 · d434e25 · d434e25
1 parent 2f60c21
commit d434e25
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://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
@@ -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://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: '\'