public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: resolve integration test issue issue where container-diff cannot pull OCI images properly from registry (#2918)

This commit is contained in:
Aaron Prindle 2023-12-19 08:16:03 -08:00 committed by GitHub
parent a946b82f22
commit a5456d31ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
integration/integration_test.go
View File

@ -1077,6 +1077,21 @@ func meetsRequirements() bool {
// containerDiff compares the container images image1 and image2.
func containerDiff(t *testing.T, image1, image2 string, flags ...string) []byte {
// workaround for container-diff OCI issue https://github.com/GoogleContainerTools/container-diff/issues/389
if !strings.HasPrefix(image1, daemonPrefix) {
dockerPullCmd := exec.Command("docker", "pull", image1)
out := RunCommand(dockerPullCmd, t)
t.Logf("docker pull cmd output for image1 = %s", string(out))
image1 = daemonPrefix + image1
}
if !strings.HasPrefix(image2, daemonPrefix) {
dockerPullCmd := exec.Command("docker", "pull", image2)
out := RunCommand(dockerPullCmd, t)
t.Logf("docker pull cmd output for image2 = %s", string(out))
image2 = daemonPrefix + image2
}
flags = append([]string{"diff"}, flags...)
flags = append(flags, image1, image2,
"-q", "--type=file", "--type=metadata", "--json")