bake: multi ips support for extra hosts

Signed-off-by: CrazyMax <[email protected]>

Author: crazy-max

bake/bake.go

@@ -1436,7 +1436,9 @@ func toBuildOpt(t *Target, inp *Input) (*build.Options, error) {
 		if v == nil {
 			continue
 		}
-		extraHosts = append(extraHosts, fmt.Sprintf("%s=%s", k, *v))
+		for _, ip := range strings.Split(*v, ",") {
+			extraHosts = append(extraHosts, fmt.Sprintf("%s=%s", k, ip))
+		}
 	}
 
 	bo := &build.Options{

bake/compose.go

@@ -125,10 +125,8 @@ func ParseCompose(cfgs []composetypes.ConfigFile, envs map[string]string) (*Conf
 			extraHosts := map[string]*string{}
 			if s.Build.ExtraHosts != nil {
 				for k, v := range s.Build.ExtraHosts {
-					for _, ip := range v {
-						vv := ip
-						extraHosts[k] = &vv
-					}
+					vv := strings.Join(v, ",")
+					extraHosts[k] = &vv
 				}
 			}
 

tests/bake.go

@@ -2167,11 +2167,14 @@ func testBakeExtraHosts(t *testing.T, sb integration.Sandbox) {
 	dockerfile := []byte(`
 FROM busybox
 RUN cat /etc/hosts | grep myhost | grep 1.2.3.4
+RUN cat /etc/hosts | grep myhostmulti | grep 162.242.195.81
+RUN cat /etc/hosts | grep myhostmulti | grep 162.242.195.82
 	`)
 	bakefile := []byte(`
 target "default" {
   extra-hosts = {
     myhost = "1.2.3.4"
+    myhostmulti = "162.242.195.81,162.242.195.82"
   }
 }
 `)