Merge pull request #14136 from Luap99/config-networks

libpod: add c.ConfigWithNetworks()

2 files changed, 21 insertions, 12 deletions

diff --git a/libpod/container.go b/libpod/container.go
index 457b290b7..4b2af02ab 100644
--- a/libpod/container.go
+++ b/libpod/container.go
@@ -281,21 +281,29 @@ type ContainerNetworkDescriptions map[string]int
 // Config accessors
 // Unlocked
 
-// Config returns the configuration used to create the container
+// Config returns the configuration used to create the container.
+// Note that the returned config does not include the actual networks.
+// Use ConfigWithNetworks() if you need them.
 func (c *Container) Config() *ContainerConfig {
 	returnConfig := new(ContainerConfig)
 	if err := JSONDeepCopy(c.config, returnConfig); err != nil {
 		return nil
 	}
+	return returnConfig
+}
 
-	if c != nil {
-		networks, err := c.networks()
-		if err != nil {
-			return nil
-		}
+// Config returns the configuration used to create the container.
+func (c *Container) ConfigWithNetworks() *ContainerConfig {
+	returnConfig := c.Config()
+	if returnConfig == nil {
+		return nil
+	}
 
-		returnConfig.Networks = networks
+	networks, err := c.networks()
+	if err != nil {
+		return nil
 	}
+	returnConfig.Networks = networks
 
 	return returnConfig
 }
@@ -1269,10 +1277,7 @@ func (c *Container) NetworkMode() string {
 
 // Unlocked accessor for networks
 func (c *Container) networks() (map[string]types.PerNetworkOptions, error) {
-	if c != nil && c.runtime != nil && c.runtime.state != nil { // can fail if c.networks is called from the tests
-		return c.runtime.state.GetNetworks(c)
-	}
-	return nil, nil
+	return c.runtime.state.GetNetworks(c)
 }
 
 // getInterfaceByName returns a formatted interface name for a given
diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go
index 63caaa77c..d8008b10b 100644
--- a/pkg/specgen/generate/container.go
+++ b/pkg/specgen/generate/container.go
@@ -3,6 +3,7 @@ package generate
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"os"
 	"strings"
 	"time"
@@ -352,7 +353,10 @@ func ConfigToSpec(rt *libpod.Runtime, specg *specgen.SpecGenerator, contaierID s
 	if err != nil {
 		return nil, nil, err
 	}
-	conf := c.Config()
+	conf := c.ConfigWithNetworks()
+	if conf == nil {
+		return nil, nil, fmt.Errorf("failed to get config for container %s", c.ID())
+	}
 
 	tmpSystemd := conf.Systemd
 	tmpMounts := conf.Mounts