Skip to content

Commit fb96de4

Browse files
committed
Dockerfile: upgrade to Go 1.13
Fixes projectcontour#1377 BREAKING CHANGE We build with -mod=readonly so that the build will fail if anything is out of date in our go.mod file. golang/go#30667 changed the behaviour of the go tool to require that go.mod AND go.sum be up to date so this means I cannot use my hack of .gitignoring the go.sum file. This means when you pull this commit you will probably have to delete your local go.sum working copy. If we're lucky then you shouldn't need to change it after that. If we're not lucky, the bloody thing will always be dirty and we'll waste a lot of time telling people to revert their changes to this file. C'est la vie. Signed-off-by: Dave Cheney <[email protected]>
1 parent af0b10c commit fb96de4

File tree

4 files changed

+266
-5
lines changed

4 files changed

+266
-5
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ vendor/
44
.vs/
55
.idea/
66
.DS_Store
7-
go.sum
87
# TODO(youngnick): Move these out of the repo root.
98
localenvoyconfig.yaml
109
securelocalenvoyconfig.yaml
@@ -25,4 +24,4 @@ _site
2524
*.log
2625
*.js.map
2726
*.css.map
28-
.ruby-version
27+
.ruby-version

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM golang:1.13.1 AS build
22
WORKDIR /contour
33

44
ENV GOPROXY=https://proxy.golang.org
5-
COPY go.mod ./
5+
COPY go.mod go.sum /contour/
66
RUN go mod download
77

88
COPY cmd cmd

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ require (
2525
github.com/sirupsen/logrus v1.4.2
2626
github.com/spf13/pflag v1.0.3 // indirect
2727
golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa // indirect
28-
golang.org/x/tools v0.0.0-20190802220118-1d1727260058 // indirect
28+
golang.org/x/tools v0.0.0-20191002234911-9ade4c73f2af // indirect
2929
google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64 // indirect
3030
google.golang.org/grpc v1.23.0
3131
gopkg.in/alecthomas/kingpin.v2 v2.2.6
3232
gopkg.in/inf.v0 v0.9.1 // indirect
3333
gopkg.in/yaml.v2 v2.2.2
34-
honnef.co/go/tools v0.0.1-2019.2.2
34+
honnef.co/go/tools v0.0.1-2019.2.3
3535
k8s.io/api v0.0.0-20190620084959-7cf5895f2711
3636
k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
3737
k8s.io/client-go v0.0.0-20190620085101-78d2af792bab

0 commit comments

Comments
 (0)