Skip to content

Commit

Permalink
Merge 'dduportal' into parallels
Browse files Browse the repository at this point in the history
* commit '0c77238958c16504f4752df631daf3c91d437251':
  Update changelog
  Implmeent an option for disabling private network
  Moving to boot2docker 1.8.2
  Forgotten changelog piece
  address issue dduportal/boot2docker-vagrant-box#36
  • Loading branch information
legal90 committed Sep 12, 2015
2 parents be42a73 + 0c77238 commit 6a8fc68
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
BOOT2DOCKER_VERSION := 1.8.1
BOOT2DOCKER_VERSION := 1.8.2

B2D_ISO_FILE := boot2docker.iso
B2D_ISO_URL := https://github.com/boot2docker/boot2docker/releases/download/v$(BOOT2DOCKER_VERSION)/boot2docker.iso
B2D_ISO_CHECKSUM := 7e231d3c33e08f08b604fdc9a557b64b
B2D_ISO_CHECKSUM := 29839aeef97758e142eae4c2fd10890b

all: parallels virtualbox

Expand Down
2 changes: 1 addition & 1 deletion tests/parallels/boot2docker_vagrant_parallels.bats
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bats

DOCKER_TARGET_VERSION=1.8.1
DOCKER_TARGET_VERSION=1.8.2

# Assume that Vagrantfile exists and basebox is added
@test "vagrant up" {
Expand Down
13 changes: 10 additions & 3 deletions tests/virtualbox/boot2docker_vagrant_virtualbox.bats
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
vagrant ssh -c 'docker ps'
}

DOCKER_TARGET_VERSION=1.8.1
DOCKER_TARGET_VERSION=1.8.2
@test "Docker is version DOCKER_TARGET_VERSION=${DOCKER_TARGET_VERSION}" {
DOCKER_VERSION=$(vagrant ssh -c "docker version --format '{{.Server.Version}}'" -- -n -T)
[ "${DOCKER_VERSION}" == "${DOCKER_TARGET_VERSION}" ]
Expand All @@ -51,19 +51,26 @@ DOCKER_TARGET_VERSION=1.8.1
[ $(vagrant ssh -c 'ps aux | grep rpc.statd | wc -l' -- -n -T) -ge 1 ]
}

@test "We shave a default synced folder thru vboxsf instead of NFS" {
@test "We have a default synced folder thru vboxsf instead of NFS" {
mount_point=$(vagrant ssh -c 'mount' | grep vboxsf | awk '{ print $3 }')
[ $(vagrant ssh -c "ls -l ${mount_point}/Vagrantfile | wc -l" -- -n -T) -ge 1 ]
}

@test "We shave a NFS synced folder if B2D_NFS_SYNC is set (admin password required, will fail on Windows)" {
@test "We have a NFS synced folder if B2D_NFS_SYNC is set (admin password required, will fail on Windows)" {
export B2D_NFS_SYNC=1
vagrant reload
mount_point=$(vagrant ssh -c 'mount' | grep nfs | awk '{ print $3 }')
[ $(vagrant ssh -c "ls -l $mount_point/Vagrantfile | wc -l" -- -n -T) -ge 1 ]
unset B2D_NFS_SYNC
}

@test "We can disable the private network if B2D_DISABLE_PRIVATE_NETWORK is set" {
export B2D_DISABLE_PRIVATE_NETWORK=1
vagrant reload
[ $(vagrant ssh -c "ip addr show | grep -e 'eth.:' | wc -l" -- -n -T) -eq 1 ]
unset B2D_DISABLE_PRIVATE_NETWORK
}

@test "We can share folder thru rsync" {
sed 's/#SYNC_TOKEN/config.vm.synced_folder ".", "\/vagrant", type: "rsync"/g' vagrantfile.orig > Vagrantfile
vagrant reload
Expand Down

0 comments on commit 6a8fc68

Please sign in to comment.