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.

Sign up for GitHub

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

Update to Docker 1.7.1 #124

Merged
merged 12 commits into from
Aug 7, 2015
Merged

Update to Docker 1.7.1 #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3ef9315
update to docker 1.7.0
tknerr Jun 28, 2015
13ebbc2
echo the boot2docker config for debugging
tknerr Jul 14, 2015
b30c6bb
use less memory and add some verbosity for debugging
tknerr Jul 14, 2015
9cd1c10
keep up with changes from master and set VBOX_MSI_INSTALL_PATH
tknerr Jul 14, 2015
0c6930c
output the status of the docker deamon so we can see that it's running
tknerr Jul 17, 2015
a56aa7c
update the DOCKER_HOST env var in `b2d-start` as the ip address might…
tknerr Jul 17, 2015
99fd4bd
remove verbosity and add --memory option to `b2d init` which is the c…
tknerr Jul 17, 2015
781fbec
use `curl` instead of `boot2docker download` so we can control the ve…
tknerr Jul 17, 2015
85441d8
echo the boot2docker and docker client versions for sanity checking
tknerr Jul 17, 2015
c783517
update to docker 1.7.1
tknerr Jul 17, 2015
971a6b6
remove acceptance testing related stuff from appveyor.yml since we do…
tknerr Aug 7, 2015
5af237b
explicitly use 2048 MB memory for the boot2docker-vm (which is also t…
tknerr Aug 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* update to Consul 0.5.2
* update to Terraform 0.6.1
* update to Packer 0.8.2
* update to Docker 1.7.1
* plugin updates:
* update to vagrant-cachier 1.2.1 (with chef-zero support)
* update to vagrant-proxyconf 1.5.1
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ The main tools for cooking with Chef / Vagrant:
* [Terraform](http://terraform.io/) 0.6.1
* [Packer](http://packer.io/) 0.8.2
* [Consul](http://consul.io/) 0.5.2
* [Docker](http://docker.io/) 1.6.2 (using boot2docker)
* [Docker](http://docker.io/) 1.7.1 (using boot2docker)

### Plugins

Expand Down
4 changes: 2 additions & 2 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ end

def download_tools
[
%w{ github.com/boot2docker/boot2docker-cli/releases/download/v1.6.2/boot2docker-v1.6.2-windows-amd64.exe docker/boot2docker.exe },
%w{ get.docker.com/builds/Windows/x86_64/docker-1.6.2.exe docker/docker.exe },
%w{ github.com/boot2docker/boot2docker-cli/releases/download/v1.7.1/boot2docker-v1.7.1-windows-amd64.exe docker/boot2docker.exe },
%w{ get.docker.com/builds/Windows/x86_64/docker-1.7.1.exe docker/docker.exe },
%w{ github.com/Maximus5/ConEmu/releases/download/v15.07.28/ConEmuPack.150728.7z conemu },
%w{ github.com/mridgers/clink/releases/download/0.4.4/clink_0.4.4_setup.exe clink },
%w{ github.com/atom/atom/releases/download/v1.0.4/atom-windows.zip atom },
Expand Down
24 changes: 21 additions & 3 deletions files/tools/scripts/b2d-start.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

:: check if we have the .iso file (if we don't have it, the VM won't start!)
if not exist %HOME%\.boot2docker\boot2docker.iso (
echo boot2docker.iso not found in %HOME%\.boot2docker\, downloading it...
boot2docker download
echo boot2docker.iso not found in %HOME%\.boot2docker\, downloading version 1.7.1...
curl -L -o %HOME%\.boot2docker\boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v1.7.1/boot2docker.iso
)

:: check if "boot2docker-vm" exists already
Expand All @@ -16,7 +16,7 @@ for /f "usebackq tokens=*" %%l in (`VBoxManage list --long vms`) do (

:init
echo No existing boot2docker-vm found in VirtualBox, initializing...
boot2docker init
boot2docker init --memory=2048

:check
:: check if boot2docker is running
Expand Down Expand Up @@ -54,6 +54,9 @@ set BK_ROOT_CYGPATH=%BK_ROOT_DRIVE%
echo Adding shared folder "billskitchen" for hostpath %BK_ROOT%
VBoxManage sharedfolder add "boot2docker-vm" --name "billskitchen" --hostpath %BK_ROOT%

:: echo the config for debugging
::boot2docker config

:: bring it up
echo Bringing up the boot2docker VM...
boot2docker up
Expand All @@ -73,8 +76,23 @@ if "%BK_USE_PROXY%" == "1" (
boot2docker ssh "sudo rm -rf /var/lib/boot2docker/profile"
)
boot2docker ssh "sudo /etc/init.d/docker restart > /dev/null"
boot2docker ssh "sudo /etc/init.d/docker status"


ENDLOCAL



:: update the DOCKER_HOST as the ip address might change
for /f "usebackq tokens=*" %%s in (`boot2docker ip`) do set b2d_ip=%%s
echo updating DOCKER_HOST env var to "tcp://%b2d_ip%:2376"...
set DOCKER_HOST=tcp://%b2d_ip%:2376

:: echo the boot2docker / docker client versions
echo boot2docker version:
boot2docker ssh "docker -v"
echo docker client version:
docker -v


:end
8 changes: 4 additions & 4 deletions spec/integration/bills_kitchen_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@
it "installs apm 1.0.1" do
run_cmd("#{BUILD_DIR}/tools/atom/Atom/resources/app/apm/bin/apm.cmd -v").should match('1.0.1')
end
it "installs docker 1.6.2" do
run_cmd("docker -v").should match('Docker version 1.6.2')
it "installs docker 1.7.1" do
run_cmd("docker -v").should match('Docker version 1.7.1')
end
it "installs boot2docker-cli 1.6.2" do
run_cmd("boot2docker version").should match('Boot2Docker-cli version: v1.6.2')
it "installs boot2docker-cli 1.7.1" do
run_cmd("boot2docker version").should match('Boot2Docker-cli version: v1.7.1')
end
end

Expand Down