Merge pull request #814 from crazy-max/cgroup-parent

build: add cgroup-parent support
docker · Oct 28, 2021 · 5e25191 · 5e25191
2 parents 81cf206 + dd15969
commit 5e25191
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 43 deletions.
diff --git a/build/build.go b/build/build.go
@@ -49,28 +49,26 @@ var (
 )
 
 type Options struct {
-	Inputs      Inputs
-	Tags        []string
-	Labels      map[string]string
-	BuildArgs   map[string]string
-	Pull        bool
-	ImageIDFile string
-	ExtraHosts  []string
-	NetworkMode string
-	ShmSize     opts.MemBytes
-	Ulimits     *opts.UlimitOpt
-
-	NoCache   bool
-	Target    string
-	Platforms []specs.Platform
-	Exports   []client.ExportEntry
-	Session   []session.Attachable
-
-	CacheFrom []client.CacheOptionsEntry
-	CacheTo   []client.CacheOptionsEntry
-
-	Allow []entitlements.Entitlement
-	// DockerTarget
+	Inputs Inputs
+
+	Allow        []entitlements.Entitlement
+	BuildArgs    map[string]string
+	CacheFrom    []client.CacheOptionsEntry
+	CacheTo      []client.CacheOptionsEntry
+	CgroupParent string
+	Exports      []client.ExportEntry
+	ExtraHosts   []string
+	ImageIDFile  string
+	Labels       map[string]string
+	NetworkMode  string
+	NoCache      bool
+	Platforms    []specs.Platform
+	Pull         bool
+	Session      []session.Attachable
+	ShmSize      opts.MemBytes
+	Tags         []string
+	Target       string
+	Ulimits      *opts.UlimitOpt
 }
 
 type Inputs struct {
@@ -402,6 +400,10 @@ func toSolveOpt(ctx context.Context, d driver.Driver, multiDriver bool, opt Opti
 		AllowedEntitlements: opt.Allow,
 	}
 
+	if opt.CgroupParent != "" {
+		so.FrontendAttrs["cgroup-parent"] = opt.CgroupParent
+	}
+
 	if v, ok := opt.BuildArgs["BUILDKIT_MULTI_PLATFORM"]; ok {
 		if v, _ := strconv.ParseBool(v); v {
 			so.FrontendAttrs["multi-platform"] = "true"

diff --git a/commands/build.go b/commands/build.go
@@ -33,23 +33,24 @@ type buildOptions struct {
 	contextPath    string
 	dockerfileName string
 
-	allow       []string
-	buildArgs   []string
-	cacheFrom   []string
-	cacheTo     []string
-	extraHosts  []string
-	imageIDFile string
-	labels      []string
-	networkMode string
-	outputs     []string
-	platforms   []string
-	quiet       bool
-	secrets     []string
-	shmSize     dockeropts.MemBytes
-	ssh         []string
-	tags        []string
-	target      string
-	ulimits     *dockeropts.UlimitOpt
+	allow        []string
+	buildArgs    []string
+	cacheFrom    []string
+	cacheTo      []string
+	cgroupParent string
+	extraHosts   []string
+	imageIDFile  string
+	labels       []string
+	networkMode  string
+	outputs      []string
+	platforms    []string
+	quiet        bool
+	secrets      []string
+	shmSize      dockeropts.MemBytes
+	ssh          []string
+	tags         []string
+	target       string
+	ulimits      *dockeropts.UlimitOpt
 	commonOptions
 }
 
@@ -287,6 +288,9 @@ func buildCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 
 	flags.StringArrayVar(&options.cacheTo, "cache-to", []string{}, "Cache export destinations (e.g., `user/app:cache`, `type=local,dest=path/to/dir`)")
 
+	flags.StringVar(&options.cgroupParent, "cgroup-parent", "", "Optional parent cgroup for the container")
+	flags.SetAnnotation("cgroup-parent", "docs.external.url", []string{"https://docs.docker.com/engine/reference/commandline/build/#use-a-custom-parent-cgroup---cgroup-parent"})
+
 	flags.StringVarP(&options.dockerfileName, "file", "f", "", "Name of the Dockerfile (default: `PATH/Dockerfile`)")
 	flags.SetAnnotation("file", "docs.external.url", []string{"https://docs.docker.com/engine/reference/commandline/build/#specify-a-dockerfile--f"})
 
@@ -326,10 +330,6 @@ func buildCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 	var ignoreBool bool
 	var ignoreInt int64
 
-	flags.StringVar(&ignore, "cgroup-parent", "", "Optional parent cgroup for the container")
-	flags.MarkHidden("cgroup-parent")
-	//flags.SetAnnotation("cgroup-parent", "flag-warn", []string{"cgroup-parent is not implemented."})
-
 	flags.BoolVar(&ignoreBool, "compress", false, "Compress the build context using gzip")
 	flags.MarkHidden("compress")
 

diff --git a/docs/reference/buildx_build.md b/docs/reference/buildx_build.md
@@ -21,6 +21,7 @@ Start a build
 | `--builder string` | Override the configured builder instance |
 | [`--cache-from stringArray`](#cache-from) | External cache sources (e.g., `user/app:cache`, `type=local,src=path/to/dir`) |
 | [`--cache-to stringArray`](#cache-to) | Cache export destinations (e.g., `user/app:cache`, `type=local,dest=path/to/dir`) |
+| [`--cgroup-parent string`](https://docs.docker.com/engine/reference/commandline/build/#use-a-custom-parent-cgroup---cgroup-parent) | Optional parent cgroup for the container |
 | [`-f`](https://docs.docker.com/engine/reference/commandline/build/#specify-a-dockerfile--f), [`--file string`](https://docs.docker.com/engine/reference/commandline/build/#specify-a-dockerfile--f) | Name of the Dockerfile (default: `PATH/Dockerfile`) |
 | `--iidfile string` | Write the image ID to the file |
 | `--label stringArray` | Set metadata for an image |