From 7686dab07a6e6e3505110744d327d7d1546f4f52 Mon Sep 17 00:00:00 2001 From: Shmaraiev Oleksandr Date: Thu, 7 Sep 2023 13:53:32 +0300 Subject: [PATCH 1/2] Update Dockerfile to fix an error 'node is not installed' (#555) * Update Dockerfile to fix an error * Fix the image --- .ci/openshift-ci/Dockerfile | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.ci/openshift-ci/Dockerfile b/.ci/openshift-ci/Dockerfile index 7c912ee523..aa7caf8cad 100644 --- a/.ci/openshift-ci/Dockerfile +++ b/.ci/openshift-ci/Dockerfile @@ -12,17 +12,27 @@ # Dockerfile to bootstrap build and test in openshift-ci -FROM registry.ci.openshift.org/openshift/release:golang-1.18 +FROM registry.access.redhat.com/ubi9/nodejs-18:1 SHELL ["/bin/bash", "-c"] +USER 0 + # Install yq, kubectl, chectl cli used by olm/olm.sh script. -RUN yum install --assumeyes -d1 python3-pip httpd-tools && \ +RUN dnf install -y -q --allowerasing --nobest nodejs-devel nodejs-libs \ + # already installed or installed as deps: + openssl openssl-devel ca-certificates make cmake cpp gcc gcc-c++ zlib zlib-devel brotli brotli-devel python3 nodejs-packaging && \ + dnf update -y && dnf clean all && \ + npm install -g yarn@1.22 npm@9 && \ + echo -n "node version: "; node -v; \ + echo -n "npm version: "; npm -v; \ + echo -n "yarn version: "; yarn -v && \ + yum install --assumeyes -d1 python3-pip httpd-tools && \ pip3 install --upgrade setuptools && \ pip3 install yq && \ curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && \ chmod +x ./kubectl && \ mv ./kubectl /usr/local/bin && \ bash <(curl -sL https://www.eclipse.org/che/chectl/) --channel=next && \ - curl https://mirror.openshift.com/pub/openshift-v4/clients/ocp/4.12.4/openshift-client-linux.tar.gz | tar xvzf - -C /usr/local/bin/ oc && \ + curl https://mirror.openshift.com/pub/openshift-v4/clients/ocp/4.12.30/openshift-client-linux.tar.gz | tar xvzf - -C /usr/local/bin/ oc && \ chmod ug+x /usr/local/bin/oc From a6ea66285f13c50e24ee3e81325681bdf2a6fd07 Mon Sep 17 00:00:00 2001 From: Shmaraiev Oleksandr Date: Fri, 8 Sep 2023 10:27:14 +0300 Subject: [PATCH 2/2] Update command 'dnf install' (#556) --- .ci/openshift-ci/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/openshift-ci/Dockerfile b/.ci/openshift-ci/Dockerfile index aa7caf8cad..0ceedc09d6 100644 --- a/.ci/openshift-ci/Dockerfile +++ b/.ci/openshift-ci/Dockerfile @@ -19,7 +19,7 @@ SHELL ["/bin/bash", "-c"] USER 0 # Install yq, kubectl, chectl cli used by olm/olm.sh script. -RUN dnf install -y -q --allowerasing --nobest nodejs-devel nodejs-libs \ +RUN dnf install -y psmisc nodejs-devel nodejs-libs -q --allowerasing --nobest \ # already installed or installed as deps: openssl openssl-devel ca-certificates make cmake cpp gcc gcc-c++ zlib zlib-devel brotli brotli-devel python3 nodejs-packaging && \ dnf update -y && dnf clean all && \