docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-07-10 05:27:07 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #2093 from jsternberg/rootless-init-config

Browse Source 
driver: docker-container driver uses --config correctly in rootless mode
This commit is contained in:
Tõnis Tiigi
2023-11-13 09:10:07 -08:00
committed by GitHub
parent ff8bca206b 3f423468df
commit 0408f3ac45
1 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
driver/docker-container/driver.go
View File

@ -33,7 +33,8 @@ import (
) )
const ( const (
volumeStateSuffix = "_state" volumeStateSuffix = "_state"
buildkitdConfigFile = "buildkitd.toml"
) )
type Driver struct { type Driver struct {
@ -111,9 +112,7 @@ func (d *Driver) create(ctx context.Context, l progress.SubLogger) error {
Image: imageName, Image: imageName,
Env: d.env, Env: d.env,
} }
if d.InitConfig.BuildkitFlags != nil { cfg.Cmd = getBuildkitFlags(d.InitConfig)
cfg.Cmd = d.InitConfig.BuildkitFlags
}
useInit := true // let it cleanup exited processes created by BuildKit's container API useInit := true // let it cleanup exited processes created by BuildKit's container API
return l.Wrap("creating container "+d.Name, func() error { return l.Wrap("creating container "+d.Name, func() error {
@ -250,7 +249,9 @@ func (d *Driver) copyToContainer(ctx context.Context, files map[string][]byte) e
return err return err
} }
defer srcArchive.Close() defer srcArchive.Close()
return d.DockerAPI.CopyToContainer(ctx, d.Name, "/", srcArchive, dockertypes.CopyToContainerOptions{})
baseDir := path.Dir(confutil.DefaultBuildKitConfigDir)
return d.DockerAPI.CopyToContainer(ctx, d.Name, baseDir, srcArchive, dockertypes.CopyToContainerOptions{})
} }
func (d *Driver) exec(ctx context.Context, cmd []string) (string, net.Conn, error) { func (d *Driver) exec(ctx context.Context, cmd []string) (string, net.Conn, error) {
@ -466,15 +467,34 @@ func writeConfigFiles(m map[string][]byte) (_ string, err error) {
os.RemoveAll(tmpDir) os.RemoveAll(tmpDir)
} }
}() }()
configDir := filepath.Base(confutil.DefaultBuildKitConfigDir)
for f, dt := range m { for f, dt := range m {
f = path.Join(confutil.DefaultBuildKitConfigDir, f) p := filepath.Join(tmpDir, configDir, f)
p := filepath.Join(tmpDir, f) if err := os.MkdirAll(filepath.Dir(p), 0755); err != nil {
if err := os.MkdirAll(filepath.Dir(p), 0700); err != nil {
return "", err return "", err
} }
if err := os.WriteFile(p, dt, 0600); err != nil { if err := os.WriteFile(p, dt, 0644); err != nil {
return "", err return "", err
} }
} }
return tmpDir, nil return tmpDir, nil
} }
func getBuildkitFlags(initConfig driver.InitConfig) []string {
flags := initConfig.BuildkitFlags
if _, ok := initConfig.Files[buildkitdConfigFile]; ok {
// There's no way for us to determine the appropriate default configuration
// path and the default path can vary depending on if the image is normal
// or rootless.
//
// In order to ensure that --config works, copy to a specific path and
// specify the location.
//
// This should be appended before the user-specified arguments
// so that this option could be overwritten by the user.
newFlags := make([]string, 0, len(flags)+2)
newFlags = append(newFlags, "--config", path.Join("/etc/buildkit", buildkitdConfigFile))
flags = append(newFlags, flags...)
}
return flags
}