Skip to content
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

Jump to bottom

Fix Docker bootstrap #5999

Merged
merged 2 commits into from
Apr 1, 2020
Merged

Fix Docker bootstrap #5999

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ad0713
Fix Docker bootstrap
morgo Mar 31, 2020
f4a28ab
Merge remote-tracking branch 'upstream/master' into morgo-fix-docker-…
morgo Mar 31, 2020
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
Prev Previous commit
Merge remote-tracking branch 'upstream/master' into morgo-fix-docker-… 
…bootstrap

Signed-off-by: Morgan Tocker <tocker@gmail.com>
  • Loading branch information
@morgo
morgo committed Mar 31, 2020
commit f4a28ab2bdb754d9fd5edafb2a17d2208e6d5750
6 changes: 6 additions & 0 deletions bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,11 @@ function install_chromedriver() {
local version="$1"
local dist="$2"

case $(uname) in
Linux) local platform=linux;;
*) echo "Platform not supported for vtctl-web tests. Skipping chromedriver install."; return;;
esac

if [ "$(arch)" == "aarch64" ] ; then
os=$(cat /etc/*release | grep "^ID=" | cut -d '=' -f 2)
case $os in
Expand All @@ -243,6 +248,7 @@ function install_chromedriver() {
rm chromedriver_linux64.zip
fi
}

if [ "$BUILD_CHROME" == 1 ] ; then
install_dep "chromedriver" "73.0.3683.20" "$VTROOT/dist/chromedriver" install_chromedriver
fi
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.