Fix intellij link and use master branch for vagrant images in WebGoat…

…#262
mengjiann · Nov 20, 2016 · 1347c8b · 1347c8b
1 parent faeb5b1
commit 1347c8b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/webgoat-images/vagrant-developers/Vagrantfile b/webgoat-images/vagrant-developers/Vagrantfile
@@ -19,13 +19,14 @@ Vagrant.configure(2) do |config|
 
   config.vm.provision :shell, privileged:false, inline: <<-SHELL
     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"
-    git clone https://github.com/WebGoat/WebGoat-Lessons.git
+    git clone -b master https://github.com/WebGoat/WebGoat-Lessons.git
     SHELL
 
   config.vm.provision 'shell' do |s|
     s.inline = "echo Finished provisioning, login with user vagrant pass vagrant"
   end
 
 end
+
diff --git a/webgoat-images/vagrant-users/Vagrantfile b/webgoat-images/vagrant-users/Vagrantfile
@@ -28,9 +28,9 @@ Vagrant.configure(2) do |config|
 
   config.vm.provision :shell, inline: <<-SHELL
     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"
-    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....."
     mvn -q -DskipTests -file WebGoat/pom.xml clean compile install
     echo -e "Compiling and installing the WebGoat Lessons $COL_RESET"
@@ -45,3 +45,4 @@ Vagrant.configure(2) do |config|
   end
 
 end
+
diff --git a/webgoat-images/vagrant_provision.sh b/webgoat-images/vagrant_provision.sh
@@ -53,9 +53,10 @@ rm -rf ZAP_2.5.0_Linux.tar.gz
 
 ## IntelliJ
 cd /home/vagrant/tools
-wget https://download.jetbrains.com/idea/ideaIC-2016.2.4.tar.gz
-tar xvfz ideaIC-2016.2.4.tar.gz
-rm -rf ideaIC-2016.2.4.tar.gz
+wget https://download.jetbrains.com/idea/ideaIC-2016.1.4.tar.gz
+tar xvfz ideaIC-2016.1.4.tar.gz
+rm -rf ideaIC-2016.1.4.tar.gz
 
 ## Eclipse
 sudo apt-get -y install eclipse
+