From 648a2739e54d8523eba06e274cc06785943a3ca9 Mon Sep 17 00:00:00 2001 From: Kenny Ho Date: Tue, 10 Sep 2024 16:46:20 -0400 Subject: [PATCH] Update to the latest golang version and Alpine base image --- Dockerfile | 4 ++-- go.mod | 2 +- labeller.Dockerfile | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8a564e46..288b2ee8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM docker.io/golang:1.21.6-alpine3.19 +FROM docker.io/golang:1.23.1-alpine3.20 RUN apk --no-cache add git pkgconfig build-base libdrm-dev RUN apk --no-cache add hwloc-dev --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community RUN mkdir -p /go/src/github.com/ROCm/k8s-device-plugin @@ -20,7 +20,7 @@ WORKDIR /go/src/github.com/ROCm/k8s-device-plugin/cmd/k8s-device-plugin RUN go install \ -ldflags="-X main.gitDescribe=$(git -C /go/src/github.com/ROCm/k8s-device-plugin/ describe --always --long --dirty)" -FROM alpine:3.19.1 +FROM alpine:3.20.3 LABEL \ org.opencontainers.image.source="https://github.com/ROCm/k8s-device-plugin" \ org.opencontainers.image.authors="Kenny Ho " \ diff --git a/go.mod b/go.mod index ade8a9ab..af654e62 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/ROCm/k8s-device-plugin -go 1.21 +go 1.23 require ( github.com/go-logr/logr v1.2.3 diff --git a/labeller.Dockerfile b/labeller.Dockerfile index 750150c6..a0390a85 100644 --- a/labeller.Dockerfile +++ b/labeller.Dockerfile @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM docker.io/golang:1.21.6-alpine3.19 +FROM docker.io/golang:1.23.1-alpine3.20 RUN apk --no-cache add git pkgconfig build-base libdrm-dev RUN mkdir -p /go/src/github.com/ROCm/k8s-device-plugin ADD . /go/src/github.com/ROCm/k8s-device-plugin @@ -19,7 +19,7 @@ WORKDIR /go/src/github.com/ROCm/k8s-device-plugin/cmd/k8s-node-labeller RUN go install \ -ldflags="-X main.gitDescribe=$(git -C /go/src/github.com/ROCm/k8s-device-plugin/ describe --always --long --dirty)" -FROM alpine:3.19.1 +FROM alpine:3.20.3 LABEL \ org.opencontainers.image.source="https://github.com/ROCm/k8s-device-plugin" \ org.opencontainers.image.authors="Kenny Ho " \