Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nydusify: fix pulling all platforms of source image #1146

Merged
merged 4 commits into from
Mar 15, 2023
Merged

nydusify: fix pulling all platforms of source image #1146

merged 4 commits into from
Mar 15, 2023

Commits on Mar 15, 2023

  1. nydusify: fix pulling all platforms of source image 

    We should only handle specific platform for pulling by
`platforms.MatchComparer`, otherwise nydusify will pull
the layer data of all platforms for an source image.

Signed-off-by: Yan Song <imeoer@linux.alibaba.com>
    @imeoer
    imeoer committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    0288c9d View commit details
    Browse the repository at this point in the history

  2. nydusify: fix --oci option for convert subcommand 

    The `--oci` option is not working, we make it reverse before,
this patch fix it and keep compatibility with the old option
`--docker-v2-format`.

Signed-off-by: Yan Song <imeoer@linux.alibaba.com>
    @imeoer
    imeoer committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    851fc6d View commit details
    Browse the repository at this point in the history

  3. nydusify: fix unnecessary golang-lint error 

    ```
golangci-lint run
Error: pkg/converter/provider/ported.go:47:64: SA1019: rCtx.ConvertSchema1 is deprecated: use Schema 2 or OCI images. (staticcheck)
	if desc.MediaType == images.MediaTypeDockerSchema1Manifest && rCtx.ConvertSchema1 {
	                                                              ^
Error: pkg/converter/provider/ported.go:20:2: SA1019: "github.com/containerd/containerd/remotes/docker/schema1" is deprecated: use images formatted in Docker Image Manifest v2, Schema 2, or OCI Image Spec v1. (staticcheck)
	"github.com/containerd/containerd/remotes/docker/schema1"
	^
```

Disabled the check, it's unnecessary to check the ported codes.

Signed-off-by: Yan Song <imeoer@linux.alibaba.com>
    @imeoer
    imeoer committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    6e4ceee View commit details
    Browse the repository at this point in the history

  4. nydusify: forcibly enabled --oci option when --oci-ref be enabled 

    We need to forcibly enable `--oci` option for allowing to append
related annotation for zran image, otherwise an error be thrown:

```
merge nydus layers: invalid label containerd.io/snapshot/nydus-ref=: invalid checksum digest format
```

Signed-off-by: Yan Song <imeoer@linux.alibaba.com>
    @imeoer
    imeoer committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    8458bcc View commit details
    Browse the repository at this point in the history