-
Notifications
You must be signed in to change notification settings - Fork 604
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: support build and push with soci
Signed-off-by: Ziwen Ning <ningziwe@amazon.com>
- Loading branch information
Showing
10 changed files
with
274 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,161 @@ | ||
| /* | ||
| Copyright The containerd Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package snapshotterutil | ||
|
|
||
| import ( | ||
| "bufio" | ||
| "os" | ||
| "os/exec" | ||
| "strconv" | ||
|
|
||
| "github.com/containerd/nerdctl/pkg/api/types" | ||
| "github.com/sirupsen/logrus" | ||
| ) | ||
|
|
||
| // CreateSoci creates a SOCI index(`rawRef`) | ||
| func CreateSoci(rawRef string, gOpts types.GlobalCommandOptions, allPlatform bool, platforms []string, sOpts types.SociOptions) error { | ||
| sociExecutable, err := exec.LookPath("soci") | ||
| if err != nil { | ||
| logrus.WithError(err).Error("soci executable not found in path $PATH") | ||
| logrus.Info("you might consider installing soci from: https://github.com/awslabs/soci-snapshotter/blob/main/docs/install.md") | ||
| return err | ||
| } | ||
|
|
||
| sociCmd := exec.Command(sociExecutable) | ||
| sociCmd.Env = os.Environ() | ||
|
|
||
| // #region for global flags. | ||
| if gOpts.Address != "" { | ||
| sociCmd.Args = append(sociCmd.Args, "--address", gOpts.Address) | ||
| } | ||
| if gOpts.Namespace != "" { | ||
| sociCmd.Args = append(sociCmd.Args, "--namespace", gOpts.Namespace) | ||
| } | ||
| // #endregion | ||
|
|
||
| // Global flags have to be put before subcommand before soci upgrades to urfave v3. | ||
| // https://github.com/urfave/cli/issues/1113 | ||
| sociCmd.Args = append(sociCmd.Args, "create") | ||
|
|
||
| if allPlatform { | ||
| sociCmd.Args = append(sociCmd.Args, "--all-platforms", strconv.FormatBool(allPlatform)) | ||
| } | ||
| if len(platforms) > 0 { | ||
| sociCmd.Args = append(sociCmd.Args, "--platform") | ||
| sociCmd.Args = append(sociCmd.Args, platforms...) | ||
| } | ||
| if gOpts.Namespace != "" { | ||
| sociCmd.Args = append(sociCmd.Args, "--namespace", gOpts.Namespace) | ||
| } | ||
| if sOpts.SpanSize != -1 { | ||
| sociCmd.Args = append(sociCmd.Args, "--span-size", strconv.FormatInt(sOpts.SpanSize, 10)) | ||
| } | ||
| if sOpts.MinLayerSize != -1 { | ||
| sociCmd.Args = append(sociCmd.Args, "--min-layer-size", strconv.FormatInt(sOpts.MinLayerSize, 10)) | ||
| } | ||
| // --timeout, --debug, --content-store | ||
| sociCmd.Args = append(sociCmd.Args, rawRef) | ||
|
|
||
| logrus.Debugf("running %s %v", sociExecutable, sociCmd.Args) | ||
|
|
||
| err = processSociIO(sociCmd) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return sociCmd.Wait() | ||
| } | ||
|
|
||
| // PushSoci pushes a SOCI index(`rawRef`) | ||
| // `hostsDirs` are used to resolve image `rawRef` | ||
| func PushSoci(rawRef string, gOpts types.GlobalCommandOptions, allPlatform bool, platforms []string) error { | ||
| logrus.Debugf("pushing SOCI index: %s", rawRef) | ||
|
|
||
| sociExecutable, err := exec.LookPath("soci") | ||
| if err != nil { | ||
| logrus.WithError(err).Error("soci executable not found in path $PATH") | ||
| logrus.Info("you might consider installing soci from: https://github.com/awslabs/soci-snapshotter/blob/main/docs/install.md") | ||
| return err | ||
| } | ||
|
|
||
| sociCmd := exec.Command(sociExecutable) | ||
| sociCmd.Env = os.Environ() | ||
|
|
||
| // #region for global flags. | ||
| if gOpts.Address != "" { | ||
| sociCmd.Args = append(sociCmd.Args, "--address", gOpts.Address) | ||
| } | ||
| if gOpts.Namespace != "" { | ||
| sociCmd.Args = append(sociCmd.Args, "--namespace", gOpts.Namespace) | ||
| } | ||
| // #endregion | ||
|
|
||
| // Global flags have to be put before subcommand before soci upgrades to urfave v3. | ||
| // https://github.com/urfave/cli/issues/1113 | ||
| sociCmd.Args = append(sociCmd.Args, "push") | ||
|
|
||
| if gOpts.InsecureRegistry { | ||
| sociCmd.Args = append(sociCmd.Args, "--skip-verify") | ||
| sociCmd.Args = append(sociCmd.Args, "--plain-http") | ||
| } | ||
| if len(gOpts.HostsDir) > 0 { | ||
| sociCmd.Args = append(sociCmd.Args, "--hosts-dir") | ||
| sociCmd.Args = append(sociCmd.Args, gOpts.HostsDir...) | ||
| } | ||
| sociCmd.Args = append(sociCmd.Args, rawRef) | ||
|
|
||
| logrus.Debugf("running %s %v", sociExecutable, sociCmd.Args) | ||
|
|
||
| err = processSociIO(sociCmd) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return sociCmd.Wait() | ||
| } | ||
|
|
||
| func processSociIO(sociCmd *exec.Cmd) error { | ||
| stdout, err := sociCmd.StdoutPipe() | ||
| if err != nil { | ||
| logrus.Warn("soci: " + err.Error()) | ||
| } | ||
| stderr, err := sociCmd.StderrPipe() | ||
| if err != nil { | ||
| logrus.Warn("soci: " + err.Error()) | ||
| } | ||
| if err := sociCmd.Start(); err != nil { | ||
| // only return err if it's critical (soci start failed.) | ||
| return err | ||
| } | ||
|
|
||
| scanner := bufio.NewScanner(stdout) | ||
| for scanner.Scan() { | ||
| logrus.Info("soci: " + scanner.Text()) | ||
| } | ||
| if err := scanner.Err(); err != nil { | ||
| logrus.Warn("soci: " + err.Error()) | ||
| } | ||
|
|
||
| errScanner := bufio.NewScanner(stderr) | ||
| for errScanner.Scan() { | ||
| logrus.Info("soci: " + errScanner.Text()) | ||
| } | ||
| if err := errScanner.Err(); err != nil { | ||
| logrus.Warn("soci: " + err.Error()) | ||
| } | ||
|
|
||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters