fix(sync): fix sync on demand with docker library (#1065)

Signed-off-by: Petu Eusebiu <peusebiu@cisco.com>

Makefile

@@ -287,11 +287,13 @@ test-cloud-only-verbose: binary check-skopeo $(BATS)
 test-bats-sync: EXTENSIONS=sync
 test-bats-sync: binary binary-minimal check-skopeo $(BATS) $(NOTATION) $(COSIGN)
 	$(BATS) --trace --print-output-on-failure test/blackbox/sync.bats
+	$(BATS) --trace --print-output-on-failure test/blackbox/sync_docker.bats
 	
 .PHONY: test-bats-sync-verbose
 test-bats-sync-verbose: EXTENSIONS=sync
 test-bats-sync-verbose: binary binary-minimal check-skopeo $(BATS) $(NOTATION) $(COSIGN)
 	$(BATS) --trace -t -x -p --verbose-run --print-output-on-failure --show-output-of-passing-tests test/blackbox/sync.bats
+	$(BATS) --trace -t -x -p --verbose-run --print-output-on-failure --show-output-of-passing-tests test/blackbox/sync_docker.bats
 
 .PHONY: test-bats-cve
 test-bats-cve: EXTENSIONS=search

pkg/extensions/sync/utils.go

@@ -18,6 +18,7 @@ import (
 	glob "github.com/bmatcuk/doublestar/v4"
 	"github.com/containers/image/v5/docker"
 	"github.com/containers/image/v5/docker/reference"
+	"github.com/containers/image/v5/manifest"
 	"github.com/containers/image/v5/oci/layout"
 	"github.com/containers/image/v5/types"
 	guuid "github.com/gofrs/uuid"
@@ -678,7 +679,8 @@ func descriptorEqual(desc1, desc2 ispec.Descriptor) bool {
 
 func isSupportedMediaType(mediaType string) bool {
 	return mediaType == ispec.MediaTypeImageIndex ||
-		mediaType == ispec.MediaTypeImageManifest
+		mediaType == ispec.MediaTypeImageManifest ||
+		mediaType == manifest.DockerV2ListMediaType
 }
 
 func getImageRefManifest(ctx context.Context, upstreamCtx *types.SystemContext, imageRef types.ImageReference,

test/blackbox/sync_docker.bats

@@ -0,0 +1,69 @@
+load helpers_sync
+
+function setup_file() {
+    # Verify prerequisites are available
+    if ! verify_prerequisites; then
+        exit 1
+    fi
+
+    # Setup zot server
+    local zot_root_dir=${BATS_FILE_TMPDIR}/zot
+    local zot_sync_ondemand_config_file=${BATS_FILE_TMPDIR}/zot_sync_ondemand_config.json
+
+    mkdir -p ${zot_root_dir}
+
+    cat >${zot_sync_ondemand_config_file} <<EOF
+{
+    "distSpecVersion": "1.0.1",
+    "storage": {
+        "rootDirectory": "${zot_root_dir}"
+    },
+    "http": {
+        "address": "0.0.0.0",
+        "port": "8090"
+    },
+    "log": {
+        "level": "debug"
+    },
+    "extensions": {
+        "sync": {
+            "registries": [
+                {
+                    "urls": [
+                        "https://docker.io/library"
+                    ],
+                    "onDemand": true,
+                    "tlsVerify": true
+                }
+            ]
+        }
+    }
+}
+EOF
+
+    setup_zot_file_level ${zot_sync_ondemand_config_file}
+    wait_zot_reachable "http://127.0.0.1:8090/v2/_catalog"
+}
+
+function teardown_file() {
+    local zot_root_dir=${BATS_FILE_TMPDIR}/zot
+
+    teardown_zot_file_level
+    rm -rf ${zot_root_dir}
+}
+
+# sync image
+@test "sync docker image on demand" {
+    run skopeo --insecure-policy copy --src-tls-verify=false \
+        docker://127.0.0.1:8090/registry \
+        oci:${TEST_DATA_DIR}
+    [ "$status" -eq 0 ]
+
+
+    run curl http://127.0.0.1:8090/v2/_catalog
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.repositories[]') = '"registry"' ]
+    run curl http://127.0.0.1:8090/v2/registry/tags/list
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.tags[]') = '"latest"' ]
+}