Don't single-quote SKAFFOLD_GO_GCFLAGS (GoogleContainerTools#4864)

tvvignesh · Oct 8, 2020 · 35e2c1e · 35e2c1e
1 parent a57c15b
commit 35e2c1e
Show file tree

Hide file tree

Showing 22 changed files with 65 additions and 30 deletions.
diff --git a/examples/getting-started/Dockerfile b/examples/getting-started/Dockerfile
@@ -1,6 +1,7 @@
 FROM golang:1.12.9-alpine3.10 as builder
 COPY main.go .
-RUN go build -o /app main.go
+ARG SKAFFOLD_GO_GCFLAGS
+RUN go build -x -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /app main.go
 
 FROM alpine:3.10
 # Define GOTRACEBACK to mark this container as using the Go language runtime

diff --git a/integration/examples/compose/Dockerfile b/integration/examples/compose/Dockerfile
@@ -1,6 +1,8 @@
 FROM golang:1.12.9-alpine3.10 as builder
 COPY main.go .
-RUN go build -o /app main.go
+# `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
+ARG SKAFFOLD_GO_GCFLAGS
+RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /app main.go
 
 FROM alpine:3.10
 # Define GOTRACEBACK to mark this container as using the Go language runtime

diff --git a/integration/examples/gcb-kaniko/Dockerfile b/integration/examples/gcb-kaniko/Dockerfile
@@ -1,6 +1,8 @@
 FROM golang:1.12.9-alpine3.10 as builder
 COPY main.go .
-RUN go build -o /app main.go
+# `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
+ARG SKAFFOLD_GO_GCFLAGS
+RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /app main.go
 
 FROM alpine:3.10
 # Define GOTRACEBACK to mark this container as using the Go language runtime

diff --git a/integration/examples/generate-pipeline/Dockerfile b/integration/examples/generate-pipeline/Dockerfile
@@ -1,6 +1,8 @@
 FROM golang:1.12.9-alpine3.10 as builder
 COPY main.go .
-RUN go build -o /app main.go
+# `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
+ARG SKAFFOLD_GO_GCFLAGS
+RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /app main.go
 
 FROM alpine:3.10
 # Define GOTRACEBACK to mark this container as using the Go language runtime

diff --git a/integration/examples/getting-started-kustomize/app/Dockerfile b/integration/examples/getting-started-kustomize/app/Dockerfile
@@ -1,6 +1,8 @@
 FROM golang:1.12.9-alpine3.10 as builder
 COPY main.go .
-RUN go build -o /app main.go
+# `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
+ARG SKAFFOLD_GO_GCFLAGS
+RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /app main.go
 
 FROM alpine:3.10
 CMD ["./app"]

diff --git a/integration/examples/getting-started/Dockerfile b/integration/examples/getting-started/Dockerfile
@@ -1,6 +1,8 @@
 FROM golang:1.12.9-alpine3.10 as builder
 COPY main.go .
-RUN go build -o /app main.go
+# `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
+ARG SKAFFOLD_GO_GCFLAGS
+RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /app main.go
 
 FROM alpine:3.10
 # Define GOTRACEBACK to mark this container as using the Go language runtime

diff --git a/integration/examples/google-cloud-build/Dockerfile b/integration/examples/google-cloud-build/Dockerfile
@@ -1,6 +1,8 @@
 FROM golang:1.12.9-alpine3.10 as builder
 COPY main.go .
-RUN go build -o /app main.go
+# `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
+ARG SKAFFOLD_GO_GCFLAGS
+RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /app main.go
 
 FROM alpine:3.10
 # Define GOTRACEBACK to mark this container as using the Go language runtime

diff --git a/integration/examples/helm-deployment/Dockerfile b/integration/examples/helm-deployment/Dockerfile
@@ -1,6 +1,8 @@
 FROM golang:1.12.9-alpine3.10 as builder
 COPY main.go .
-RUN go build -o /app main.go
+# `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
+ARG SKAFFOLD_GO_GCFLAGS
+RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /app main.go
 
 FROM alpine:3.10
 # Define GOTRACEBACK to mark this container as using the Go language runtime

diff --git a/integration/examples/kaniko/Dockerfile b/integration/examples/kaniko/Dockerfile
@@ -1,6 +1,8 @@
 FROM golang:1.12.9-alpine3.10 as builder
 COPY main.go .
-RUN go build -o /app main.go
+# `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
+ARG SKAFFOLD_GO_GCFLAGS
+RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /app main.go
 
 FROM alpine:3.10
 # Define GOTRACEBACK to mark this container as using the Go language runtime

diff --git a/integration/examples/microservices/leeroy-app/Dockerfile b/integration/examples/microservices/leeroy-app/Dockerfile
@@ -1,6 +1,8 @@
 FROM golang:1.12.9-alpine3.10 as builder
 COPY app.go .
-RUN go build -o /app .
+# `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
+ARG SKAFFOLD_GO_GCFLAGS
+RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /app .
 
 FROM alpine:3.10
 # Define GOTRACEBACK to mark this container as using the Go language runtime

diff --git a/integration/examples/microservices/leeroy-web/Dockerfile b/integration/examples/microservices/leeroy-web/Dockerfile
@@ -1,6 +1,8 @@
 FROM golang:1.12.9-alpine3.10 as builder
 COPY web.go .
-RUN go build -o /web .
+# `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
+ARG SKAFFOLD_GO_GCFLAGS
+RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /web .
 
 FROM alpine:3.10
 # Define GOTRACEBACK to mark this container as using the Go language runtime

diff --git a/integration/examples/profile-patches/base-service/Dockerfile b/integration/examples/profile-patches/base-service/Dockerfile
@@ -1,6 +1,8 @@
 FROM golang:1.12.9-alpine3.10 as builder
 COPY main.go .
-RUN go build -o /app main.go
+# `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
+ARG SKAFFOLD_GO_GCFLAGS
+RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /app main.go
 
 FROM alpine:3.10
 # Define GOTRACEBACK to mark this container as using the Go language runtime

diff --git a/integration/examples/profile-patches/hello-service/Dockerfile b/integration/examples/profile-patches/hello-service/Dockerfile
@@ -1,6 +1,8 @@
 FROM golang:1.12.9-alpine3.10 as builder
 COPY main.go .
-RUN go build -o /app main.go
+# `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
+ARG SKAFFOLD_GO_GCFLAGS
+RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /app main.go
 
 FROM alpine:3.10
 # Define GOTRACEBACK to mark this container as using the Go language runtime

diff --git a/integration/examples/profile-patches/world-service/Dockerfile b/integration/examples/profile-patches/world-service/Dockerfile
@@ -1,6 +1,8 @@
 FROM golang:1.12.9-alpine3.10 as builder
 COPY main.go .
-RUN go build -o /app main.go
+# `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
+ARG SKAFFOLD_GO_GCFLAGS
+RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /app main.go
 
 FROM alpine:3.10
 # Define GOTRACEBACK to mark this container as using the Go language runtime

diff --git a/integration/examples/profiles/hello-service/Dockerfile b/integration/examples/profiles/hello-service/Dockerfile
@@ -1,6 +1,8 @@
 FROM golang:1.12.9-alpine3.10 as builder
 COPY main.go .
-RUN go build -o /app main.go
+# `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
+ARG SKAFFOLD_GO_GCFLAGS
+RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /app main.go
 
 FROM alpine:3.10
 # Define GOTRACEBACK to mark this container as using the Go language runtime

diff --git a/integration/examples/profiles/world-service/Dockerfile b/integration/examples/profiles/world-service/Dockerfile
@@ -1,6 +1,8 @@
 FROM golang:1.12.9-alpine3.10 as builder
 COPY main.go .
-RUN go build -o /app main.go
+# `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
+ARG SKAFFOLD_GO_GCFLAGS
+RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /app main.go
 
 FROM alpine:3.10
 # Define GOTRACEBACK to mark this container as using the Go language runtime

diff --git a/integration/examples/structure-tests/Dockerfile b/integration/examples/structure-tests/Dockerfile
@@ -1,6 +1,8 @@
 FROM golang:1.12.9-alpine3.10 as builder
 COPY main.go .
-RUN go build -o /app main.go
+# `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
+ARG SKAFFOLD_GO_GCFLAGS
+RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /app main.go
 
 FROM alpine:3.10
 # Define GOTRACEBACK to mark this container as using the Go language runtime

diff --git a/integration/examples/tagging-with-environment-variables/Dockerfile b/integration/examples/tagging-with-environment-variables/Dockerfile
@@ -1,6 +1,8 @@
 FROM golang:1.12.9-alpine3.10 as builder
 COPY main.go .
-RUN go build -o /app main.go
+# `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
+ARG SKAFFOLD_GO_GCFLAGS
+RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /app main.go
 
 FROM alpine:3.10
 # Define GOTRACEBACK to mark this container as using the Go language runtime

diff --git a/pkg/skaffold/build/buildpacks/default_args.go b/pkg/skaffold/build/buildpacks/default_args.go
@@ -19,7 +19,7 @@ package buildpacks
 import "github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
 
 var debugModeArgs = map[string]string{
-	"GOOGLE_GOGCFLAGS": "'all=-N -l'", // disable build optimization for Golang
+	"GOOGLE_GOGCFLAGS": "all=-N -l", // disable build optimization for Golang
 	// TODO: Add for other languages
 }
 

diff --git a/pkg/skaffold/build/cache/hash_test.go b/pkg/skaffold/build/cache/hash_test.go
@@ -141,7 +141,7 @@ func TestGetHashForArtifact(t *testing.T) {
 				},
 			},
 			mode:     config.RunModes.Debug,
-			expected: "a15f9e22a5c5a244c47a5205d577fdbf80e886a4b36915050113b082850a9c5c",
+			expected: "c3a878f799b2a6532db71683a09771af4f9d20ef5884c57642a272934e5c93ea",
 		},
 	}
 	for _, test := range tests {
@@ -197,7 +197,7 @@ func TestBuildArgs(t *testing.T) {
 	}{
 		{
 			mode:     config.RunModes.Debug,
-			expected: "771e726436816ce229a2838b38aee8c85c7dda4411e7ba68cfd898473ae12ada",
+			expected: "a8544410acafce64325abfffcb21e75efdcd575bd9f8d3be2a516125ec547651",
 		},
 		{
 			mode:     config.RunModes.Dev,
@@ -380,14 +380,14 @@ func TestHashBuildArgs(t *testing.T) {
 				},
 			},
 			mode:     config.RunModes.Debug,
-			expected: []string{"SKAFFOLD_GO_GCFLAGS='all=-N -l'", "foo=bar"},
+			expected: []string{"SKAFFOLD_GO_GCFLAGS=all=-N -l", "foo=bar"},
 		}, {
 			description: "docker artifact without build args for debug",
 			artifactType: latest.ArtifactType{
 				DockerArtifact: &latest.DockerArtifact{},
 			},
 			mode:     config.RunModes.Debug,
-			expected: []string{"SKAFFOLD_GO_GCFLAGS='all=-N -l'"},
+			expected: []string{"SKAFFOLD_GO_GCFLAGS=all=-N -l"},
 		}, {
 			description: "docker artifact without build args for dev",
 			artifactType: latest.ArtifactType{
@@ -430,14 +430,14 @@ func TestHashBuildArgs(t *testing.T) {
 				},
 			},
 			mode:     config.RunModes.Debug,
-			expected: []string{"GOOGLE_GOGCFLAGS='all=-N -l'", "foo=bar"},
+			expected: []string{"GOOGLE_GOGCFLAGS=all=-N -l", "foo=bar"},
 		}, {
 			description: "buildpacks artifact without env for debug",
 			artifactType: latest.ArtifactType{
 				BuildpackArtifact: &latest.BuildpackArtifact{},
 			},
 			mode:     config.RunModes.Debug,
-			expected: []string{"GOOGLE_GOGCFLAGS='all=-N -l'"},
+			expected: []string{"GOOGLE_GOGCFLAGS=all=-N -l"},
 		}, {
 			description: "custom artifact, dockerfile dependency, with build args",
 			artifactType: latest.ArtifactType{

diff --git a/pkg/skaffold/docker/build_args.go b/pkg/skaffold/docker/build_args.go
@@ -32,7 +32,7 @@ var (
 	nonDebugModeArgs = map[string]string{}
 	// default build args for skaffold debug mode
 	debugModeArgs = map[string]string{
-		"SKAFFOLD_GO_GCFLAGS": "'all=-N -l'", // disable build optimization for Golang
+		"SKAFFOLD_GO_GCFLAGS": "all=-N -l", // disable build optimization for Golang
 		// TODO: Add for other languages
 	}
 )

diff --git a/pkg/skaffold/docker/build_args_test.go b/pkg/skaffold/docker/build_args_test.go
@@ -47,7 +47,7 @@ FROM bar1`,
 			},
 			mode: config.RunModes.Debug,
 			expected: map[string]*string{
-				"SKAFFOLD_GO_GCFLAGS": util.StringPtr("'all=-N -l'"),
+				"SKAFFOLD_GO_GCFLAGS": util.StringPtr("all=-N -l"),
 				"foo1":                util.StringPtr("one"),
 				"foo2":                util.StringPtr("two"),
 				"foo3":                util.StringPtr("three"),
@@ -66,7 +66,7 @@ FROM bar1`,
 				"foo3": util.StringPtr("three"),
 			},
 			expected: map[string]*string{
-				"SKAFFOLD_GO_GCFLAGS": util.StringPtr("'all=-N -l'"),
+				"SKAFFOLD_GO_GCFLAGS": util.StringPtr("all=-N -l"),
 				"foo1":                util.StringPtr("one"),
 				"foo2":                util.StringPtr("two"),
 				"foo3":                util.StringPtr("three"),
@@ -105,7 +105,7 @@ ARG foo3`,
 			},
 			mode: config.RunModes.Debug,
 			expected: map[string]*string{
-				"SKAFFOLD_GO_GCFLAGS": util.StringPtr("'all=-N -l'"),
+				"SKAFFOLD_GO_GCFLAGS": util.StringPtr("all=-N -l"),
 				"foo1":                util.StringPtr("one"),
 				"foo2":                util.StringPtr("two"),
 				"foo3":                util.StringPtr("three"),
@@ -128,7 +128,7 @@ ARG foo3`,
 			mode: config.RunModes.Debug,
 			expected: map[string]*string{
 				"SKAFFOLD_RUN_MODE":   util.StringPtr("debug"),
-				"SKAFFOLD_GO_GCFLAGS": util.StringPtr("'all=-N -l'"),
+				"SKAFFOLD_GO_GCFLAGS": util.StringPtr("all=-N -l"),
 				"foo1":                util.StringPtr("one"),
 				"foo2":                util.StringPtr("two"),
 				"foo3":                util.StringPtr("three"),