Update to redhat/ubi9 for UBI based images (#342)

UBI8 is EOL https://endoflife.date/rhel Fixes #338
pulumi · Jan 7, 2025 · 8d93111 · 8d93111
1 parent cc1149b
commit 8d93111
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+- Update to redhat/ubi9 for UBI based images
+  ([342](https://github.com/pulumi/pulumi-docker-containers/pull/342))
+
 - Update Poetry config for the Poetry 2.0 release
   ([#353](https://github.com/pulumi/pulumi-docker-containers/pull/353)
 

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ Each of the images described above (except the full `pulumi/pulumi` image) are b
   - `-debian-amd64`: Image manifest for the `linux/amd64` platform.
   - `-debian-arm64`: Image manifest for the `linux/arm64` platform.
   - `-debian`:  Manifest list of `-debian-amd64` and `-debian-arm64`.  Executing `docker pull` against this tag will grab the appropriate image for the supported platform you are currently running, and thus should be the default choice.
-- [redhat/ubi8-minimal](https://hub.docker.com/r/redhat/ubi8-minimal), tagged with a suffix of `-ubi`.  UBI images use [`microdnf`](https://github.com/rpm-software-management/microdnf) as a package manager instead of yum to minimize the size of the image.  We currently only support `linux/amd64` for our UBI SDK images.
+- [redhat/ubi9-minimal](https://hub.docker.com/r/redhat/ubi9-minimal), tagged with a suffix of `-ubi`.  UBI images use [`microdnf`](https://github.com/rpm-software-management/microdnf) as a package manager instead of yum to minimize the size of the image.  We currently only support `linux/amd64` for our UBI SDK images.
 
 Images with no suffix tag are identical to the corresponding `-debian` tag.
 

diff --git a/docker/base/Dockerfile.ubi b/docker/base/Dockerfile.ubi
@@ -1,8 +1,7 @@
 # syntax = docker/dockerfile:experimental
-FROM redhat/ubi8-minimal:latest as builder
+FROM redhat/ubi9-minimal:latest as builder
 ARG PULUMI_VERSION
 RUN microdnf install -y \
-  curl \
   make \
   gcc \
   git \
@@ -13,7 +12,7 @@ RUN curl -fsSL https://get.pulumi.com/ | bash -s -- --version $PULUMI_VERSION
 
 # The runtime container
 # This is our base container, so let's copy all the runtimes to .pulumi/bin
-FROM redhat/ubi8-minimal:latest
+FROM redhat/ubi9-minimal:latest
 LABEL org.opencontainers.image.description="Pulumi CLI container, bring your own SDK"
 WORKDIR /pulumi
 COPY --from=builder /root/.pulumi/bin bin

diff --git a/docker/dotnet/Dockerfile.ubi b/docker/dotnet/Dockerfile.ubi
@@ -1,23 +1,21 @@
 # syntax = docker/dockerfile:experimental
 # Interim container so we can copy pulumi binaries
-FROM redhat/ubi8-minimal:latest as builder
+FROM redhat/ubi9-minimal:latest as builder
 ARG PULUMI_VERSION
 RUN microdnf install -y \
-    curl \
     gzip \
     tar
 # Install the Pulumi SDK, including the CLI and language runtimes.
 RUN curl -fsSL https://get.pulumi.com/ | bash -s -- --version $PULUMI_VERSION
 
 # The runtime container
-FROM redhat/ubi8-minimal:latest
+FROM redhat/ubi9-minimal:latest
 ARG LANGUAGE_VERSION
 LABEL org.opencontainers.image.description="Pulumi CLI container for dotnet"
 WORKDIR /pulumi/projects
 
 RUN microdnf install -y \
     ca-certificates \
-    curl \
     # Required by the dotnet-install script, which calls `find`:
     findutils \
     git \

diff --git a/docker/go/Dockerfile.ubi b/docker/go/Dockerfile.ubi
@@ -1,9 +1,8 @@
 # syntax = docker/dockerfile:experimental
 # Interim container so we can copy pulumi binaries
-FROM redhat/ubi8-minimal:latest as builder
+FROM redhat/ubi9-minimal:latest as builder
 ARG PULUMI_VERSION
 RUN microdnf install -y \
-    curl \
     gzip \
     tar
 # Install the Pulumi SDK, including the CLI and language runtimes.
@@ -23,13 +22,12 @@ RUN curl -fsSLo /tmp/go.tgz https://golang.org/dl/go${RUNTIME_VERSION}.linux-amd
     go version
 
 # The runtime container
-FROM redhat/ubi8-minimal:latest
+FROM redhat/ubi9-minimal:latest
 LABEL org.opencontainers.image.description="Pulumi CLI container for go"
 WORKDIR /pulumi/projects
 
 # Install needed tools, like git
 RUN microdnf install -y \
-    curl \
     git \
     tar \
     ca-certificates; \

diff --git a/docker/java/Dockerfile.ubi b/docker/java/Dockerfile.ubi
@@ -1,10 +1,9 @@
 # syntax = docker/dockerfile:experimental
 # Interim container so we can copy pulumi binaries
 # Must be defined first
-FROM redhat/ubi8-minimal:latest as builder
+FROM redhat/ubi9-minimal:latest as builder
 ARG PULUMI_VERSION
 RUN microdnf install -y \
-    curl \
     git \
     tar \
     unzip
@@ -13,15 +12,14 @@ RUN microdnf install -y \
 RUN curl -fsSL https://get.pulumi.com/ | bash -s -- --version $PULUMI_VERSION
 
 # The runtime container
-FROM redhat/ubi8-minimal:latest
+FROM redhat/ubi9-minimal:latest
 LABEL org.opencontainers.image.description="Pulumi CLI container for Java"
 WORKDIR /pulumi/projects
 
 RUN microdnf install -y \
     git \
     tar \
     java-21-openjdk-devel \
-    curl \
     unzip \
     zip \
     findutils \

diff --git a/docker/nodejs/Dockerfile.ubi b/docker/nodejs/Dockerfile.ubi
@@ -1,23 +1,21 @@
 # syntax = docker/dockerfile:experimental
 # Interim container so we can copy pulumi binaries
-FROM redhat/ubi8-minimal:latest as builder
+FROM redhat/ubi9-minimal:latest as builder
 ARG PULUMI_VERSION
 RUN microdnf install -y \
-    curl \
     gzip \
     tar
 # Install the Pulumi SDK, including the CLI and language runtimes.
 RUN curl -fsSL https://get.pulumi.com/ | bash -s -- --version $PULUMI_VERSION
 
 # The runtime container
-FROM redhat/ubi8-minimal:latest
+FROM redhat/ubi9-minimal:latest
 ARG LANGUAGE_VERSION
 LABEL org.opencontainers.image.description="Pulumi CLI container for nodejs"
 WORKDIR /pulumi/projects
 
 RUN microdnf install -y \
     ca-certificates \
-    curl \
     git \
     tar \
     unzip

diff --git a/docker/python/Dockerfile.ubi b/docker/python/Dockerfile.ubi
@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:experimental
 # Interim container so we can copy pulumi binaries
-FROM redhat/ubi8-minimal:latest as builder
+FROM redhat/ubi9-minimal:latest as builder
 ARG PULUMI_VERSION
 RUN microdnf install -y \
     gzip \
@@ -9,7 +9,7 @@ RUN microdnf install -y \
 RUN curl -fsSL https://get.pulumi.com/ | bash -s -- --version $PULUMI_VERSION
 
 # The runtime container
-FROM redhat/ubi8-minimal:latest
+FROM redhat/ubi9-minimal:latest
 ARG LANGUAGE_VERSION
 LABEL org.opencontainers.image.description="Pulumi CLI container for python"
 WORKDIR /pulumi/projects

diff --git a/tests/containers_test.go b/tests/containers_test.go
@@ -405,6 +405,10 @@ func TestEnvironment(t *testing.T) {
 			if imageVariant == "pulumi" {
 				expectedPath += ":/root/.pulumi/bin"
 			}
+			// When running in bash, the UBI images include /root/.local/bin:/root/bin:
+			if isUBI(t) {
+				expectedPath = "/root/.local/bin:/root/bin:" + expectedPath
+			}
 			requireOutputWithBash(t, expectedPath, "printenv", "PATH")
 		})