From a3247a03c6b9d19a04944a2c9b848b6d1769aa1b Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Thu, 6 Oct 2022 14:03:02 +0100 Subject: [PATCH] Fix conatiner UI image build (#577) (#578) (cherry picked from commit 6411accfb9d66356111534614bc0da770d4106c7) Co-authored-by: Marek Libra --- Makefile | 2 +- images/Containerfile.UI | 1 + .../__snapshots__/DownloadSshKeyPage.test.tsx.snap | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2ac1c3e2a..134c02902 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ CI_FOLDER = images PIPE_IMAGE ?= quay.io/ztpfw/pipeline -UI_IMAGE = quay.io/ztpfw/ui +UI_IMAGE ?= quay.io/ztpfw/ui BRANCH ?= $(shell git branch --show-current | tr '[:upper:]' '[:lower:]' | tr '\/' '-') HASH := $(shell git rev-parse HEAD) RELEASE ?= latest diff --git a/images/Containerfile.UI b/images/Containerfile.UI index a4059c2d8..312ed3191 100644 --- a/images/Containerfile.UI +++ b/images/Containerfile.UI @@ -1,5 +1,6 @@ FROM registry.access.redhat.com/ubi8/nodejs-16:latest as builder USER root +RUN npm install -g corepack RUN corepack enable yarn WORKDIR /app diff --git a/ui/frontend/src/components/DownloadSshKeyPage/__snapshots__/DownloadSshKeyPage.test.tsx.snap b/ui/frontend/src/components/DownloadSshKeyPage/__snapshots__/DownloadSshKeyPage.test.tsx.snap index 3fe20692b..7663c6ad3 100644 --- a/ui/frontend/src/components/DownloadSshKeyPage/__snapshots__/DownloadSshKeyPage.test.tsx.snap +++ b/ui/frontend/src/components/DownloadSshKeyPage/__snapshots__/DownloadSshKeyPage.test.tsx.snap @@ -404,6 +404,11 @@ exports[`DownloadSshKeyPage can render 1`] = ` Danger alert: Incorrect SSH key secret + +
+ The secret with ssh private key does not meet the required structure. - - +