1berry/docker-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6018 from thaJeztah/use_api_socket_no_empty

Browse Source 
cli/command/container: --use-api-socket: don't write empty credentials
This commit is contained in:
Paweł Gronowski 2025-04-17 09:52:28 +00:00 committed by GitHub
commit 4d8c241ff0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cli/command/container/create.go
View File

@ -304,16 +304,17 @@ func createContainer(ctx context.Context, dockerCli command.Cli, containerCfg *c
// If the DOCKER_CONFIG env var is already present, we assume the client knows // If the DOCKER_CONFIG env var is already present, we assume the client knows
// what they're doing and don't inject the creds. // what they're doing and don't inject the creds.
if !envvarPresent { if !envvarPresent {
// Set our special little location for the config file.
containerCfg.Config.Env = append(containerCfg.Config.Env,
"DOCKER_CONFIG="+path.Dir(dockerConfigPathInContainer))
// Resolve this here for later, ensuring we error our before we create the container. // Resolve this here for later, ensuring we error our before we create the container.
creds, err := dockerCli.ConfigFile().GetAllCredentials() creds, err := dockerCli.ConfigFile().GetAllCredentials()
if err != nil { if err != nil {
return "", fmt.Errorf("resolving credentials failed: %w", err) return "", fmt.Errorf("resolving credentials failed: %w", err)
} }
apiSocketCreds = creds // inject these after container creation. if len(creds) > 0 {
// Set our special little location for the config file.
containerCfg.Config.Env = append(containerCfg.Config.Env, "DOCKER_CONFIG="+path.Dir(dockerConfigPathInContainer))
apiSocketCreds = creds // inject these after container creation.
}
} }
} }
@ -371,7 +372,7 @@ func createContainer(ctx context.Context, dockerCli command.Cli, containerCfg *c
} }
err = containerIDFile.Write(containerID) err = containerIDFile.Write(containerID)
if options.useAPISocket && apiSocketCreds != nil { if options.useAPISocket && len(apiSocketCreds) > 0 {
// Create a new config file with just the auth. // Create a new config file with just the auth.
newConfig := &configfile.ConfigFile{ newConfig := &configfile.ConfigFile{
AuthConfigs: apiSocketCreds, AuthConfigs: apiSocketCreds,