Merge pull request #926 from Zheaoli/manjusaka/support-852

Support assign static IP address in `compose up` by using ipv4_address field

Author: AkihiroSuda

cmd/nerdctl/compose_up_linux_test.go

@@ -24,7 +24,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/containerd/nerdctl/pkg/rootlessutil"
 	"github.com/docker/go-connections/nat"
+	"github.com/sirupsen/logrus"
 
 	"github.com/containerd/nerdctl/pkg/testutil"
 	"github.com/containerd/nerdctl/pkg/testutil/nettestutil"
@@ -154,6 +156,47 @@ COPY index.html /usr/share/nginx/html/index.html
 	assert.Assert(t, strings.Contains(string(respBody), indexHTML))
 }
 
+func TestComposeUpNetWithStaticIP(t *testing.T) {
+	if rootlessutil.IsRootless() {
+		t.Skip("Static IP assignment is not supported rootless mode yet.")
+	}
+	base := testutil.NewBase(t)
+	staticIP := "172.20.0.12"
+	var dockerComposeYAML = fmt.Sprintf(`
+version: '3.1'
+
+services:
+  svc0:
+    image: %s
+    networks:
+      net0:
+        ipv4_address: %s
+
+networks:
+  net0:
+    ipam:
+      config:
+        - subnet: 172.20.0.0/24
+`, testutil.NginxAlpineImage, staticIP)
+	comp := testutil.NewComposeDir(t, dockerComposeYAML)
+	defer comp.CleanUp()
+	projectName := comp.ProjectName()
+	t.Logf("projectName=%q", projectName)
+	base.ComposeCmd("-f", comp.YAMLFullPath(), "up", "-d").AssertOK()
+	defer base.ComposeCmd("-f", comp.YAMLFullPath(), "down", "-v").Run()
+
+	svc0 := fmt.Sprintf("%s_svc0_1", projectName)
+	inspectCmd := base.Cmd("inspect", svc0, "--format", "\"{{range .NetworkSettings.Networks}} {{.IPAddress}}{{end}}\"")
+	result := inspectCmd.Run()
+	stdoutContent := result.Stdout() + result.Stderr()
+	assert.Assert(inspectCmd.Base.T, result.ExitCode == 0, stdoutContent)
+	if !strings.Contains(stdoutContent, staticIP) {
+		logrus.Errorf("test failed, the actual container ip is %s", stdoutContent)
+		t.Fail()
+		return
+	}
+}
+
 func TestComposeUpMultiNet(t *testing.T) {
 	base := testutil.NewBase(t)
 

cmd/nerdctl/run_network_linux_test.go

@@ -458,7 +458,7 @@ func TestRunContainerWithStaticIP(t *testing.T) {
 				inspectCmd := base.Cmd("inspect", testContainerName, "--format", "\"{{range .NetworkSettings.Networks}} {{.IPAddress}}{{end}}\"")
 				result := inspectCmd.Run()
 				stdoutContent := result.Stdout() + result.Stderr()
-				assert.Assert(cmd.Base.T, result.ExitCode == 0, stdoutContent)
+				assert.Assert(inspectCmd.Base.T, result.ExitCode == 0, stdoutContent)
 				if !strings.Contains(stdoutContent, tc.ip) {
 					t.Fail()
 					return

pkg/composer/serviceparser/serviceparser.go

@@ -320,16 +320,25 @@ func getRestart(svc compose.ServiceConfig) (string, error) {
 	return restartFlag, nil
 }
 
+type networkNamePair struct {
+	shortNetworkName string
+	fullName         string
+}
+
 // getNetworks returns full network names, e.g., {"compose-wordpress_default"}, or {"host"}
-func getNetworks(project *compose.Project, svc compose.ServiceConfig) ([]string, error) {
-	var fullNames []string // nolint: prealloc
+func getNetworks(project *compose.Project, svc compose.ServiceConfig) ([]networkNamePair, error) {
+	var fullNames []networkNamePair // nolint: prealloc
 
 	if svc.Net != "" {
 		logrus.Warn("net is deprecated, use network_mode or networks")
 		if len(svc.Networks) > 0 {
 			return nil, errors.New("networks and net must not be set together")
 		}
-		fullNames = append(fullNames, svc.Net)
+
+		fullNames = append(fullNames, networkNamePair{
+			fullName:         svc.Net,
+			shortNetworkName: "",
+		})
 	}
 
 	if svc.NetworkMode != "" {
@@ -342,15 +351,21 @@ func getNetworks(project *compose.Project, svc compose.ServiceConfig) ([]string,
 		if strings.Contains(svc.NetworkMode, ":") {
 			return nil, fmt.Errorf("unsupported network_mode: %q", svc.NetworkMode)
 		}
-		fullNames = append(fullNames, svc.NetworkMode)
+		fullNames = append(fullNames, networkNamePair{
+			fullName:         svc.NetworkMode,
+			shortNetworkName: "",
+		})
 	}
 
 	for shortName := range svc.Networks {
 		net, ok := project.Networks[shortName]
 		if !ok {
 			return nil, fmt.Errorf("invalid network %q", shortName)
 		}
-		fullNames = append(fullNames, net.Name)
+		fullNames = append(fullNames, networkNamePair{
+			fullName:         net.Name,
+			shortNetworkName: shortName,
+		})
 	}
 
 	return fullNames, nil
@@ -514,7 +529,12 @@ func newContainer(project *compose.Project, parsed *Service, i int) (*Container,
 		return nil, err
 	} else {
 		for _, net := range networks {
-			c.RunArgs = append(c.RunArgs, "--net="+net)
+			c.RunArgs = append(c.RunArgs, "--net="+net.fullName)
+			if value, ok := svc.Networks[net.shortNetworkName]; ok {
+				if value != nil && value.Ipv4Address != "" {
+					c.RunArgs = append(c.RunArgs, "--ip="+value.Ipv4Address)
+				}
+			}
 		}
 	}