Support specify ipv4 addr for container

Author: jasonjoo2010

cluster/calcium/create.go

@@ -198,16 +198,16 @@ func (c *Calcium) doCreateAndStartContainer(
 	// connect virtualizaion to network
 	// if network manager uses plugin, then connect must be called before container starts
 	// 如果有 networks 的配置，这里的 networkMode 就为 none 了
-	if len(opts.Networks) > 0 {
-		ctx := utils.ContextWithDockerEngine(ctx, node.Engine)
-		// need to ensure all networks are correctly connected
-		for networkID, ipv4 := range opts.Networks {
-			if err = c.network.ConnectToNetwork(ctx, containerCreated.ID, networkID, ipv4); err != nil {
-				createContainerMessage.Error = err
-				return createContainerMessage
-			}
-		}
-	}
+//	if len(opts.Networks) > 0 {
+//		ctx := utils.ContextWithDockerEngine(ctx, node.Engine)
+//		// need to ensure all networks are correctly connected
+//		for networkID, ipv4 := range opts.Networks {
+//			if err = c.network.ConnectToNetwork(ctx, containerCreated.ID, networkID, ipv4); err != nil {
+//				createContainerMessage.Error = err
+//				return createContainerMessage
+//			}
+//		}
+//	}
 
 	// Copy data to container
 	if len(opts.Data) > 0 {
@@ -347,6 +347,7 @@ func (c *Calcium) doMakeContainerOptions(index int, cpumap types.CPUMap, opts *t
 	// 没有 networks 的时候用 networkmode 的值
 	// 有 networks 的时候一律用 none 作为默认 mode
 	config.Network = opts.NetworkMode
+	config.Networks = opts.Networks
 	if len(opts.Networks) > 0 {
 		for name := range opts.Networks {
 			config.Network = name

engine/docker/container.go

@@ -91,8 +91,20 @@ func (e *Engine) VirtualizationCreate(ctx context.Context, opts *enginetypes.Vir
 		hostConfig.PortBindings = portMapping
 		config.ExposedPorts = exposePorts
 	}
+	
+	networkConfig := &dockernetwork.NetworkingConfig{}
+	if len(opts.Networks) > 0 {
+		networkConfig.EndpointsConfig = map[string]*dockernetwork.EndpointSettings{}
+		for networkID, ipv4 := range opts.Networks {
+			networkConfig.EndpointsConfig[networkID] = &dockernetwork.EndpointSettings {
+				IPAMConfig: &dockernetwork.EndpointIPAMConfig {
+					IPv4Address: ipv4,
+				},
+			}
+		}
+	}
 
-	containerCreated, err := e.client.ContainerCreate(ctx, config, hostConfig, &dockernetwork.NetworkingConfig{}, opts.Name)
+	containerCreated, err := e.client.ContainerCreate(ctx, config, hostConfig, networkConfig, opts.Name)
 	r.Name = opts.Name
 	r.ID = containerCreated.ID
 	return r, err

engine/types/virtualization.go

@@ -39,6 +39,7 @@ type VirtualizationCreateOptions struct {
 	RestartRetryCount int
 
 	Network         string
+	Networks        map[string]string
 	NetworkDisabled bool
 
 	Binds   []string