erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-09-06 23:57:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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
commit e656cf43fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show stats 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

5
test/e2e/system_connection_test.go
View file

@ -276,6 +276,11 @@ var _ = Describe("podman system connection", func() {
Expect(session.Out.Contents()).Should(BeEmpty())
Expect(session.Err.Contents()).Should(BeEmpty())
cmd = exec.Command(podmanTest.RemotePodmanBinary,
"--connection", "QA", "ps")
_, err = Start(cmd, GinkgoWriter, GinkgoWriter)
Expect(err).ToNot(HaveOccurred())
uri := url.URL{
Scheme: "ssh",
User: url.User(u.Username),