1 files changed, 20 insertions, 1 deletions
diff --git a/libpod/container_validate.go b/libpod/container_validate.go
index b78168cd1..fa809436e 100644
--- a/libpod/container_validate.go
+++ b/libpod/container_validate.go
@@ -88,7 +88,7 @@ func (c *Container) validate() error {
 		return errors.Wrapf(define.ErrInvalidArg, "cannot add to /etc/hosts if using image's /etc/hosts")
 	}
 
-	// Check named volume and overlay volumes destination conflits
+	// Check named volume, overlay volume and image volume destination conflits
 	destinations := make(map[string]bool)
 	for _, vol := range c.config.NamedVolumes {
 		// Don't check if they already exist.
@@ -106,6 +106,25 @@ func (c *Container) validate() error {
 		}
 		destinations[vol.Dest] = true
 	}
+	for _, vol := range c.config.ImageVolumes {
+		// Don't check if they already exist.
+		// If they don't we will automatically create them.
+		if _, ok := destinations[vol.Dest]; ok {
+			return errors.Wrapf(define.ErrInvalidArg, "two volumes found with destination %s", vol.Dest)
+		}
+		destinations[vol.Dest] = true
+	}
+
+	// Check that networks and network aliases match up.
+	ctrNets := make(map[string]bool)
+	for _, net := range c.config.Networks {
+		ctrNets[net] = true
+	}
+	for net := range c.config.NetworkAliases {
+		if _, ok := ctrNets[net]; !ok {
+			return errors.Wrapf(define.ErrNoSuchNetwork, "container tried to set network aliases for network %s but is not connected to the network", net)
+		}
+	}
 
 	return nil
 }