diff --git a/client-groovy4/build.gradle.kts b/client-groovy4/build.gradle.kts index a526c7dd..f40127fe 100644 --- a/client-groovy4/build.gradle.kts +++ b/client-groovy4/build.gradle.kts @@ -68,7 +68,7 @@ dependencies { implementation(it) { version { strictly("[1.6,3)") - prefer("2.0.20") + prefer("2.0.21") } } } diff --git a/client/build.gradle.kts b/client/build.gradle.kts index 5a69b3d3..5f0772a7 100644 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -68,7 +68,7 @@ dependencies { implementation(it) { version { strictly("[1.6,3)") - prefer("2.0.20") + prefer("2.0.21") } } } diff --git a/explore/build.gradle.kts b/explore/build.gradle.kts index 9768d912..ffad3b73 100644 --- a/explore/build.gradle.kts +++ b/explore/build.gradle.kts @@ -33,7 +33,7 @@ dependencies { implementation(it) { version { strictly("[1.6,3)") - prefer("2.0.20") + prefer("2.0.21") } } } diff --git a/integration-test/build.gradle.kts b/integration-test/build.gradle.kts index e98356f2..ce714d7b 100644 --- a/integration-test/build.gradle.kts +++ b/integration-test/build.gradle.kts @@ -69,7 +69,7 @@ dependencies { implementation(it) { version { strictly("[1.6,3)") - prefer("2.0.20") + prefer("2.0.21") } } } diff --git a/integration-test/src/test/groovy/de/gesellix/docker/client/DockerDistributionIntegrationSpec.groovy b/integration-test/src/test/groovy/de/gesellix/docker/client/DockerDistributionIntegrationSpec.groovy index 4252b863..a18285f1 100644 --- a/integration-test/src/test/groovy/de/gesellix/docker/client/DockerDistributionIntegrationSpec.groovy +++ b/integration-test/src/test/groovy/de/gesellix/docker/client/DockerDistributionIntegrationSpec.groovy @@ -21,7 +21,9 @@ class DockerDistributionIntegrationSpec extends Specification { def alpineDescriptor = dockerClient.descriptor("alpine:edge") then: - alpineDescriptor.content.descriptor.mediaType == "application/vnd.docker.distribution.manifest.list.v2+json" + alpineDescriptor.content.descriptor.mediaType in [ + "application/vnd.docker.distribution.manifest.list.v2+json", + "application/vnd.oci.image.index.v1+json"] alpineDescriptor.content.descriptor.digest =~ "sha256:[a-f\\d]{64}" alpineDescriptor.content.descriptor.propertySize =~ "\\d{3,4}" alpineDescriptor.content.platforms.find { it.architecture == "amd64" && it.os == "linux" } @@ -33,7 +35,9 @@ class DockerDistributionIntegrationSpec extends Specification { def debianDescriptor = dockerClient.descriptor("debian:latest") then: - debianDescriptor.content.descriptor.mediaType == "application/vnd.docker.distribution.manifest.list.v2+json" + debianDescriptor.content.descriptor.mediaType in [ + "application/vnd.docker.distribution.manifest.list.v2+json", + "application/vnd.oci.image.index.v1+json"] debianDescriptor.content.descriptor.digest =~ "sha256:[a-f\\d]{64}" debianDescriptor.content.descriptor.propertySize =~ "\\d{3,4}" debianDescriptor.content.platforms.find { it.architecture == "amd64" && it.os == "linux" }