Skip to content

Commit

Permalink
Merge branch 'refs/heads/boot2docker-0.5.4' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
YungSang committed Feb 9, 2014
2 parents 67d2583 + e11b2d7 commit a03cc2f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ boot2docker.box: boot2docker.iso
packer build template.json

boot2docker.iso:
curl -LO https://github.com/steeve/boot2docker/releases/download/v0.4.0/boot2docker.iso
curl -LO https://github.com/steeve/boot2docker/releases/download/v0.5.4/boot2docker.iso

clean:
rm -f boot2docker.iso
Expand Down
4 changes: 2 additions & 2 deletions template.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"builders": [{
"type": "virtualbox-iso",
"iso_url": "boot2docker.iso",
"iso_checksum": "681c3aae0c54bb003fe1175f62697662",
"iso_checksum_type": "none",
"iso_checksum": "522fc919ef97ed60c221b1a99a65ff2f",
"iso_checksum_type": "md5",
"boot_wait": "5s",
"ssh_username": "docker",
"ssh_password": "tcuser",
Expand Down

0 comments on commit a03cc2f

Please sign in to comment.