driver: docs to set buildkitd network mode and add tests#2275
Merged
tonistiigi merged 3 commits intodocker:masterfrom Feb 23, 2024
Merged
driver: docs to set buildkitd network mode and add tests#2275tonistiigi merged 3 commits intodocker:masterfrom
tonistiigi merged 3 commits intodocker:masterfrom
Conversation
crazy-max
force-pushed
the
buildkitd-flags-network-mode
branch
2 times, most recently
from
b273d8d to
655e137
Compare
crazy-max
commented
Feb 22, 2024
tests/build.go
Outdated
Comment on lines
458
to
498
| cases := []struct { | ||
| name string | ||
| args []string | ||
| }{ | ||
| { | ||
| name: "bridge", | ||
| // TODO: use stable buildkit image when v0.13.0 released | ||
| args: []string{"--driver", "docker-container", "--buildkitd-flags=--oci-worker-net=bridge", "--driver-opt", "image=moby/buildkit:master"}, | ||
| }, | ||
| { | ||
| name: "host", | ||
| args: []string{"--driver", "docker-container", "--buildkitd-flags=--oci-worker-net=host"}, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range cases { | ||
| tt := tt | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| out, err := createCmd(sb, withArgs(tt.args...)) | ||
| require.NoError(t, err, out) | ||
| builderName := strings.TrimSpace(out) | ||
| builders = append(builders, builderName) | ||
|
|
||
| cmd := buildxCmd(sb, withArgs("build", fmt.Sprintf("--output=type=local,dest=%s", dir), dir)) | ||
| cmd.Env = append(cmd.Env, "BUILDX_BUILDER="+builderName) | ||
| outb, err := cmd.CombinedOutput() | ||
| require.NoError(t, err, string(outb)) | ||
|
|
||
| dt, err := os.ReadFile(filepath.Join(dir, "ip.txt")) | ||
| require.NoError(t, err) | ||
|
|
||
| ip := net.ParseIP(strings.TrimSpace(string(dt))) | ||
| require.NotNil(t, ip) | ||
|
|
||
| if tt.name == "bridge" { | ||
| _, subnet, err := net.ParseCIDR("10.10.0.0/16") // default subnet for bridge network in buildkit: https://github.com/moby/buildkit/blob/489f5fc6a331530daa8a31fb6ed7ba223df8ecb9/cmd/buildkitd/main.go#L474 | ||
| require.NoError(t, err) | ||
| require.True(t, subnet.Contains(ip)) | ||
| } | ||
| }) | ||
| } |
Member
Author
There was a problem hiding this comment.
@tonistiigi I use this kind of test cases to check the behavior to avoid this issue encountered in #2270 (comment)
Member
There was a problem hiding this comment.
I guess this should be fine but the case I thought is to compare the values of host and bridge, to make sure bridge was applied and we don't get the default host even when the request did not set --network.
So instead of two buildkitd's with different network config, only one buildkitd with bridge mode and then test that in this buildkitd with --network host and without it provides a different ip/interfaces.
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
Member
Author
There was a problem hiding this comment.
Updated test and vendored buildkit as well to grab moby/buildkit#4676
crazy-max
commented
Feb 22, 2024
crazy-max
force-pushed
the
buildkitd-flags-network-mode
branch
5 times, most recently
from
9364a74 to
6733f35
Compare
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
full diff: moby/buildkit@8e3fe35...d6e1426 Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
crazy-max
force-pushed
the
buildkitd-flags-network-mode
branch
from
6733f35 to
aa518f9
Compare
tonistiigi
approved these changes
Feb 23, 2024
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fixes #2256
follow-up #2270 (comment) and closes #2270
needs #2268
This is an alternative to #2270 to document how to set BuildKit daemon network mode using
--buildkitd-flagsinstead of introducing a new flag.