From fad55e47307f9d7aeadfd0e11f4374afd7b0e061 Mon Sep 17 00:00:00 2001
From: Jhon Honce <jhonce@redhat.com>
Date: Wed, 30 Sep 2020 14:31:26 -0700
Subject: Support --http-proxy for remote builds

 * Fix misspelled parameter
 * add http-proxy support for builds

http_proxy must be set in the podman.service unit file, for example
Environment=http_proxy=<value>

Signed-off-by: Jhon Honce <jhonce@redhat.com>
---
 pkg/api/handlers/compat/images_build.go | 40 +++++++++++++++++----------------
 pkg/api/server/register_images.go       |  7 ++++++
 pkg/bindings/images/build.go            |  5 ++++-
 3 files changed, 32 insertions(+), 20 deletions(-)

(limited to 'pkg')

diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go
index fbaf8d10a..cd10ac6ba 100644
--- a/pkg/api/handlers/compat/images_build.go
+++ b/pkg/api/handlers/compat/images_build.go
@@ -70,37 +70,38 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
 	}()
 
 	query := struct {
+		BuildArgs   string   `schema:"buildargs"`
+		CacheFrom   string   `schema:"cachefrom"`
+		CpuPeriod   uint64   `schema:"cpuperiod"`  // nolint
+		CpuQuota    int64    `schema:"cpuquota"`   // nolint
+		CpuSetCpus  string   `schema:"cpusetcpus"` // nolint
+		CpuShares   uint64   `schema:"cpushares"`  // nolint
 		Dockerfile  string   `schema:"dockerfile"`
-		Tag         []string `schema:"t"`
 		ExtraHosts  string   `schema:"extrahosts"`
-		Remote      string   `schema:"remote"`
-		Quiet       bool     `schema:"q"`
+		ForceRm     bool     `schema:"forcerm"`
+		HTTPProxy   bool     `schema:"httpproxy"`
+		Labels      string   `schema:"labels"`
+		MemSwap     int64    `schema:"memswap"`
+		Memory      int64    `schema:"memory"`
+		NetworkMode string   `schema:"networkmode"`
 		NoCache     bool     `schema:"nocache"`
-		CacheFrom   string   `schema:"cachefrom"`
+		Outputs     string   `schema:"outputs"`
+		Platform    string   `schema:"platform"`
 		Pull        bool     `schema:"pull"`
+		Quiet       bool     `schema:"q"`
+		Registry    string   `schema:"registry"`
+		Remote      string   `schema:"remote"`
 		Rm          bool     `schema:"rm"`
-		ForceRm     bool     `schema:"forcerm"`
-		Memory      int64    `schema:"memory"`
-		MemSwap     int64    `schema:"memswap"`
-		CpuShares   uint64   `schema:"cpushares"`  // nolint
-		CpuSetCpus  string   `schema:"cpusetcpus"` // nolint
-		CpuPeriod   uint64   `schema:"cpuperiod"`  // nolint
-		CpuQuota    int64    `schema:"cpuquota"`   // nolint
-		BuildArgs   string   `schema:"buildargs"`
 		ShmSize     int      `schema:"shmsize"`
 		Squash      bool     `schema:"squash"`
-		Labels      string   `schema:"labels"`
-		NetworkMode string   `schema:"networkmode"`
-		Platform    string   `schema:"platform"`
+		Tag         []string `schema:"t"`
 		Target      string   `schema:"target"`
-		Outputs     string   `schema:"outputs"`
-		Registry    string   `schema:"registry"`
 	}{
 		Dockerfile: "Dockerfile",
-		Tag:        []string{},
+		Registry:   "docker.io",
 		Rm:         true,
 		ShmSize:    64 * 1024 * 1024,
-		Registry:   "docker.io",
+		Tag:        []string{},
 	}
 
 	decoder := r.Context().Value("decoder").(*schema.Decoder)
@@ -184,6 +185,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
 			CPUQuota:   query.CpuQuota,
 			CPUShares:  query.CpuShares,
 			CPUSetCPUs: query.CpuSetCpus,
+			HTTPProxy:  query.HTTPProxy,
 			Memory:     query.Memory,
 			MemorySwap: query.MemSwap,
 			ShmSize:    strconv.Itoa(query.ShmSize),
diff --git a/pkg/api/server/register_images.go b/pkg/api/server/register_images.go
index 32e401a54..cb0d26d1e 100644
--- a/pkg/api/server/register_images.go
+++ b/pkg/api/server/register_images.go
@@ -1423,6 +1423,13 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error {
 	//    description: |
 	//      output configuration TBD
 	//      (As of version 1.xx)
+	//  - in: query
+	//    name: httpproxy
+	//    type: boolean
+	//    default:
+	//    description: |
+	//      Inject http proxy environment variables into container
+	//      (As of version 2.0.0)
 	// produces:
 	// - application/json
 	// responses:
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go
index 9082670a7..e65a04f7b 100644
--- a/pkg/bindings/images/build.go
+++ b/pkg/bindings/images/build.go
@@ -60,7 +60,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
 		params.Set("cpushares", strconv.Itoa(int(cpuShares)))
 	}
 	if cpuSetCpus := options.CommonBuildOpts.CPUSetCPUs; len(cpuSetCpus) > 0 {
-		params.Set("cpusetcpues", cpuSetCpus)
+		params.Set("cpusetcpus", cpuSetCpus)
 	}
 	if cpuPeriod := options.CommonBuildOpts.CPUPeriod; cpuPeriod > 0 {
 		params.Set("cpuperiod", strconv.Itoa(int(cpuPeriod)))
@@ -92,6 +92,9 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
 		}
 		params.Set("labels", l)
 	}
+	if options.CommonBuildOpts.HTTPProxy {
+		params.Set("httpproxy", "1")
+	}
 
 	stdout := io.Writer(os.Stdout)
 	if options.Out != nil {
-- 
cgit v1.2.3-54-g00ecf