Skip to content

Commit

Permalink
Dockerfile: upgrade to Go 1.13
Browse files Browse the repository at this point in the history
Fixes #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 Sep 5, 2019
1 parent 8af0944 commit c9d2508
Show file tree
Hide file tree
Showing 4 changed files with 305 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 .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: go
go_import_path: github.com/heptio/contour
go:
- 1.12.x
- 1.13.x

sudo: false

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM golang:1.13rc2 AS build
FROM golang:1.13 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
Loading

0 comments on commit c9d2508

Please sign in to comment.