@@ -43,9 +43,19 @@ options:
4343 experimentalcli : false
4444 kubernetes : false
4545 swarm : false
46+ - option : buildkitd-config
47+ value_type : string
48+ description : BuildKit daemon config file
49+ details_url : ' #buildkitd-config'
50+ deprecated : false
51+ hidden : false
52+ experimental : false
53+ experimentalcli : false
54+ kubernetes : false
55+ swarm : false
4656 - option : buildkitd-flags
4757 value_type : string
48- description : Flags for buildkitd daemon
58+ description : BuildKit daemon flags
4959 details_url : ' #buildkitd-flags'
5060 deprecated : false
5161 hidden : false
@@ -55,10 +65,9 @@ options:
5565 swarm : false
5666 - option : config
5767 value_type : string
58- description : BuildKit config file
59- details_url : ' #config'
68+ description : BuildKit daemon config file
6069 deprecated : false
61- hidden : false
70+ hidden : true
6271 experimental : false
6372 experimentalcli : false
6473 kubernetes : false
@@ -153,29 +162,15 @@ examples: |-
153162 eager_beaver
154163 ```
155164
156- ### Specify options for the buildkitd daemon (--buildkitd-flags ) {#buildkitd-flags }
165+ ### Specify a configuration file for the BuildKit daemon (--buildkitd-config ) {#buildkitd-config }
157166
158167 ```text
159- --buildkitd-flags FLAGS
168+ --buildkitd-config FILE
160169 ```
161170
162- Adds flags when starting the buildkitd daemon. They take precedence over the
163- configuration file specified by [`--config`](#config). See `buildkitd --help`
164- for the available flags.
165-
166- ```text
167- --buildkitd-flags '--debug --debugaddr 0.0.0.0:6666'
168- ```
169-
170- ### Specify a configuration file for the buildkitd daemon (--config) {#config}
171-
172- ```text
173- --config FILE
174- ```
175-
176- Specifies the configuration file for the buildkitd daemon to use. The configuration
177- can be overridden by [`--buildkitd-flags`](#buildkitd-flags).
178- See an [example buildkitd configuration file](https://github.com/moby/buildkit/blob/master/docs/buildkitd.toml.md).
171+ Specifies the configuration file for the BuildKit daemon to use. The
172+ configuration can be overridden by [`--buildkitd-flags`](#buildkitd-flags).
173+ See an [example BuildKit daemon configuration file](https://github.com/moby/buildkit/blob/master/docs/buildkitd.toml.md).
179174
180175 If you don't specify a configuration file, Buildx looks for one by default in:
181176
@@ -188,6 +183,36 @@ examples: |-
188183 will be copied into the container under `/etc/buildkit/certs` and configuration
189184 will be updated to reflect that.
190185
186+ ### Specify options for the BuildKit daemon (--buildkitd-flags) {#buildkitd-flags}
187+
188+ ```text
189+ --buildkitd-flags FLAGS
190+ ```
191+
192+ Adds flags when starting the BuildKit daemon. They take precedence over the
193+ configuration file specified by [`--buildkitd-config`](#buildkitd-config). See
194+ `buildkitd --help` for the available flags.
195+
196+ ```text
197+ --buildkitd-flags '--debug --debugaddr 0.0.0.0:6666'
198+ ```
199+
200+ #### BuildKit daemon network mode
201+
202+ You can specify the network mode for the BuildKit daemon with either the
203+ configuration file specified by [`--buildkitd-config`](#buildkitd-config) using the
204+ `worker.oci.networkMode` option or `--oci-worker-net` flag here. The default
205+ value is `auto` and can be one of `bridge`, `cni`, `host`:
206+
207+ ```text
208+ --buildkitd-flags '--oci-worker-net bridge'
209+ ```
210+
211+ > **Note**
212+ >
213+ > Network mode "bridge" is supported since BuildKit v0.13 and will become the
214+ > default in next v0.14.
215+
191216 ### Set the builder driver to use (--driver) {#driver}
192217
193218 ```text
@@ -231,8 +256,8 @@ examples: |-
231256
232257 #### `remote` driver
233258
234- Uses a remote instance of buildkitd over an arbitrary connection. With this
235- driver, you manually create and manage instances of buildkit yourself, and
259+ Uses a remote instance of BuildKit daemon over an arbitrary connection. With
260+ this driver, you manually create and manage instances of buildkit yourself, and
236261 configure buildx to point at it.
237262
238263 Unlike `docker` driver, built images will not automatically appear in
0 commit comments