build: bump golang to 1.20

Signed-off-by: David Porter <david@porter.me>
google · Feb 28, 2023 · e6f8575 · e6f8575
1 parent 42eef7f
commit e6f8575
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,7 +4,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-versions: [1.19, 1.18]
+        go-versions: ['1.20', '1.19']
         platform: [ubuntu-20.04]
         environment-variables: [build/config/plain.sh, build/config/libpfm4.sh, build/config/libipmctl.sh]
     runs-on: ${{ matrix.platform }}
@@ -30,7 +30,7 @@ jobs:
   test-integration:
     strategy:
       matrix:
-        go-versions: [1.19, 1.18]
+        go-versions: ['1.20', '1.19']
         platform: [ubuntu-20.04]
         environment-variables: [build/config/plain.sh, build/config/libpfm4.sh, build/config/libipmctl.sh]
     runs-on: ${{ matrix.platform }}

diff --git a/Makefile b/Makefile
@@ -72,7 +72,7 @@ docker-%:
 	@docker build -t cadvisor:$(shell git rev-parse --short HEAD) -f deploy/Dockerfile .
 
 docker-build:
-	@docker run --rm -w /go/src/github.com/google/cadvisor -v ${PWD}:/go/src/github.com/google/cadvisor golang:1.19 make build
+	@docker run --rm -w /go/src/github.com/google/cadvisor -v ${PWD}:/go/src/github.com/google/cadvisor golang:1.20 make build
 
 presubmit: lint
 	@echo ">> checking go mod tidy"

diff --git a/build/integration-in-docker.sh b/build/integration-in-docker.sh
@@ -72,5 +72,5 @@ GO_FLAGS=${GO_FLAGS:-"-tags=netgo -race"}
 PACKAGES=${PACKAGES:-"sudo"}
 BUILD_PACKAGES=${BUILD_PACKAGES:-}
 CADVISOR_ARGS=${CADVISOR_ARGS:-}
-GOLANG_VERSION=${GOLANG_VERSION:-"1.19"}
+GOLANG_VERSION=${GOLANG_VERSION:-"1.20"}
 run_tests "$GO_FLAGS" "$PACKAGES" "$BUILD_PACKAGES" "$CADVISOR_ARGS"
diff --git a/build/unit-in-container.sh b/build/unit-in-container.sh
@@ -40,5 +40,5 @@ function run_tests() {
 
 GO_FLAGS=${GO_FLAGS:-"-tags=netgo -race"}
 BUILD_PACKAGES=${BUILD_PACKAGES:-}
-GOLANG_VERSION=${GOLANG_VERSION:-"1.19"}
+GOLANG_VERSION=${GOLANG_VERSION:-"1.20"}
 run_tests
diff --git a/deploy/Dockerfile b/deploy/Dockerfile
@@ -1,4 +1,4 @@
-FROM mirror.gcr.io/library/golang:1.19-alpine3.16 AS build
+FROM registry.hub.docker.com/library/golang:1.20-alpine3.16 AS build
 
 # Install build depdencies for all supported arches
 RUN apk --no-cache add bash build-base cmake device-mapper findutils git \

diff --git a/deploy/canary/Dockerfile b/deploy/canary/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19
+FROM golang:1.20
 MAINTAINER dashpole@google.com
 
 RUN apt-get update && apt-get install -y git dmsetup && apt-get clean