Locate/Heartbeat: Update go version to 1.20 (#159)

cristinaleonr · web-flow · commit 069f3a5b3659 · 2023-08-28T13:58:47.000-04:00
Update go version to 1.20
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ dist: focal
 
 language: go
 go:
-- 1.18
+- 1.20
 
 addons:
   apt:
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18
+FROM golang:1.20
 ADD . /go/src/github.com/m-lab/locate
 WORKDIR /go/src/github.com/m-lab/locate
 RUN go get -v github.com/m-lab/locate && \
diff --git a/cmd/heartbeat/Dockerfile.heartbeat b/cmd/heartbeat/Dockerfile.heartbeat
@@ -1,5 +1,5 @@
 # Built the command using a golang base image.
-FROM golang:1.18.3-alpine3.16 AS build
+FROM golang:1.20-alpine3.18 AS build
 RUN apk add git
 ADD . /go/src/github.com/m-lab/locate
 WORKDIR /go/src/github.com/m-lab/locate
@@ -8,7 +8,7 @@ RUN CGO_ENABLED=0 go install -v \
     ./cmd/heartbeat
 
 # Now copy the resulting command into the minimal base image.
-FROM alpine:3.16
+FROM alpine:3.18
 COPY --from=build /go/bin/heartbeat /
 WORKDIR /
 ENTRYPOINT ["/heartbeat"]
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/m-lab/locate
 
-go 1.18
+go 1.20
 
 require (
 	cloud.google.com/go/secretmanager v1.4.0

-Original file line number
+Diff line change
 language: go
 go:
 -- 1.18
 +- 1.20
 addons:
   apt:
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM golang:1.18`
	`1`	`+FROM golang:1.20`
`2`	`2`	`ADD . /go/src/github.com/m-lab/locate`
`3`	`3`	`WORKDIR /go/src/github.com/m-lab/locate`
`4`	`4`	`RUN go get -v github.com/m-lab/locate && \`