Skip to content
Snippets Groups Projects
Commit 1a5a1c14 authored by Piotr Maślanka's avatar Piotr Maślanka
Browse files

Merge branch 'master' into henrietta

parents cdbeb651 f06f4501
No related branches found
No related tags found
No related merge requests found
Pipeline #646 canceled with stages
in 31 seconds
......@@ -5,8 +5,10 @@ Vagrant.configure("2") do |config|
config.vm.provider "virtualbox" do |v|
v.memory = 1260
v.cpus = 3
config.vm.synced_folder "/var/www/html/dev/misc", "/wynurz-utils", :mount_options => ["ro"]
end
config.vm.provision "shell", inline: <<-SHELL
apt-get update
apt-get install curl
......
......@@ -32,7 +32,11 @@ fi
if [ $1 == "jdk" ]; then
cd /home/vagrant
wget -nv http://dev.dms-serwis.com.pl/misc/jdk-8u121-linux-x64.tar.gz
if [ -e "/wynurz-utils/jdk-8u121-linux-x64.tar.gz" ]; then
ln -s /wynurz-utils/jdk-8u121-linux-x64.tar.gz /home/vagrant/jdk-8u121-linux-x64.tar.gz
else
wget -nv http://dev.dms-serwis.com.pl/misc/jdk-8u121-linux-x64.tar.gz
fi;
tar xzf jdk-8u121-linux-x64.tar.gz
rm -f jdk-8u121-linux-x64.tar.gz
update-alternatives --install /usr/bin/java java /home/vagrant/jdk1.8.0_121/bin/java 100
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment