github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-22 02:21:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3857 from deitch/fix-network-control

Browse Source 
fix network build modes
This commit is contained in:
Avi Deitcher 2022-10-30 11:15:42 +02:00 committed by GitHub
commit 302c0051ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cmd/linuxkit/pkglib/build.go
View File

@ -282,6 +282,7 @@ func (p Pkg) Build(bos ...BuildOpt) error {
imageBuildOpts.Labels["org.opencontainers.image.revision"] = commit imageBuildOpts.Labels["org.opencontainers.image.revision"] = commit
} }
imageBuildOpts.NetworkMode = "default"
if !p.network { if !p.network {
imageBuildOpts.NetworkMode = "none" imageBuildOpts.NetworkMode = "none"
} }

10
src/cmd/linuxkit/pkglib/docker.go
View File

@ -432,7 +432,15 @@ func (dr *dockerRunnerImpl) build(ctx context.Context, tag, pkg, dockerContext,
} }
// network // network
frontendAttrs["network"] = imageBuildOpts.NetworkMode // translate to net modes understood by buildkit dockerfile frontend
switch imageBuildOpts.NetworkMode {
case "host", "none":
frontendAttrs["force-network-mode"] = imageBuildOpts.NetworkMode
case "default":
frontendAttrs["force-network-mode"] = "sandbox"
default:
return fmt.Errorf("unsupported network mode %q", imageBuildOpts.NetworkMode)
}
for k, v := range imageBuildOpts.Labels { for k, v := range imageBuildOpts.Labels {
frontendAttrs[fmt.Sprintf("label:%s", k)] = v frontendAttrs[fmt.Sprintf("label:%s", k)] = v