DO NOT MERGE: Testing containers/image#2603

go mod edit -replace github.com/containers/image/v5=github.com/mtrmac/image/v5@untrusted-digest-flag Signed-off-by: Miloslav Trmač <mitr@redhat.com>
mtrmac · Oct 16, 2024 · f0a59b8 · f0a59b8
1 parent 790468b
commit f0a59b8
Show file tree

Hide file tree

Showing 15 changed files with 91 additions and 67 deletions.
diff --git a/go.mod b/go.mod
@@ -228,3 +228,5 @@ require (
 )
 
 replace github.com/containers/common => github.com/mtrmac/common v0.8.2-0.20241015204126-78c8c087610a
+
+replace github.com/containers/image/v5 => github.com/mtrmac/image/v5 v5.0.0-20241016195457-6045533dd9a2
diff --git a/go.sum b/go.sum
@@ -83,8 +83,6 @@ github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6J
 github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
 github.com/containers/gvisor-tap-vsock v0.7.5 h1:bTy4u3DOmmUPwurL6me2rsgfypAFDhyeJleUcQmBR/E=
 github.com/containers/gvisor-tap-vsock v0.7.5/go.mod h1:GW9jOqAEEGdaS20XwTYdm6KCYDHIulOE/yEEOabkoE4=
-github.com/containers/image/v5 v5.32.3-0.20240923171149-9e1153a28c46 h1:eIwxm8+oAoTk+PDuOTbZRFG1DBF5tAlFO+niIamyzaM=
-github.com/containers/image/v5 v5.32.3-0.20240923171149-9e1153a28c46/go.mod h1:GgaW+YZJaJmcGtyPZNtsggfM4BBYIMfu/fFK62ZKU0o=
 github.com/containers/libhvee v0.7.1 h1:dWGF5GLq9DZvXo3P8aDp3cNieL5eCaSell4UmeA/jY4=
 github.com/containers/libhvee v0.7.1/go.mod h1:fRKB3AyIqHMvq6xaeYhTpckM2cdoq0oecolyoiuLP7M=
 github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA=
@@ -382,6 +380,8 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/mtrmac/common v0.8.2-0.20241015204126-78c8c087610a h1:xpe1z25rOIfC8CDeWCIB2lCZJcCwW5mKorGXt8PRQCs=
 github.com/mtrmac/common v0.8.2-0.20241015204126-78c8c087610a/go.mod h1:GRT29AbW4CdqEWP/jSxHyUvV5fprOzsCdhsFhqJiU4s=
+github.com/mtrmac/image/v5 v5.0.0-20241016195457-6045533dd9a2 h1:jv0/6AabBWh1KPQPTD9nefFwVvimQA0K+phljh8mNU8=
+github.com/mtrmac/image/v5 v5.0.0-20241016195457-6045533dd9a2/go.mod h1:Ulwf/jQO4757C/uOJyNiZ10dRiXRwVnyhF9wYFno3GQ=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=

diff --git a/test/system/120-load.bats b/test/system/120-load.bats
@@ -183,38 +183,38 @@ verify_icd_and_name() {
     get_icd_and_name
 
     # Save image by ID, and remove it.
-    run_podman save $icd -o $archive
-    run_podman rmi $icd
+    run_podman save $iid -o $archive
+    run_podman rmi $iid
 
     # Load using -i; IID should be preserved, but name is not.
     run_podman load -i $archive
     verify_icd_and_name "<none>:<none>"
 
     # Same as above, using stdin
-    run_podman rmi $icd
+    run_podman rmi $iid
     run_podman load < $archive
     verify_icd_and_name "<none>:<none>"
 
     # Same as above, using stdin but with `podman image load`
-    run_podman rmi $icd
+    run_podman rmi $iid
     run_podman image load < $archive
     verify_icd_and_name "<none>:<none>"
 }
 
 @test "podman load - by image name" {
     get_icd_and_name
     run_podman save $img_name -o $archive
-    run_podman rmi $icd
+    run_podman rmi $iid
 
     # Load using -i; this time the image should be tagged.
     run_podman load -i $archive
     verify_icd_and_name $img_name
-    run_podman rmi $icd
+    run_podman rmi $iid
 
     # Also make sure that `image load` behaves the same.
     run_podman image load -i $archive
     verify_icd_and_name $img_name
-    run_podman rmi $icd
+    run_podman rmi $iid
 
     # Same as above, using stdin
     run_podman load < $archive
@@ -224,7 +224,7 @@ verify_icd_and_name() {
 @test "podman load - from URL" {
     get_icd_and_name
     run_podman save $img_name -o $archive
-    run_podman rmi $icd
+    run_podman rmi $iid
 
     HOST_PORT=$(random_free_port)
     SERVER=http://127.0.0.1:$HOST_PORT

diff --git a/vendor/github.com/containers/image/v5/copy/single.go b/vendor/github.com/containers/image/v5/copy/single.go
diff --git a/vendor/github.com/containers/image/v5/docker/docker_client.go b/vendor/github.com/containers/image/v5/docker/docker_client.go
diff --git a/vendor/github.com/containers/image/v5/docker/errors.go b/vendor/github.com/containers/image/v5/docker/errors.go
diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/stubs/put_blob_partial.go b/vendor/github.com/containers/image/v5/internal/imagedestination/stubs/put_blob_partial.go
diff --git a/vendor/github.com/containers/image/v5/internal/private/private.go b/vendor/github.com/containers/image/v5/internal/private/private.go
diff --git a/vendor/github.com/containers/image/v5/oci/archive/oci_dest.go b/vendor/github.com/containers/image/v5/oci/archive/oci_dest.go
diff --git a/vendor/github.com/containers/image/v5/openshift/openshift_dest.go b/vendor/github.com/containers/image/v5/openshift/openshift_dest.go
diff --git a/vendor/github.com/containers/image/v5/pkg/blobcache/dest.go b/vendor/github.com/containers/image/v5/pkg/blobcache/dest.go
diff --git a/vendor/github.com/containers/image/v5/signature/policy_config.go b/vendor/github.com/containers/image/v5/signature/policy_config.go
diff --git a/vendor/github.com/containers/image/v5/storage/storage_dest.go b/vendor/github.com/containers/image/v5/storage/storage_dest.go
diff --git a/vendor/github.com/containers/image/v5/types/types.go b/vendor/github.com/containers/image/v5/types/types.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -242,7 +242,7 @@ github.com/containers/conmon/runner/config
 # github.com/containers/gvisor-tap-vsock v0.7.5
 ## explicit; go 1.21
 github.com/containers/gvisor-tap-vsock/pkg/types
-# github.com/containers/image/v5 v5.32.3-0.20240923171149-9e1153a28c46
+# github.com/containers/image/v5 v5.32.3-0.20240923171149-9e1153a28c46 => github.com/mtrmac/image/v5 v5.0.0-20241016195457-6045533dd9a2
 ## explicit; go 1.22.6
 github.com/containers/image/v5/copy
 github.com/containers/image/v5/directory
@@ -1385,3 +1385,4 @@ tags.cncf.io/container-device-interface/pkg/parser
 ## explicit; go 1.19
 tags.cncf.io/container-device-interface/specs-go
 # github.com/containers/common => github.com/mtrmac/common v0.8.2-0.20241015204126-78c8c087610a
+# github.com/containers/image/v5 => github.com/mtrmac/image/v5 v5.0.0-20241016195457-6045533dd9a2