From 62298a49ef5718450f87d62c0990f5950466e4df Mon Sep 17 00:00:00 2001 From: Artem Zatsarynnyi Date: Mon, 3 Jun 2024 15:39:11 +0200 Subject: [PATCH] Migrate ds-code container from ubi to rhel-els --- .../build/dockerfiles/brew.Dockerfile | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/devspaces-code/build/dockerfiles/brew.Dockerfile b/devspaces-code/build/dockerfiles/brew.Dockerfile index 0489d8e8a6..c921035dc5 100644 --- a/devspaces-code/build/dockerfiles/brew.Dockerfile +++ b/devspaces-code/build/dockerfiles/brew.Dockerfile @@ -15,8 +15,8 @@ ############################# BUILD 1: libc-ubi8 ######################## ######################################################################### -# https://registry.access.redhat.com/ubi8/nodejs-18 -FROM ubi8/nodejs-18:1-110.1716503936 as checode-linux-libc-ubi8-builder +# https://registry.access.redhat.com/rhel9-6-els/rhel +FROM registry.redhat.io/rhel8-6-els/rhel:8.6 as checode-linux-libc-ubi8-builder # hadolint ignore=DL3002 USER root @@ -224,8 +224,8 @@ RUN yarn \ ############################# BUILD 2: libc-ubi9 ######################## ######################################################################### -# https://registry.access.redhat.com/ubi9/nodejs-18 -FROM ubi9/nodejs-18:1-108.1716477799 as checode-linux-libc-ubi9-builder +# https://registry.access.redhat.com/rhel9-2-els/rhel +FROM registry.redhat.io/rhel9-2-els/rhel:9.2-1222 as checode-linux-libc-ubi9-builder # hadolint ignore=DL3002 USER root @@ -446,8 +446,8 @@ RUN yarn \ # NOTE: can't use scatch images in OSBS, because unable to start container process: exec: \"/bin/sh\": stat /bin/sh: no such file or directory # so we must rebuild machineexec binary in this build -# https://registry.access.redhat.com/rhel8/go-toolset -FROM rhel8/go-toolset:1.21.9-3 as machineexec-builder +# https://registry.access.redhat.com/rhel9-2-els/rhel +FROM registry.redhat.io/rhel9-2-els/rhel:9.2-1222 as machineexec-builder ENV GOPATH=/go/ # hadolint ignore=DL3002 USER root @@ -457,7 +457,8 @@ USER root COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR WORKDIR $REMOTE_SOURCES_DIR/devspaces-images-code/app/devspaces-machineexec # hadolint ignore=SC2086 -RUN CGO_ENABLED=0 GOOS=linux go build -mod=vendor -a -ldflags '-w -s' -a -installsuffix cgo -o che-machine-exec . && \ +RUN dnf -y install golang && \ + CGO_ENABLED=0 GOOS=linux go build -mod=vendor -a -ldflags '-w -s' -a -installsuffix cgo -o che-machine-exec . && \ mkdir -p /rootfs/go/bin && cp -rf $REMOTE_SOURCES_DIR/devspaces-images-code/app/devspaces-machineexec/che-machine-exec /rootfs/go/bin ######################################################################### @@ -465,7 +466,7 @@ RUN CGO_ENABLED=0 GOOS=linux go build -mod=vendor -a -ldflags '-w -s' -a -instal ######################################################################### # https://registry.access.redhat.com/ubi8 -FROM ubi8:8.10-901 as ubi-builder +FROM registry.redhat.io/rhel9-2-els/rhel:9.2-1222 as ubi-builder RUN mkdir -p /mnt/rootfs/projects /mnt/rootfs/home/che /mnt/rootfs/remote/data/Machine/ # hadolint ignore=DL3033 @@ -496,8 +497,8 @@ RUN rm /mnt/rootfs/etc/hosts ############################# BUILD 5: minimal final image ############## ######################################################################### -# https://registry.access.redhat.com/ubi8-minimal -FROM ubi8-minimal:8.10-896 +# https://registry.access.redhat.com/rhel9-2-els/rhel +FROM registry.redhat.io/rhel9-2-els/rhel:9.2-1222 COPY --from=ubi-builder /mnt/rootfs/ / ENV HOME=/home/che USER 1001 @@ -519,4 +520,4 @@ LABEL summary="$SUMMARY" \ maintainer="Roman Nikitenko " \ io.openshift.expose-services="" \ usage="" - \ No newline at end of file +