opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-25 02:04:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16328 from cdoern/config

Browse Source 
fix connection usage with containers.conf
This commit is contained in:
OpenShift Merge Robot
2022-11-14 12:46:03 +00:00
committed by GitHub
parent bd73050ad2 69d737ef15
commit e656cf43fe
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/root.go
View File

@ -198,6 +198,8 @@ func persistentPreRunE(cmd *cobra.Command, args []string) error {
if contextConn != nil && contextConn.Changed {
return fmt.Errorf("use of --connection and --context at the same time is not allowed")
}
// need to give our blank containers.conf all of the service destinations if we are using one.
podmanConfig.ContainersConf.Engine.ServiceDestinations = podmanConfig.ContainersConfDefaultsRO.Engine.ServiceDestinations
podmanConfig.ContainersConf.Engine.ActiveService = conn.Value.String()
if err := setupConnection(); err != nil {
return err