-
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.
Merge pull request #174 from AkihiroSuda/dev-compose
compose: support build
- Loading branch information
Showing
16 changed files
with
439 additions
and
20 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| 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 main | ||
|
|
||
| import ( | ||
| "github.com/containerd/nerdctl/pkg/composer" | ||
| "github.com/pkg/errors" | ||
| "github.com/urfave/cli/v2" | ||
| ) | ||
|
|
||
| var composeBuildCommand = &cli.Command{ | ||
| Name: "build", | ||
| Usage: "Build or rebuild services", | ||
| Action: composeBuildAction, | ||
| Flags: []cli.Flag{ | ||
| &cli.StringSliceFlag{ | ||
| Name: "build-arg", | ||
| Usage: "Set build-time variables for services.", | ||
| }, | ||
| &cli.BoolFlag{ | ||
| Name: "no-cache", | ||
| Usage: "Do not use cache when building the image.", | ||
| }, | ||
| &cli.StringFlag{ | ||
| Name: "progress", | ||
| Usage: "Set type of progress output", | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| func composeBuildAction(clicontext *cli.Context) error { | ||
| if clicontext.NArg() != 0 { | ||
| // TODO: support specifying service names as args | ||
| return errors.Errorf("arguments %v not supported", clicontext.Args()) | ||
| } | ||
|
|
||
| client, ctx, cancel, err := newClient(clicontext) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| defer cancel() | ||
|
|
||
| c, err := getComposer(clicontext, client) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| bo := composer.BuildOptions{ | ||
| Args: clicontext.StringSlice("build-arg"), | ||
| NoCache: clicontext.Bool("no-cache"), | ||
| Progress: clicontext.String("progress"), | ||
| } | ||
| return c.Build(ctx, bo) | ||
| } |
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,73 @@ | ||
| /* | ||
| 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 composer | ||
|
|
||
| import ( | ||
| "context" | ||
| "os" | ||
|
|
||
| "github.com/compose-spec/compose-go/types" | ||
| "github.com/containerd/nerdctl/pkg/composer/serviceparser" | ||
| "github.com/pkg/errors" | ||
| "github.com/sirupsen/logrus" | ||
| ) | ||
|
|
||
| type BuildOptions struct { | ||
| Args []string // --build-arg strings | ||
| NoCache bool | ||
| Progress string | ||
| } | ||
|
|
||
| func (c *Composer) Build(ctx context.Context, bo BuildOptions) error { | ||
| return c.project.WithServices(nil, func(svc types.ServiceConfig) error { | ||
| ps, err := serviceparser.Parse(c.project, svc) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if ps.Build != nil { | ||
| return c.buildServiceImage(ctx, ps.Image, ps.Build, bo) | ||
| } | ||
| return nil | ||
| }) | ||
| } | ||
|
|
||
| func (c *Composer) buildServiceImage(ctx context.Context, image string, b *serviceparser.Build, bo BuildOptions) error { | ||
| logrus.Infof("Building image %s", image) | ||
|
|
||
| var args []string // nolint: prealloc | ||
| for _, a := range bo.Args { | ||
| args = append(args, "--build-arg="+a) | ||
| } | ||
| if bo.NoCache { | ||
| args = append(args, "--no-cache") | ||
| } | ||
| if bo.Progress != "" { | ||
| args = append(args, "--progress="+bo.Progress) | ||
| } | ||
| args = append(args, b.BuildArgs...) | ||
|
|
||
| cmd := c.createNerdctlCmd(ctx, append([]string{"build"}, args...)...) | ||
| if c.DebugPrintFull { | ||
| logrus.Debugf("Running %v", cmd.Args) | ||
| } | ||
| cmd.Stdout = os.Stdout | ||
| cmd.Stderr = os.Stderr | ||
| if err := cmd.Run(); err != nil { | ||
| return errors.Wrapf(err, "error while building image %s", image) | ||
| } | ||
| 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
Oops, something went wrong.