diff --git a/Makefile b/Makefile index 2adce08069..a0057f5b23 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ else endif # Go version to use for builds -GO_VERSION=1.19 +GO_VERSION=1.20 # K8s version used for Makefile helpers K8S_VERSION=1.24.6 diff --git a/go.mod b/go.mod index 56518660c3..e474b14917 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/flannel-io/flannel -go 1.19 +go 1.20 // replace github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.2.0 diff --git a/images/Dockerfile.amd64 b/images/Dockerfile.amd64 index a235adaeb7..c6f9b06b77 100644 --- a/images/Dockerfile.amd64 +++ b/images/Dockerfile.amd64 @@ -1,4 +1,4 @@ -FROM alpine:3.17.3 +FROM alpine:3.18.4 ENV FLANNEL_ARCH=amd64 diff --git a/images/Dockerfile.arm b/images/Dockerfile.arm index f8d85ca289..ec57372fbe 100644 --- a/images/Dockerfile.arm +++ b/images/Dockerfile.arm @@ -1,4 +1,4 @@ -FROM arm32v6/alpine:3.17.3 +FROM arm32v6/alpine:3.18.4 ENV FLANNEL_ARCH=arm diff --git a/images/Dockerfile.arm64 b/images/Dockerfile.arm64 index 1926c70845..8b2c1ec35e 100644 --- a/images/Dockerfile.arm64 +++ b/images/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM arm64v8/alpine:3.17.3 +FROM arm64v8/alpine:3.18.4 ENV FLANNEL_ARCH=arm64 diff --git a/images/Dockerfile.ppc64le b/images/Dockerfile.ppc64le index a634a2adb5..73f05e73bc 100644 --- a/images/Dockerfile.ppc64le +++ b/images/Dockerfile.ppc64le @@ -1,4 +1,4 @@ -FROM ppc64le/alpine:3.17.3 +FROM ppc64le/alpine:3.18.4 ENV FLANNEL_ARCH=ppc64le diff --git a/images/Dockerfile.s390x b/images/Dockerfile.s390x index ae5eb3717d..4f6f9b3dbe 100644 --- a/images/Dockerfile.s390x +++ b/images/Dockerfile.s390x @@ -1,4 +1,4 @@ -FROM s390x/alpine:3.17.3 +FROM s390x/alpine:3.18.4 ENV FLANNEL_ARCH=s390x