Release 0.7.15

Author: southalc

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Release 0.7.15
+  - Dependecy update - allow puppetlabs/selinux_code 2.x #122 
+  - Remove Bashism and update from private registry #97. Contributed by niklas
+  - Minor unit test updates for #97 changes
+
 ## Release 0.7.14
 - Properly handle idempotently removing image. Contributed by ehelms
 - Allow puppet/systemd 9.x. Contributed by evgeni

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "southalc-podman",
-  "version": "0.7.14",
+  "version": "0.7.15",
   "author": "Chris Southall",
   "summary": "Manage podman containers with puppet",
   "license": "Apache-2.0",

spec/defines/container_spec.rb

@@ -45,31 +45,31 @@
         )
       end
 
-      if %r{^\/opt\/puppetlabs\/}.match?(os_facts[:ruby]['sitedir'])
-        unless_image = <<-END.gsub(%r{^\s+\|}, '')
-          |if podman container exists namevar
-          |  then
-          |  image_name=$(podman container inspect namevar --format '{{.ImageName}}')
-          |  running_digest=$(podman image inspect $(podman image inspect ${image_name} --format='{{.ID}}') --format '{{.Digest}}')
-          |  latest_digest=$(skopeo inspect docker://registry:latest |     /opt/puppetlabs/puppet/bin/ruby -rjson -e 'puts (JSON.parse(STDIN.read))["Digest"]')
-          |  [[ $? -ne 0 ]] && latest_digest=$(skopeo inspect --no-creds docker://registry:latest |     /opt/puppetlabs/puppet/bin/ruby -rjson -e 'puts (JSON.parse(STDIN.read))["Digest"]')
-          |  test -z "${latest_digest}" && exit 0     # Do not update if unable to get latest digest
-          |  test "${running_digest}" = "${latest_digest}"
-          |fi
-        END
-      else
-        unless_image = <<-END.gsub(%r{^\s+\|}, '')
-          |if podman container exists namevar
-          |  then
-          |  image_name=$(podman container inspect namevar --format '{{.ImageName}}')
-          |  running_digest=$(podman image inspect $(podman image inspect ${image_name} --format='{{.ID}}') --format '{{.Digest}}')
-          |  latest_digest=$(skopeo inspect docker://registry:latest |     /usr/bin/ruby -rjson -e 'puts (JSON.parse(STDIN.read))["Digest"]')
-          |  [[ $? -ne 0 ]] && latest_digest=$(skopeo inspect --no-creds docker://registry:latest |     /usr/bin/ruby -rjson -e 'puts (JSON.parse(STDIN.read))["Digest"]')
-          |  test -z "${latest_digest}" && exit 0     # Do not update if unable to get latest digest
-          |  test "${running_digest}" = "${latest_digest}"
-          |fi
-        END
-      end
+      unless_image = if %r{^\/opt\/puppetlabs\/}.match?(os_facts[:ruby]['sitedir'])
+                       <<-END.gsub(%r{^\s+\|}, '')
+                         |if podman container exists namevar
+                         |  then
+                         |  image_name=$(podman container inspect namevar --format '{{.ImageName}}')
+                         |  running_digest=$(podman image inspect $(podman image inspect ${image_name} --format='{{.ID}}') --format '{{.Digest}}')
+                         |  latest_digest=$(skopeo inspect docker://registry:latest |     /opt/puppetlabs/puppet/bin/ruby -rjson -e 'puts (JSON.parse(STDIN.read))["Digest"]')
+                         |  test $? -ne 0 && latest_digest=$(skopeo inspect docker://registry:latest |     /opt/puppetlabs/puppet/bin/ruby -rjson -e 'puts (JSON.parse(STDIN.read))["Digest"]')
+                         |  test -z "${latest_digest}" && exit 0     # Do not update if unable to get latest digest
+                         |  test "${running_digest}" = "${latest_digest}"
+                         |fi
+                       END
+                     else
+                       <<-END.gsub(%r{^\s+\|}, '')
+                         |if podman container exists namevar
+                         |  then
+                         |  image_name=$(podman container inspect namevar --format '{{.ImageName}}')
+                         |  running_digest=$(podman image inspect $(podman image inspect ${image_name} --format='{{.ID}}') --format '{{.Digest}}')
+                         |  latest_digest=$(skopeo inspect docker://registry:latest |     /usr/bin/ruby -rjson -e 'puts (JSON.parse(STDIN.read))["Digest"]')
+                         |  test $? -ne 0 && latest_digest=$(skopeo inspect docker://registry:latest |     /usr/bin/ruby -rjson -e 'puts (JSON.parse(STDIN.read))["Digest"]')
+                         |  test -z "${latest_digest}" && exit 0     # Do not update if unable to get latest digest
+                         |  test "${running_digest}" = "${latest_digest}"
+                         |fi
+                       END
+                     end
 
       it do
         is_expected.to contain_exec('verify_container_image_namevar').only_with(
@@ -197,7 +197,7 @@
         |  image_name=$(podman container inspect namevar --format '{{.ImageName}}')
         |  running_digest=$(podman image inspect $(podman image inspect ${image_name} --format='{{.ID}}') --format '{{.Digest}}')
         |  latest_digest=$(skopeo inspect docker://testing:latest |     /opt/puppetlabs/puppet/bin/ruby -rjson -e 'puts (JSON.parse(STDIN.read))["Digest"]')
-        |  [[ $? -ne 0 ]] && latest_digest=$(skopeo inspect --no-creds docker://testing:latest |     /opt/puppetlabs/puppet/bin/ruby -rjson -e 'puts (JSON.parse(STDIN.read))["Digest"]')
+        |  test $? -ne 0 && latest_digest=$(skopeo inspect docker://testing:latest |     /opt/puppetlabs/puppet/bin/ruby -rjson -e 'puts (JSON.parse(STDIN.read))["Digest"]')
         |  test -z "${latest_digest}" && exit 0     # Do not update if unable to get latest digest
         |  test "${running_digest}" = "${latest_digest}"
         |fi
@@ -790,7 +790,7 @@
         |  image_name=$(podman container inspect namevar --format '{{.ImageName}}')
         |  running_digest=$(podman image inspect $(podman image inspect ${image_name} --format='{{.ID}}') --format '{{.Digest}}')
         |  latest_digest=$(skopeo inspect docker://mandatory:latest |     /test/ing -rjson -e 'puts (JSON.parse(STDIN.read))["Digest"]')
-        |  [[ $? -ne 0 ]] && latest_digest=$(skopeo inspect --no-creds docker://mandatory:latest |     /test/ing -rjson -e 'puts (JSON.parse(STDIN.read))["Digest"]')
+        |  test $? -ne 0 && latest_digest=$(skopeo inspect docker://mandatory:latest |     /test/ing -rjson -e 'puts (JSON.parse(STDIN.read))["Digest"]')
         |  test -z "${latest_digest}" && exit 0     # Do not update if unable to get latest digest
         |  test "${running_digest}" = "${latest_digest}"
         |fi