From 6cf06fac120f7a8b53c7b7adc4b03c8f8939b6e7 Mon Sep 17 00:00:00 2001 From: Mengqi Yu Date: Wed, 29 Sep 2021 13:14:16 -0700 Subject: [PATCH] update the dockerfile gen command --- kyaml/fn/framework/command/command.go | 8 +++++--- kyaml/fn/framework/command/command_test.go | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/kyaml/fn/framework/command/command.go b/kyaml/fn/framework/command/command.go index 8f4d98464a..a0fc4cd592 100644 --- a/kyaml/fn/framework/command/command.go +++ b/kyaml/fn/framework/command/command.go @@ -122,15 +122,17 @@ func AddGenerateDockerfile(cmd *cobra.Command) { Use: "gen [DIR]", Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { - return ioutil.WriteFile(filepath.Join(args[0], "Dockerfile"), []byte(`FROM golang:1.15-alpine as builder + return ioutil.WriteFile(filepath.Join(args[0], "Dockerfile"), []byte(`FROM golang:1.16-alpine as builder ENV CGO_ENABLED=0 WORKDIR /go/src/ +COPY go.mod go.sum ./ +RUN go mod download COPY . . -RUN go build -tags netgo -ldflags '-w' -v -o /usr/local/bin/function ./ +RUN go build -ldflags '-w -s' -v -o /usr/local/bin/function ./ FROM alpine:latest COPY --from=builder /usr/local/bin/function /usr/local/bin/function -CMD ["function"] +ENTRYPOINT ["function"] `), 0600) }, } diff --git a/kyaml/fn/framework/command/command_test.go b/kyaml/fn/framework/command/command_test.go index 896420f898..2c8444ef57 100644 --- a/kyaml/fn/framework/command/command_test.go +++ b/kyaml/fn/framework/command/command_test.go @@ -45,15 +45,17 @@ func TestCommand_dockerfile(t *testing.T) { t.FailNow() } - expected := `FROM golang:1.15-alpine as builder + expected := `FROM golang:1.16-alpine as builder ENV CGO_ENABLED=0 WORKDIR /go/src/ +COPY go.mod go.sum ./ +RUN go mod download COPY . . -RUN go build -tags netgo -ldflags '-w' -v -o /usr/local/bin/function ./ +RUN go build -ldflags '-w -s' -v -o /usr/local/bin/function ./ FROM alpine:latest COPY --from=builder /usr/local/bin/function /usr/local/bin/function -CMD ["function"] +ENTRYPOINT ["function"] ` if !assert.Equal(t, expected, string(b)) { t.FailNow()