From e9ed5e04e2174ffa5b21bba378c41e8d3d419709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Thu, 16 Jun 2022 02:11:16 +0200 Subject: [PATCH 1/3] Use an updated CI image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... from https://github.com/containers/automation_images/pull/137 . This updates the docker/distribution registry to 2.8.1, allowing it to accept OCI images. Signed-off-by: Miloslav Trmač --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 60f3a5f1a6..fae896cbbb 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -28,7 +28,7 @@ env: UBUNTU_NAME: "ubuntu-2204" # Google-cloud VM Images - IMAGE_SUFFIX: "c5878804328480768" + IMAGE_SUFFIX: "c6340043416535040" FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}" UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}" From 1b5fb465be022b8ba5004f8b6a1199c1690e7909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Mon, 13 Jun 2022 19:13:02 +0200 Subject: [PATCH 2/3] Update for docker/distribution CLI change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miloslav Trmač --- integration/registry.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/integration/registry.go b/integration/registry.go index 89c0bf2cf0..670c2da540 100644 --- a/integration/registry.go +++ b/integration/registry.go @@ -84,12 +84,13 @@ http: return nil, err } - binary := binaryV2 + var cmd *exec.Cmd if schema1 { - binary = binaryV2Schema1 + cmd = exec.Command(binaryV2Schema1, confPath) + } else { + cmd = exec.Command(binaryV2, "serve", confPath) } - cmd := exec.Command(binary, confPath) consumeAndLogOutputs(c, fmt.Sprintf("registry-%s", url), cmd) if err := cmd.Start(); err != nil { if os.IsNotExist(err) { From 38f4b9d0320b1633d1665a88420493b74668af3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Mon, 13 Jun 2022 19:30:13 +0200 Subject: [PATCH 3/3] Enable schema1 support on the test registries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We expect schema1 images to work. Also, docker/distribution doesn't provide useful errors for rejected schema1 images ( https://github.com/distribution/distribution/issues/2925 ), which makes it impractical for Skopeo to automatically convert schema1 to schema2. Signed-off-by: Miloslav Trmač --- integration/registry.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/integration/registry.go b/integration/registry.go index 670c2da540..80d0a7e21c 100644 --- a/integration/registry.go +++ b/integration/registry.go @@ -53,6 +53,9 @@ storage: enabled: true http: addr: %s +compatibility: + schema1: + enabled: true %s` var ( htpasswd string