Merge branch 'main' into s390x

kserve · May 27, 2024 · 6ceb565 · 6ceb565
2 parents 1c1f188 + 028f646
commit 6ceb565
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -51,7 +51,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
 ###############################################################################
 # Stage 2: Copy build assets to create the smallest final runtime image
 ###############################################################################
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9 AS runtime
+FROM registry.access.redhat.com/ubi8/ubi-minimal:latest AS runtime
 
 ARG USER=2000
 ARG IMAGE_VERSION

diff --git a/Dockerfile.develop b/Dockerfile.develop
@@ -23,7 +23,8 @@
 ###############################################################################
 
 # TODO: replace the "go_toolset" build stage once ubi8/go-toolset:1.21 is available
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9 as go-toolset
+# the go-toolset 1.21 is based on ubi9, we need to update it in the base image as well.
+FROM registry.access.redhat.com/ubi8/ubi-minimal:latest as go-toolset
 
 # https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
 # We need TARGETOS and TARGETARCH (not BUILDOS and BUILDARCH) since the developer