Skip to content

Commit

Permalink
Modify: decrease the number of Vagrant boxes ("alice" and "bob" remov…
Browse files Browse the repository at this point in the history
…ed).
  • Loading branch information
William-Yeh committed Apr 20, 2015
1 parent 83ac8b9 commit 49aba07
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 35 deletions.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ FYI, the `gh-pages` branch stores the slide files, mostly in markdown format.
## History


**v4.0** / 第四梯次 (2015-05-09)

- 簡化 Vagrant 虛擬機數量。
- 增加「極簡化 Docker」實例,解釋 rootfs、dependency 與 isolation 性質。


**v3.0** / 第三梯次 (2015-04-11)

- 簡化 Vagrant 環境設定程序。
Expand Down
31 changes: 0 additions & 31 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,37 +37,6 @@ Vagrant.configure(2) do |config|
end


config.vm.define "alice" do |node|

node.vm.box = "williamyeh/ubuntu-trusty64-docker"
node.vm.box_version = ">= 1.5.0"

node.vm.network "private_network", ip: "10.0.0.11"

node.vm.synced_folder ".", SYNCED_FOLDER

for f in PROVISION_SCRIPTS
node.vm.provision "shell", path: f
end

end


config.vm.define "bob" do |node|

node.vm.box = "williamyeh/ubuntu-trusty64-docker"
node.vm.box_version = ">= 1.5.0"

node.vm.network "private_network", ip: "10.0.0.12"

node.vm.synced_folder ".", SYNCED_FOLDER

for f in PROVISION_SCRIPTS
node.vm.provision "shell", path: f
end

end


config.vm.define "centos" do |node|
node.vm.box = "chef/centos-5.11"
Expand Down
2 changes: 0 additions & 2 deletions config.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,6 @@ vagrant status
Current machine states:

main poweroff (virtualbox)
alice poweroff (virtualbox)
bob poweroff (virtualbox)
centos poweroff (virtualbox)
registry poweroff (virtualbox)

Expand Down
2 changes: 1 addition & 1 deletion setup-vagrant
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

readonly HOSTS=( "main" "alice" "bob" "centos" "registry" )
readonly HOSTS=( "main" "centos" "registry" )

for i in "${HOSTS[@]}"; do
NAME=$i
Expand Down
2 changes: 1 addition & 1 deletion setup-vagrant.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@ECHO OFF

set HOSTS=( main alice bob centos registry )
set HOSTS=( main centos registry )

for %%i in %HOSTS% do (
vagrant up --provision %%i
Expand Down

0 comments on commit 49aba07

Please sign in to comment.