Skip to content

Commit

Permalink
nydusify: forcibly enabled --oci option when --oci-ref be enabled
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
imeoer authored and 泰友 committed Mar 23, 2023
1 parent 37e382c commit 3fb31b9
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions contrib/nydusify/cmd/nydusify.go
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,12 @@ func main() {
docker2OCI = true
}

// Forcibly enable `--oci` option when `--oci-ref` be enabled.
if c.Bool("oci-ref") {
logrus.Warn("forcibly enabled `--oci` option when `--oci-ref` be enabled")
docker2OCI = true
}

opt := converter.Opt{
WorkDir: c.String("work-dir"),
NydusImagePath: c.String("nydus-image"),
Expand Down

0 comments on commit 3fb31b9

Please sign in to comment.