Merge pull request #14453 from flouthoc/support-additional-build-context-on-remote

remote: enable support for additional `--build-context` on macOS and remote

2 files changed, 85 insertions, 68 deletions

diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go
index f47aa523e..fe17aa1d4 100644
--- a/pkg/api/handlers/compat/images_build.go
+++ b/pkg/api/handlers/compat/images_build.go
@@ -70,68 +70,69 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
 	}()
 
 	query := struct {
-		AddHosts               string   `schema:"extrahosts"`
-		AdditionalCapabilities string   `schema:"addcaps"`
-		AllPlatforms           bool     `schema:"allplatforms"`
-		Annotations            string   `schema:"annotations"`
-		AppArmor               string   `schema:"apparmor"`
-		BuildArgs              string   `schema:"buildargs"`
-		CacheFrom              string   `schema:"cachefrom"`
-		CgroupParent           string   `schema:"cgroupparent"` // nolint
-		Compression            uint64   `schema:"compression"`
-		ConfigureNetwork       string   `schema:"networkmode"`
-		CPPFlags               string   `schema:"cppflags"`
-		CpuPeriod              uint64   `schema:"cpuperiod"`  // nolint
-		CpuQuota               int64    `schema:"cpuquota"`   // nolint
-		CpuSetCpus             string   `schema:"cpusetcpus"` // nolint
-		CpuSetMems             string   `schema:"cpusetmems"` // nolint
-		CpuShares              uint64   `schema:"cpushares"`  // nolint
-		DNSOptions             string   `schema:"dnsoptions"`
-		DNSSearch              string   `schema:"dnssearch"`
-		DNSServers             string   `schema:"dnsservers"`
-		Devices                string   `schema:"devices"`
-		Dockerfile             string   `schema:"dockerfile"`
-		DropCapabilities       string   `schema:"dropcaps"`
-		Envs                   []string `schema:"setenv"`
-		Excludes               string   `schema:"excludes"`
-		ForceRm                bool     `schema:"forcerm"`
-		From                   string   `schema:"from"`
-		HTTPProxy              bool     `schema:"httpproxy"`
-		IdentityLabel          bool     `schema:"identitylabel"`
-		Ignore                 bool     `schema:"ignore"`
-		Isolation              string   `schema:"isolation"`
-		Jobs                   int      `schema:"jobs"` // nolint
-		LabelOpts              string   `schema:"labelopts"`
-		Labels                 string   `schema:"labels"`
-		Layers                 bool     `schema:"layers"`
-		LogRusage              bool     `schema:"rusage"`
-		Manifest               string   `schema:"manifest"`
-		MemSwap                int64    `schema:"memswap"`
-		Memory                 int64    `schema:"memory"`
-		NamespaceOptions       string   `schema:"nsoptions"`
-		NoCache                bool     `schema:"nocache"`
-		OSFeatures             []string `schema:"osfeature"`
-		OSVersion              string   `schema:"osversion"`
-		OutputFormat           string   `schema:"outputformat"`
-		Platform               []string `schema:"platform"`
-		Pull                   bool     `schema:"pull"`
-		PullPolicy             string   `schema:"pullpolicy"`
-		Quiet                  bool     `schema:"q"`
-		Registry               string   `schema:"registry"`
-		Rm                     bool     `schema:"rm"`
-		RusageLogFile          string   `schema:"rusagelogfile"`
-		Remote                 string   `schema:"remote"`
-		Seccomp                string   `schema:"seccomp"`
-		Secrets                string   `schema:"secrets"`
-		SecurityOpt            string   `schema:"securityopt"`
-		ShmSize                int      `schema:"shmsize"`
-		Squash                 bool     `schema:"squash"`
-		TLSVerify              bool     `schema:"tlsVerify"`
-		Tags                   []string `schema:"t"`
-		Target                 string   `schema:"target"`
-		Timestamp              int64    `schema:"timestamp"`
-		Ulimits                string   `schema:"ulimits"`
-		UnsetEnvs              []string `schema:"unsetenv"`
+		AddHosts                string   `schema:"extrahosts"`
+		AdditionalCapabilities  string   `schema:"addcaps"`
+		AdditionalBuildContexts string   `schema:"additionalbuildcontexts"`
+		AllPlatforms            bool     `schema:"allplatforms"`
+		Annotations             string   `schema:"annotations"`
+		AppArmor                string   `schema:"apparmor"`
+		BuildArgs               string   `schema:"buildargs"`
+		CacheFrom               string   `schema:"cachefrom"`
+		CgroupParent            string   `schema:"cgroupparent"` // nolint
+		Compression             uint64   `schema:"compression"`
+		ConfigureNetwork        string   `schema:"networkmode"`
+		CPPFlags                string   `schema:"cppflags"`
+		CpuPeriod               uint64   `schema:"cpuperiod"`  // nolint
+		CpuQuota                int64    `schema:"cpuquota"`   // nolint
+		CpuSetCpus              string   `schema:"cpusetcpus"` // nolint
+		CpuSetMems              string   `schema:"cpusetmems"` // nolint
+		CpuShares               uint64   `schema:"cpushares"`  // nolint
+		DNSOptions              string   `schema:"dnsoptions"`
+		DNSSearch               string   `schema:"dnssearch"`
+		DNSServers              string   `schema:"dnsservers"`
+		Devices                 string   `schema:"devices"`
+		Dockerfile              string   `schema:"dockerfile"`
+		DropCapabilities        string   `schema:"dropcaps"`
+		Envs                    []string `schema:"setenv"`
+		Excludes                string   `schema:"excludes"`
+		ForceRm                 bool     `schema:"forcerm"`
+		From                    string   `schema:"from"`
+		HTTPProxy               bool     `schema:"httpproxy"`
+		IdentityLabel           bool     `schema:"identitylabel"`
+		Ignore                  bool     `schema:"ignore"`
+		Isolation               string   `schema:"isolation"`
+		Jobs                    int      `schema:"jobs"` // nolint
+		LabelOpts               string   `schema:"labelopts"`
+		Labels                  string   `schema:"labels"`
+		Layers                  bool     `schema:"layers"`
+		LogRusage               bool     `schema:"rusage"`
+		Manifest                string   `schema:"manifest"`
+		MemSwap                 int64    `schema:"memswap"`
+		Memory                  int64    `schema:"memory"`
+		NamespaceOptions        string   `schema:"nsoptions"`
+		NoCache                 bool     `schema:"nocache"`
+		OSFeatures              []string `schema:"osfeature"`
+		OSVersion               string   `schema:"osversion"`
+		OutputFormat            string   `schema:"outputformat"`
+		Platform                []string `schema:"platform"`
+		Pull                    bool     `schema:"pull"`
+		PullPolicy              string   `schema:"pullpolicy"`
+		Quiet                   bool     `schema:"q"`
+		Registry                string   `schema:"registry"`
+		Rm                      bool     `schema:"rm"`
+		RusageLogFile           string   `schema:"rusagelogfile"`
+		Remote                  string   `schema:"remote"`
+		Seccomp                 string   `schema:"seccomp"`
+		Secrets                 string   `schema:"secrets"`
+		SecurityOpt             string   `schema:"securityopt"`
+		ShmSize                 int      `schema:"shmsize"`
+		Squash                  bool     `schema:"squash"`
+		TLSVerify               bool     `schema:"tlsVerify"`
+		Tags                    []string `schema:"t"`
+		Target                  string   `schema:"target"`
+		Timestamp               int64    `schema:"timestamp"`
+		Ulimits                 string   `schema:"ulimits"`
+		UnsetEnvs               []string `schema:"unsetenv"`
 	}{
 		Dockerfile:    "Dockerfile",
 		IdentityLabel: true,
@@ -375,6 +376,14 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
 		additionalTags = append(additionalTags, possiblyNormalizedTag)
 	}
 
+	var additionalBuildContexts = map[string]*buildahDefine.AdditionalBuildContext{}
+	if _, found := r.URL.Query()["additionalbuildcontexts"]; found {
+		if err := json.Unmarshal([]byte(query.AdditionalBuildContexts), &additionalBuildContexts); err != nil {
+			utils.BadRequest(w, "additionalbuildcontexts", query.AdditionalBuildContexts, err)
+			return
+		}
+	}
+
 	var buildArgs = map[string]string{}
 	if _, found := r.URL.Query()["buildargs"]; found {
 		if err := json.Unmarshal([]byte(query.BuildArgs), &buildArgs); err != nil {
@@ -562,12 +571,13 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
 
 	runtime := r.Context().Value(api.RuntimeKey).(*libpod.Runtime)
 	buildOptions := buildahDefine.BuildOptions{
-		AddCapabilities: addCaps,
-		AdditionalTags:  additionalTags,
-		Annotations:     annotations,
-		CPPFlags:        cppflags,
-		Args:            buildArgs,
-		AllPlatforms:    query.AllPlatforms,
+		AddCapabilities:         addCaps,
+		AdditionalBuildContexts: additionalBuildContexts,
+		AdditionalTags:          additionalTags,
+		Annotations:             annotations,
+		CPPFlags:                cppflags,
+		Args:                    buildArgs,
+		AllPlatforms:            query.AllPlatforms,
 		CommonBuildOpts: &buildah.CommonBuildOptions{
 			AddHost:            addhosts,
 			ApparmorProfile:    apparmor,
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go
index b4b7c36f6..fe81dc662 100644
--- a/pkg/bindings/images/build.go
+++ b/pkg/bindings/images/build.go
@@ -81,6 +81,13 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
 	for _, tag := range options.AdditionalTags {
 		params.Add("t", tag)
 	}
+	if additionalBuildContexts := options.AdditionalBuildContexts; len(additionalBuildContexts) > 0 {
+		additionalBuildContextMap, err := jsoniter.Marshal(additionalBuildContexts)
+		if err != nil {
+			return nil, err
+		}
+		params.Set("additionalbuildcontexts", string(additionalBuildContextMap))
+	}
 	if buildArgs := options.Args; len(buildArgs) > 0 {
 		bArgs, err := jsoniter.MarshalToString(buildArgs)
 		if err != nil {