Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
KeiranY committed Apr 24, 2019
2 parents 79f47c9 + 98e7026 commit 19b4772
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ Getting Started
Requirements
-------------------

`Vagrant <https://www.vagrantup.com/downloads.html>`_ - The project runs within a virtual machine (VM), vagrant is used to download and configure this.
`Vagrant <https://www.vagrantup.com/downloads.html>`_ - The project uses a virtual machine (VM) which is downloaded and configured using vagrant.

`VirtualBox <https://www.virtualbox.org/wiki/Downloads>`_ - The project is run inside a VirtualBox VM.
`VirtualBox <https://www.virtualbox.org/wiki/Downloads>`_ - used to run the VM.

*FTP Client* - Task & answer sheets are provided over FTP.

Expand Down
4 changes: 2 additions & 2 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# in the future vagrant + ansible configurations from containernet will be added to stay up-to-date

Vagrant.configure("2") do |config|
config.vm.box = "containernet"
config.vm.box = "KcY/containernet"
config.ssh.username = 'root'

# Add a host only network
Expand All @@ -15,4 +15,4 @@ Vagrant.configure("2") do |config|
config.vm.provider "virtualbox" do |v|
v.memory = 2048
end
end
end

0 comments on commit 19b4772

Please sign in to comment.