Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion vagrant-scripts/bootstrap_vm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ apt-get install -y make \
pkg-config \
bison \
curl \
openjdk-7-jre \
openjdk-7-jdk \
ant \
zip \
unzip

Expand Down
4 changes: 4 additions & 0 deletions vagrant-scripts/vitess/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ printf "\nBuilding Vitess...\n"
sudo chown "$(whoami)":"$(whoami)" /vagrant
sudo chown "$(whoami)":"$(whoami)" /vagrant/src
cd "$VITESS_WORKSPACE"

# open-jdk version that we are using in the VM needs this flag, otherwise we will fail to build ZK
export JAVA_TOOL_OPTIONS="-Dhttps.protocols=TLSv1.2"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in vagrant we install openjdk-7-jdk while in Docker we use openjdk-8-jdk.

This is another example for #4780

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. This is a limitation of the ubuntu version we are using in the Vagrant setup. We need to do some upgrades. openjdk-8 is not available. I think we should do that as part of a different PR.


./bootstrap.sh
# shellcheck disable=SC1091
source dev.env
Expand Down