From 3492f0aad3dd6e2d8d88aef4282090e8e6361319 Mon Sep 17 00:00:00 2001 From: Andrei Aaron Date: Mon, 13 Nov 2023 19:57:51 +0200 Subject: [PATCH] build(zui): add new makefile variable for the zui repo (#2030) To enable building zui from forks in case of local testing Signed-off-by: Andrei Aaron --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7d8a8d31..a6354b3f 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,8 @@ CRICTL_VERSION := v1.26.1 ACTION_VALIDATOR := $(TOOLSDIR)/bin/action-validator ACTION_VALIDATOR_VERSION := v0.5.3 ZUI_VERSION := commit-fad5572 +ZUI_REPO_OWNER := project-zot +ZUI_REPO_NAME := zui SWAGGER_VERSION := v1.8.12 STACKER := $(TOOLSDIR)/bin/stacker BATS := $(TOOLSDIR)/bin/bats @@ -548,7 +550,7 @@ ui: pwd=$$(pwd);\ tdir=$$(mktemp -d);\ cd $$tdir;\ - git clone https://github.com/project-zot/zui.git;\ + git clone https://github.com/$(ZUI_REPO_OWNER)/$(ZUI_REPO_NAME).git zui;\ cd zui;\ npm install;\ npm run build;\ @@ -556,12 +558,12 @@ ui: rm -rf ./pkg/extensions/build;\ cp -R $$tdir/zui/build ./pkg/extensions/;\ else\ - curl --fail --head https://github.com/project-zot/zui/releases/download/$(ZUI_VERSION)/zui.tgz;\ + curl --fail --head https://github.com/$(ZUI_REPO_OWNER)/$(ZUI_REPO_NAME)/releases/download/$(ZUI_VERSION)/zui.tgz;\ if [ $$? -ne 0 ]; then\ pwd=$$(pwd);\ tdir=$$(mktemp -d);\ cd $$tdir;\ - git clone --depth=1 --branch $(ZUI_VERSION) https://github.com/project-zot/zui.git;\ + git clone --depth=1 --branch $(ZUI_VERSION) https://github.com/$(ZUI_REPO_OWNER)/$(ZUI_REPO_NAME).git zui;\ cd zui;\ git checkout $(ZUI_VERSION);\ npm install;\ @@ -570,7 +572,7 @@ ui: rm -rf ./pkg/extensions/build;\ cp -R $$tdir/zui/build ./pkg/extensions/;\ else\ - curl -fsSL https://github.com/project-zot/zui/releases/download/$(ZUI_VERSION)/zui.tgz -o zui.tgz;\ + curl -fsSL https://github.com/$(ZUI_REPO_OWNER)/$(ZUI_REPO_NAME)/releases/download/$(ZUI_VERSION)/zui.tgz -o zui.tgz;\ tar xvzf zui.tgz -C ./pkg/extensions/;\ rm zui.tgz;\ fi;\