Merge pull request #2517 from thaJeztah/compose_file_build_extra_hosts

compose: add build.extra_hosts to v3.9 schema
docker · May 11, 2020 · ce2a9fa · ce2a9fa
2 parents f327b97 + 0c5f97e
commit ce2a9fa
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 39 deletions.
diff --git a/cli/compose/loader/full-example.yml b/cli/compose/loader/full-example.yml
@@ -13,6 +13,9 @@ services:
       cache_from:
         - foo
         - bar
+      extra_hosts:
+        - "ipv4.example.com:127.0.0.1"
+        - "ipv6.example.com:::1"
       labels: [FOO=BAR]
 
 

diff --git a/cli/compose/loader/full-struct_test.go b/cli/compose/loader/full-struct_test.go
@@ -39,7 +39,11 @@ func services(workingDir, homeDir string) []types.ServiceConfig {
 				Target:     "foo",
 				Network:    "foo",
 				CacheFrom:  []string{"foo", "bar"},
-				Labels:     map[string]string{"FOO": "BAR"},
+				ExtraHosts: types.HostsList{
+					"ipv4.example.com:127.0.0.1",
+					"ipv6.example.com:::1",
+				},
+				Labels: map[string]string{"FOO": "BAR"},
 			},
 			CapAdd:       []string{"ALL"},
 			CapDrop:      []string{"NET_ADMIN", "SYS_ADMIN"},
@@ -526,6 +530,9 @@ services:
       cache_from:
       - foo
       - bar
+      extra_hosts:
+      - ipv4.example.com:127.0.0.1
+      - ipv6.example.com:::1
       network: foo
       target: foo
     cap_add:
@@ -998,6 +1005,10 @@ func fullExampleJSON(workingDir string) string {
           "foo",
           "bar"
         ],
+        "extra_hosts": [
+          "ipv4.example.com:127.0.0.1",
+          "ipv6.example.com:::1"
+        ],
         "network": "foo",
         "target": "foo"
       },

diff --git a/cli/compose/schema/bindata.go b/cli/compose/schema/bindata.go
diff --git a/cli/compose/schema/data/config_schema_v3.9.json b/cli/compose/schema/data/config_schema_v3.9.json
@@ -88,7 +88,8 @@
                 "cache_from": {"$ref": "#/definitions/list_of_strings"},
                 "network": {"type": "string"},
                 "target": {"type": "string"},
-                "shm_size": {"type": ["integer", "string"]}
+                "shm_size": {"type": ["integer", "string"]},
+                "extra_hosts": {"$ref": "#/definitions/list_or_dict"}
               },
               "additionalProperties": false
             }

diff --git a/cli/compose/types/types.go b/cli/compose/types/types.go
@@ -221,6 +221,7 @@ type BuildConfig struct {
 	Args       MappingWithEquals `yaml:",omitempty" json:"args,omitempty"`
 	Labels     Labels            `yaml:",omitempty" json:"labels,omitempty"`
 	CacheFrom  StringList        `mapstructure:"cache_from" yaml:"cache_from,omitempty" json:"cache_from,omitempty"`
+	ExtraHosts HostsList         `mapstructure:"extra_hosts" yaml:"extra_hosts,omitempty" json:"extra_hosts,omitempty"`
 	Network    string            `yaml:",omitempty" json:"network,omitempty"`
 	Target     string            `yaml:",omitempty" json:"target,omitempty"`
 }