Merge pull request #621 from kaitoy/improve-dockerfile

Improve Dockerfile template such that copying vendor dir is cached.
kubernetes-sigs · Mar 6, 2019 · 67cfb94 · 67cfb94
2 parents 4228ca5 + 2d9f02a
commit 67cfb94
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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

diff --git 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