Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge 4.0 code #8

Merged
merged 5 commits into from
Apr 29, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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
38 changes: 7 additions & 31 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ Vagrant.configure(2) do |config|
for f in PROVISION_SCRIPTS
node.vm.provision "shell", path: f
end
node.vm.provision "shell", inline: <<-SHELL
sudo apt-get install -y tree
SHELL

node.vm.provider "virtualbox" do |vb|
vb.customize ["modifyvm", :id, "--memory", "1024"]
Expand All @@ -37,37 +40,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 All @@ -78,6 +50,10 @@ Vagrant.configure(2) do |config|
# [NOTE] unmark this while benchmarking VM startup time
#node.vm.box_check_update = false

node.vm.provision "shell", inline: <<-SHELL
sudo yum -y install tree
SHELL

node.vm.provider "virtualbox" do |vb|
vb.customize ["modifyvm", :id, "--memory", "256"]
end
Expand Down
1 change: 1 addition & 0 deletions build-redis-mini/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src
12 changes: 12 additions & 0 deletions build-redis-mini/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# a minimal Dockerized `redis-server`

FROM scratch

ADD rootfs.tar.gz /
COPY redis.conf /etc/redis/redis.conf

# Redis port.
EXPOSE 6379


CMD ["redis-server"]