diff --git a/lib/puppet/provider/docker_compose/ruby.rb b/lib/puppet/provider/docker_compose/ruby.rb index 02c8792e..74765659 100644 --- a/lib/puppet/provider/docker_compose/ruby.rb +++ b/lib/puppet/provider/docker_compose/ruby.rb @@ -40,7 +40,7 @@ def exists? end counts = Hash[*compose_services.each.map { |key, array| - image = (array['image']) ? array['image'] : get_image(key, compose_services) + image = ((array['image']) ? array['image'] : get_image(key, compose_services)).gsub(/@sha256:[a-f0-9]+$/i, '') Puppet.info("Checking for compose service #{key} #{image}") ["#{key}-#{image}", compose_containers.count("#{key}-#{image}")] }.flatten] diff --git a/manifests/compose.pp b/manifests/compose.pp index d9d123e8..16e94d07 100644 --- a/manifests/compose.pp +++ b/manifests/compose.pp @@ -61,7 +61,7 @@ if $raw_url != undef { $docker_compose_url = $raw_url } else { - $docker_compose_url = "${base_url}/${version}/docker-compose-${::kernel}-x86_64${file_extension}" + $docker_compose_url = "${base_url}/${version}/docker-compose-${::kernel}-${facts['os']['hardware']}${file_extension}" } if $proxy != undef {