Skip to content

Unset the PREFIX environment variable when building VTAdmin #13554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frouioui merged 2 commits into from
Jul 20, 2023
Merged

Unset the PREFIX environment variable when building VTAdmin #13554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
224a57f
Unset the PREFIX environment variable when building VTAdmin
frouioui Jul 19, 2023
7629248
Set PATH variable
frouioui Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions web/vtadmin/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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