add host support for docker build (#5698)

GoogleContainerTools · Apr 20, 2021 · 6c747fc · 6c747fc
1 parent b455ffd
commit 6c747fc
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 0 deletions.
diff --git a/docs/content/en/schemas/v2beta15.json b/docs/content/en/schemas/v2beta15.json
@@ -1068,6 +1068,18 @@
     },
     "DockerArtifact": {
       "properties": {
+        "addHost": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array",
+          "description": "add host.",
+          "x-intellij-html-description": "add host.",
+          "default": "[]",
+          "examples": [
+            "[\"host1:ip1\", \"host2:ip2\"]"
+          ]
+        },
         "buildArgs": {
           "additionalProperties": {
             "type": "string"
@@ -1142,6 +1154,7 @@
         "target",
         "buildArgs",
         "network",
+        "addHost",
         "cacheFrom",
         "noCache",
         "squash",

diff --git a/pkg/skaffold/docker/image.go b/pkg/skaffold/docker/image.go
@@ -212,6 +212,7 @@ func (l *localDaemon) Build(ctx context.Context, out io.Writer, workspace string
 		Target:      a.Target,
 		ForceRemove: l.forceRemove,
 		NetworkMode: strings.ToLower(a.NetworkMode),
+		ExtraHosts:  a.AddHost,
 		NoCache:     a.NoCache,
 	})
 	if err != nil {
@@ -481,6 +482,10 @@ func ToCLIBuildArgs(a *latest.DockerArtifact, evaluatedArgs map[string]*string)
 		}
 	}
 
+	for _, host := range a.AddHost {
+		args = append(args, "--add-host", host)
+	}
+
 	for _, from := range a.CacheFrom {
 		args = append(args, "--cache-from", from)
 	}

diff --git a/pkg/skaffold/docker/image_test.go b/pkg/skaffold/docker/image_test.go
@@ -294,6 +294,13 @@ func TestGetBuildArgs(t *testing.T) {
 			},
 			shouldErr: true,
 		},
+		{
+			description: "add host",
+			artifact: &latest.DockerArtifact{
+				AddHost: []string{"1.gcr.io:127.0.0.1", "2.gcr.io:127.0.0.1"},
+			},
+			want: []string{"--add-host", "1.gcr.io:127.0.0.1", "--add-host", "2.gcr.io:127.0.0.1"},
+		},
 		{
 			description: "cache from",
 			artifact: &latest.DockerArtifact{

diff --git a/pkg/skaffold/schema/latest/config.go b/pkg/skaffold/schema/latest/config.go
@@ -1214,6 +1214,10 @@ type DockerArtifact struct {
 	// `none`: no networking in the container.
 	NetworkMode string `yaml:"network,omitempty"`
 
+	// AddHost lists add host.
+	// For example: `["host1:ip1", "host2:ip2"]`.
+	AddHost []string `yaml:"addHost,omitempty"`
+
 	// CacheFrom lists the Docker images used as cache sources.
 	// For example: `["golang:1.10.1-alpine3.7", "alpine:3.7"]`.
 	CacheFrom []string `yaml:"cacheFrom,omitempty"`