From bcd7220b150ffeb2b4a4bc11fd5e0ec77160b74b Mon Sep 17 00:00:00 2001
From: Kenny Ho <Kenny.Ho@amd.com>
Date: Thu, 2 Nov 2023 00:32:48 -0400
Subject: [PATCH] Update container base image
Fixing CVE-2023-5363
---
Dockerfile | 4 ++--
labeller.Dockerfile | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 6919d180..45264203 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.19.12-alpine3.18
+FROM docker.io/golang:1.19.13-alpine3.18
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/RadeonOpenCompute/k8s-device-plugin
@@ -20,7 +20,7 @@ WORKDIR /go/src/github.com/RadeonOpenCompute/k8s-device-plugin/cmd/k8s-device-pl
RUN go install \
-ldflags="-X main.gitDescribe=$(git -C /go/src/github.com/RadeonOpenCompute/k8s-device-plugin/ describe --always --long --dirty)"
-FROM alpine:3.18.3
+FROM alpine:3.18.4
LABEL \
org.opencontainers.image.source="https://github.com/RadeonOpenCompute/k8s-device-plugin" \
org.opencontainers.image.authors="Kenny Ho <Kenny.Ho@amd.com>" \
diff --git a/labeller.Dockerfile b/labeller.Dockerfile
index beaeeb96..4f692654 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.19.6-alpine3.17
+FROM docker.io/golang:1.19.13-alpine3.18
RUN apk --no-cache add git pkgconfig build-base libdrm-dev
RUN mkdir -p /go/src/github.com/RadeonOpenCompute/k8s-device-plugin
ADD . /go/src/github.com/RadeonOpenCompute/k8s-device-plugin
@@ -19,7 +19,7 @@ WORKDIR /go/src/github.com/RadeonOpenCompute/k8s-device-plugin/cmd/k8s-node-labe
RUN go install \
-ldflags="-X main.gitDescribe=$(git -C /go/src/github.com/RadeonOpenCompute/k8s-device-plugin/ describe --always --long --dirty)"
-FROM alpine:3.17.3
+FROM alpine:3.18.4
LABEL \
org.opencontainers.image.source="https://github.com/RadeonOpenCompute/k8s-device-plugin" \
org.opencontainers.image.authors="Kenny Ho <Kenny.Ho@amd.com>" \
--
GitLab