Skip to content

Add check of snapshotter when sharing images #936

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

Merged
merged 1 commit into from
Mar 25, 2022
Merged

Add check of snapshotter when sharing images #936

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions cmd/nerdctl/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func getBuildkitHost(cmd *cobra.Command) (string, error) {
return buildkitutil.GetBuildkitHost(ns)
}

func isImageSharable(buildkitHost string, namespace, uuid string) (bool, error) {
func isImageSharable(buildkitHost string, namespace, uuid, snapshotter string) (bool, error) {
labels, err := buildkitutil.GetWorkerLabels(buildkitHost)
if err != nil {
return false, err
Expand All @@ -111,7 +111,11 @@ func isImageSharable(buildkitHost string, namespace, uuid string) (bool, error)
if !ok {
return false, nil
}
return executor == "containerd" && containerdUUID == uuid && containerdNamespace == namespace, nil
workerSnapshotter, ok := labels["org.mobyproject.buildkit.worker.snapshotter"]
if !ok {
return false, nil
}
return executor == "containerd" && containerdUUID == uuid && containerdNamespace == namespace && workerSnapshotter == snapshotter, nil
}

func buildAction(cmd *cobra.Command, args []string) error {
Expand Down Expand Up @@ -235,7 +239,11 @@ func generateBuildctlArgs(cmd *cobra.Command, buildkitHost string, platform, arg
if err != nil {
return "", nil, false, "", nil, err
}
sharable, err := isImageSharable(buildkitHost, ns, info.UUID)
snapshotter, err := cmd.Flags().GetString("snapshotter")
if err != nil {
return "", nil, false, "", nil, err
}
sharable, err := isImageSharable(buildkitHost, ns, info.UUID, snapshotter)
if err != nil {
return "", nil, false, "", nil, err
}
Expand Down