Merge pull request #282 from span/fix-broken-vagrant-setup

Fix intellij link and use master branch for vagrant images
This commit is contained in:
Doug Morato 2016-11-21 09:34:16 -05:00 committed by GitHub
commit 79e0cc0842
3 changed files with 10 additions and 7 deletions

View File

@ -19,9 +19,9 @@ Vagrant.configure(2) do |config|
config.vm.provision :shell, privileged:false, inline: <<-SHELL config.vm.provision :shell, privileged:false, inline: <<-SHELL
echo -e "Cloning the WebGoat container repository" echo -e "Cloning the WebGoat container repository"
git clone https://github.com/WebGoat/WebGoat.git git clone -b master https://github.com/WebGoat/WebGoat.git
echo -e "Cloning the WebGoat Lessons repository" echo -e "Cloning the WebGoat Lessons repository"
git clone https://github.com/WebGoat/WebGoat-Lessons.git git clone -b master https://github.com/WebGoat/WebGoat-Lessons.git
SHELL SHELL
config.vm.provision 'shell' do |s| config.vm.provision 'shell' do |s|
@ -29,3 +29,4 @@ Vagrant.configure(2) do |config|
end end
end end

View File

@ -28,9 +28,9 @@ Vagrant.configure(2) do |config|
config.vm.provision :shell, inline: <<-SHELL config.vm.provision :shell, inline: <<-SHELL
echo -e "Cloning the WebGoat container repository" echo -e "Cloning the WebGoat container repository"
git clone https://github.com/WebGoat/WebGoat.git git clone -b master https://github.com/WebGoat/WebGoat.git
echo -e "Cloning the WebGoat Lessons repository" echo -e "Cloning the WebGoat Lessons repository"
git clone https://github.com/WebGoat/WebGoat-Lessons.git git clone -b master https://github.com/WebGoat/WebGoat-Lessons.git
echo -e "Compiling and installing the WebGoat Container lesson server....." echo -e "Compiling and installing the WebGoat Container lesson server....."
mvn -q -DskipTests -file WebGoat/pom.xml clean compile install mvn -q -DskipTests -file WebGoat/pom.xml clean compile install
echo -e "Compiling and installing the WebGoat Lessons $COL_RESET" echo -e "Compiling and installing the WebGoat Lessons $COL_RESET"
@ -45,3 +45,4 @@ Vagrant.configure(2) do |config|
end end
end end

View File

@ -53,9 +53,10 @@ rm -rf ZAP_2.5.0_Linux.tar.gz
## IntelliJ ## IntelliJ
cd /home/vagrant/tools cd /home/vagrant/tools
wget https://download.jetbrains.com/idea/ideaIC-2016.2.4.tar.gz wget https://download.jetbrains.com/idea/ideaIC-2016.1.4.tar.gz
tar xvfz ideaIC-2016.2.4.tar.gz tar xvfz ideaIC-2016.1.4.tar.gz
rm -rf ideaIC-2016.2.4.tar.gz rm -rf ideaIC-2016.1.4.tar.gz
## Eclipse ## Eclipse
sudo apt-get -y install eclipse sudo apt-get -y install eclipse