Skip to content

Commit

Permalink
Dockerfile: upgrade to Go 1.13
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
davecheney committed Oct 3, 2019
1 parent f8cb8e0 commit 3b94896
Show file tree
Hide file tree
Showing 4 changed files with 219 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ vendor/
.vs/
.idea/
.DS_Store
go.sum
# TODO(youngnick): Move these out of the repo root.
localenvoyconfig.yaml
securelocalenvoyconfig.yaml
Expand All @@ -25,4 +24,4 @@ _site
*.log
*.js.map
*.css.map
.ruby-version
.ruby-version
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM golang:1.13.1 AS build
WORKDIR /contour

ENV GOPROXY=https://proxy.golang.org
COPY go.mod ./
COPY go.mod go.sum /contour/
RUN go mod download

COPY cmd cmd
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ require (
github.com/sirupsen/logrus v1.4.2
github.com/spf13/pflag v1.0.3 // indirect
golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa // indirect
golang.org/x/tools v0.0.0-20190802220118-1d1727260058 // indirect
golang.org/x/tools v0.0.0-20191002234911-9ade4c73f2af // indirect
google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64 // indirect
google.golang.org/grpc v1.23.0
gopkg.in/alecthomas/kingpin.v2 v2.2.6
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.2.2
honnef.co/go/tools v0.0.1-2019.2.2
honnef.co/go/tools v0.0.1-2019.2.3
k8s.io/api v0.0.0-20190620084959-7cf5895f2711
k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
k8s.io/client-go v0.0.0-20190620085101-78d2af792bab
Expand Down
Loading

0 comments on commit 3b94896

Please sign in to comment.