From cfbe7bd13e9d364b57acca7301f73735b85fc040 Mon Sep 17 00:00:00 2001 From: kaitoy Date: Tue, 5 Mar 2019 22:25:26 +0900 Subject: [PATCH 1/2] Improve Dockerfile template such that copying vendor dir is cached. --- pkg/scaffold/manager/dockerfile.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/scaffold/manager/dockerfile.go b/pkg/scaffold/manager/dockerfile.go index 272861e537..7c37fabfc9 100644 --- a/pkg/scaffold/manager/dockerfile.go +++ b/pkg/scaffold/manager/dockerfile.go @@ -41,9 +41,9 @@ FROM golang:1.10.3 as builder # Copy in the go src WORKDIR /go/src/{{ .Repo }} -COPY pkg/ pkg/ COPY cmd/ cmd/ COPY vendor/ vendor/ +COPY pkg/ pkg/ # Build RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager {{ .Repo }}/cmd/manager From 2d9f02a54c96c468124576f733e45d90f4254be8 Mon Sep 17 00:00:00 2001 From: kaitoy Date: Tue, 5 Mar 2019 23:18:28 +0900 Subject: [PATCH 2/2] Fix the the golden file such that it matches the new Dockerfile template. --- test/project/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/project/Dockerfile b/test/project/Dockerfile index 4d50c3ecf5..670db6783a 100644 --- a/test/project/Dockerfile +++ b/test/project/Dockerfile @@ -3,9 +3,9 @@ FROM golang:1.10.3 as builder # Copy in the go src WORKDIR /go/src/sigs.k8s.io/kubebuilder/test/project -COPY pkg/ pkg/ COPY cmd/ cmd/ COPY vendor/ vendor/ +COPY pkg/ pkg/ # Build RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager sigs.k8s.io/kubebuilder/test/project/cmd/manager