Adapting REGEXP to docker requirements

According to the `docker` CLI, when running a container with a wrong name, the following output is shown: ``` > docker run -it --name '$$' alpine docker: Error response from daemon: Invalid container name ($$), only [a-zA-Z0-9][a-zA-Z0-9_.-] are allowed. ``` Concatenating `container:` to the expected regular expression `[a-zA-Z0-9][a-zA-Z0-9_.-]` helps us rejecting wrong values.
GoogleContainerTools · Dec 3, 2020 · b2be10f · b2be10f
1 parent d505084
commit b2be10f
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 3 deletions.
diff --git a/pkg/skaffold/schema/validation/validation.go b/pkg/skaffold/schema/validation/validation.go
@@ -189,7 +189,7 @@ func validateDockerNetworkMode(artifacts []*latest.Artifact) (errs []error) {
 		if mode == "none" || mode == "bridge" || mode == "host" {
 			continue
 		}
-		containerRegExp := regexp.MustCompile("container:.+")
+		containerRegExp := regexp.MustCompile("^container:[a-zA-Z0-9][a-zA-Z0-9_.-]*$")
 		if containerRegExp.MatchString(mode) {
 			continue
 		}

diff --git a/pkg/skaffold/schema/validation/validation_test.go b/pkg/skaffold/schema/validation/validation_test.go
@@ -309,13 +309,54 @@ func TestValidateNetworkMode(t *testing.T) {
 			shouldErr: true,
 		},
 		{
-			description: "container's network stack",
+			description: "wrong container's network stack '-not-valid'",
 			artifacts: []*latest.Artifact{
 				{
 					ImageName: "image/container",
 					ArtifactType: latest.ArtifactType{
 						DockerArtifact: &latest.DockerArtifact{
-							NetworkMode: "Container:unique-identifier",
+							NetworkMode: "Container:-not-valid",
+						},
+					},
+				},
+			},
+			shouldErr: true,
+		},
+		{
+			description: "wrong container's network stack 'fussball'",
+			artifacts: []*latest.Artifact{
+				{
+					ImageName: "image/container",
+					ArtifactType: latest.ArtifactType{
+						DockerArtifact: &latest.DockerArtifact{
+							NetworkMode: "Container:fußball",
+						},
+					},
+				},
+			},
+			shouldErr: true,
+		},
+		{
+			description: "container's network stack 'unique'",
+			artifacts: []*latest.Artifact{
+				{
+					ImageName: "image/container",
+					ArtifactType: latest.ArtifactType{
+						DockerArtifact: &latest.DockerArtifact{
+							NetworkMode: "Container:unique",
+						},
+					},
+				},
+			},
+		},
+		{
+			description: "container's network stack 'unique-id.123'",
+			artifacts: []*latest.Artifact{
+				{
+					ImageName: "image/container",
+					ArtifactType: latest.ArtifactType{
+						DockerArtifact: &latest.DockerArtifact{
+							NetworkMode: "Container:unique-id.123",
 						},
 					},
 				},