From 7e58261e358e9bd0298fba8b63faf19cbf04ffb3 Mon Sep 17 00:00:00 2001 From: Florent Poinsard <35779988+frouioui@users.noreply.github.com> Date: Thu, 20 Jul 2023 10:39:33 +0200 Subject: [PATCH] Unset the PREFIX environment variable when building VTAdmin (#13554) --- Makefile | 2 +- web/vtadmin/build.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bc1f0007dfc..bec150e466d 100644 --- a/Makefile +++ b/Makefile @@ -93,7 +93,7 @@ endif -o ${VTROOTBIN} ./go/... ifndef NOVTADMINBUILD echo "Building VTAdmin Web, disable VTAdmin build by setting 'NOVTADMINBUILD'" - ./web/vtadmin/build.sh + PREFIX="" ./web/vtadmin/build.sh endif # cross-build can be used to cross-compile Vitess client binaries diff --git a/web/vtadmin/build.sh b/web/vtadmin/build.sh index 1b540d5b422..54d1a5b1926 100755 --- a/web/vtadmin/build.sh +++ b/web/vtadmin/build.sh @@ -48,6 +48,8 @@ nvm install "$NODE_VERSION" || fail "Could not install and use nvm $NODE_VERSION npm --prefix "$web_dir" --silent install +export PATH=$PATH:$web_dir/node_modules/.bin/ + VITE_VTADMIN_API_ADDRESS="http://${hostname}:${vtadmin_api_port}" \ VITE_ENABLE_EXPERIMENTAL_TABLET_DEBUG_VARS="true" \ npm run --prefix "$web_dir" build