Add changes from 3.18 branch.

redhat-developer · Jan 10, 2025 · a128fe7 · a128fe7
1 parent 5e650b0
commit a128fe7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/devspaces-code/build/dockerfiles/Dockerfile b/devspaces-code/build/dockerfiles/Dockerfile
@@ -156,11 +156,11 @@ RUN npm install \
     && cp -r out/src/*.js /checode/launcher \
     && chgrp -R 0 /checode && chmod -R g+rwX /checode
 
-# https://registry.access.redhat.com/ubi8/ubi
-FROM registry.access.redhat.com/ubi8/ubi:8.10-1161 AS ubi-builder
+# https://registry.access.redhat.com/ubi9
+FROM registry.redhat.io/ubi9:9.5-1734495538 AS ubi-builder
 
 RUN mkdir -p /mnt/rootfs
-RUN yum install --installroot /mnt/rootfs brotli libstdc++ coreutils glibc-minimal-langpack --releasever 8 --setopt install_weak_deps=false --nodocs -y && yum --installroot /mnt/rootfs clean all
+RUN yum install --installroot /mnt/rootfs brotli libstdc++ coreutils glibc-minimal-langpack --releasever 9 --setopt install_weak_deps=false --nodocs -y && yum --installroot /mnt/rootfs clean all
 RUN rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*
 
 WORKDIR /mnt/rootfs

diff --git a/devspaces-code/build/dockerfiles/brew.Dockerfile b/devspaces-code/build/dockerfiles/brew.Dockerfile
@@ -442,12 +442,25 @@ RUN CGO_ENABLED=0 GOOS=linux go build -mod=vendor -a -ldflags '-w -s' -a -instal
 ############################# BUILD 4: rootfs assembly ##################
 #########################################################################
 
-# https://registry.access.redhat.com/ubi8
-FROM registry.redhat.io/ubi8:8.10-1161 as ubi-builder
+# https://registry.access.redhat.com/ubi9
+FROM registry.redhat.io/ubi9:9.5-1734495538 AS ubi-builder
 
 RUN mkdir -p /mnt/rootfs/projects /mnt/rootfs/home/che /mnt/rootfs/remote/data/Machine/
 # hadolint ignore=DL3033
-RUN yum install --installroot /mnt/rootfs tar gzip brotli libstdc++ coreutils glibc-minimal-langpack --releasever 8 --setopt install_weak_deps=false --nodocs -y && yum --installroot /mnt/rootfs clean all
+
+# Enable pulp content sets to resolve libsecret & libxkbfile as rpm
+COPY $REMOTE_SOURCES/devspaces-images-code/app/devspaces-code/build/dockerfiles/content_sets_pulp.repo /etc/yum.repos.d/
+
+RUN echo "Disabling rhel-8 based repos..." && \
+    dnf config-manager --set-disabled 'rhel-8*'
+
+# hadolint ignore=DL3040,DL3041
+RUN \
+    dnf install -y \
+    --enablerepo=rhel-9-for-baseos-rpms-pulp \
+    --enablerepo=rhel-9-for-appstream-rpms-pulp \
+    --installroot /mnt/rootfs tar gzip brotli libstdc++ coreutils glibc-minimal-langpack --releasever 9 --setopt install_weak_deps=false --nodocs -y && yum --installroot /mnt/rootfs clean all
+
 RUN rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*
 
 WORKDIR /mnt/rootfs