Skip to content

Don't single-quote SKAFFOLD_GO_GCFLAGS #4864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion examples/getting-started/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion integration/examples/compose/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion integration/examples/gcb-kaniko/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion integration/examples/generate-pipeline/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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"]
Expand Down
4 changes: 3 additions & 1 deletion integration/examples/getting-started/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion integration/examples/google-cloud-build/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion integration/examples/helm-deployment/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion integration/examples/kaniko/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion integration/examples/microservices/leeroy-app/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion integration/examples/microservices/leeroy-web/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion integration/examples/profile-patches/base-service/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion integration/examples/profiles/hello-service/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion integration/examples/profiles/world-service/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion integration/examples/structure-tests/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/skaffold/build/buildpacks/default_args.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
12 changes: 6 additions & 6 deletions pkg/skaffold/build/cache/hash_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func TestGetHashForArtifact(t *testing.T) {
},
},
mode: config.RunModes.Debug,
expected: "a15f9e22a5c5a244c47a5205d577fdbf80e886a4b36915050113b082850a9c5c",
expected: "c3a878f799b2a6532db71683a09771af4f9d20ef5884c57642a272934e5c93ea",
},
}
for _, test := range tests {
Expand Down Expand Up @@ -197,7 +197,7 @@ func TestBuildArgs(t *testing.T) {
}{
{
mode: config.RunModes.Debug,
expected: "771e726436816ce229a2838b38aee8c85c7dda4411e7ba68cfd898473ae12ada",
expected: "a8544410acafce64325abfffcb21e75efdcd575bd9f8d3be2a516125ec547651",
},
{
mode: config.RunModes.Dev,
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion pkg/skaffold/docker/build_args.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
)
Expand Down
8 changes: 4 additions & 4 deletions pkg/skaffold/docker/build_args_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand All @@ -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"),
Expand Down Expand Up @@ -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"),
Expand All @@ -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"),
Expand Down