From 0ce37a12561a9c49b020d750439784a35fa46b9e Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Tue, 29 Aug 2023 16:38:46 +0200 Subject: [PATCH 1/2] Install node 18 for OpenShift tests (#2734) Signed-off-by: Anatolii Bazko --- .ci/openshift-ci/Dockerfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.ci/openshift-ci/Dockerfile b/.ci/openshift-ci/Dockerfile index c62fc1a2f..5ee57eb46 100644 --- a/.ci/openshift-ci/Dockerfile +++ b/.ci/openshift-ci/Dockerfile @@ -12,6 +12,11 @@ # Dockerfile to bootstrap build and test in openshift-ci -FROM registry.access.redhat.com/ubi8/nodejs-18 -RUN npm install --global yarn +FROM quay.io/eclipse/che-node:18.17 + +ENV PATH=$PATH:/usr/local/go/bin +RUN wget https://golang.org/dl/go1.18.9.linux-amd64.tar.gz && \ + rm -rf /usr/local/go && tar -C /usr/local -xzf go1.18.9.linux-amd64.tar.gz + + From ba3aa89546abf10ec9cab05d035e2955de0d50c6 Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Wed, 30 Aug 2023 11:15:29 +0200 Subject: [PATCH 2/2] chore: Revert Dockerfile for OpenShift CI (#2735) Signed-off-by: Anatolii Bazko --- .ci/openshift-ci/Dockerfile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.ci/openshift-ci/Dockerfile b/.ci/openshift-ci/Dockerfile index 5ee57eb46..a7b6a6d0e 100644 --- a/.ci/openshift-ci/Dockerfile +++ b/.ci/openshift-ci/Dockerfile @@ -12,11 +12,8 @@ # Dockerfile to bootstrap build and test in openshift-ci -FROM quay.io/eclipse/che-node:18.17 - -ENV PATH=$PATH:/usr/local/go/bin -RUN wget https://golang.org/dl/go1.18.9.linux-amd64.tar.gz && \ - rm -rf /usr/local/go && tar -C /usr/local -xzf go1.18.9.linux-amd64.tar.gz - - +FROM registry.ci.openshift.org/openshift/release:golang-1.18 +RUN curl -sL https://rpm.nodesource.com/setup_16.x | bash - && \ + yum-config-manager --add-repo https://dl.yarnpkg.com/rpm/yarn.repo && \ + yum install -y yarn