boot2docker / osx-installer

Docker installer for Mac OS X
Apache License 2.0
1.25k stars 258 forks source link

WIP: Ship 1.3.0 #74

Closed bfirsh closed 9 years ago

bfirsh commented 9 years ago

Do not merge until https://github.com/docker/docker/pull/8323 has been merged.

A build with https://github.com/boot2docker/boot2docker/pull/566 and https://github.com/boot2docker/boot2docker-cli/pull/272 : http://bfirsh.s3.amazonaws.com/docker-osx-installer/Docker-1.3.0-9d16943.pkg

tianon commented 9 years ago

Would you mind summarizing the change to mpkg/boot2docker.app/Contents/Resources/Scripts/main.scpt since the diff is useless? I'm not concerned, just curious. :smile:

LGTM

bfirsh commented 9 years ago

Oh sure, yeah. I'll add a little diff to to the commit. We should really use the Applescript source and compile on build, but I don't think we can get osacompile inside Docker. :(

bfirsh commented 9 years ago

@tianon There we go. Is that helpful?

tianon commented 9 years ago

Yesss, perty! :heart:

(and I totally agree about using the plain-text format - there's bound to be some way to make that work)

SvenDowideit commented 9 years ago

LGTM

bfirsh commented 9 years ago

As per https://github.com/boot2docker/boot2docker/pull/567, I've updated virtualbox to 4.3.18. I'll make a build and give it a test.

bfirsh commented 9 years ago

New build: https://bfirsh.s3.amazonaws.com/docker-osx-installer/Docker-1.3.0-9d16943.pkg

bfirsh commented 9 years ago

All works great, though I'm still running into https://github.com/boot2docker/boot2docker-cli/pull/270

SvenDowideit commented 9 years ago

This is waiting for the docker 1.3.0 release to hit https://get.docker.com

SvenDowideit commented 9 years ago

I can confirm i get boot2docker/boot2docker-cli#270 too

SvenDowideit commented 9 years ago

timeout still happens with

bash-3.2$ boot2docker version
Boot2Docker-cli version: v1.3.0
Git commit: 1d0b71b

https://github.com/tianon/boot2docker-cli/releases/tag/1.3.0-beta

no idea how @tianon released that on 22 Feb, I'm going to build my own.

SvenDowideit commented 9 years ago

er @tianon

bash-3.2$ make
rm -f boot2docker*
docker rm "boot2docker-cli-build" 2>/dev/null || true
docker build -t "boot2docker-golang" .
Sending build context to Docker daemon 10.17 MB
Sending build context to Docker daemon 
Step 0 : FROM golang:1.3-cross
golang:1.3-cross: The image you are pulling has been verified
ad97f49020c4: Downloading [=>                                                 ] 7.569 MB/216.5 MB 43m38s
e4fb9076d684: Download complete 
abc0add39a58: Downloading [=========>                                         ] 7.667 MB/41.03 MB 6m52s
0543a3778018: Downloading [====>                                              ] 7.028 MB/79.75 MB 16m24s
ac69e0684bde: Download complete 
95201034386b: Download complete 
8b0171d2e8a7: Download complete 
601ea7bdf704: Download complete 
6982015c482b: Download complete 
b235f28e14c9: Download complete 
9e8316532b60: Download complete 
449dc87bff58: Download complete 
516fa1c31c1a: Downloading [>                                                  ] 7.569 MB/1.4 GB 4h11m31s
511136ea3c5a: Already exists 
50215b109eda: Already exists 
53f380325ee9: Already exists 

1.4GB layer? I hope this is just a temporary bug

SvenDowideit commented 9 years ago

I've reverted the 300->600 mS change, and instead added a --retries option. On the OSX vm that I can reproduce the timeout on (even with that extra time), I get the following result:

bash-3.2$ ./boot2docker-v1.3.0-darwin-amd64 init
bash-3.2$ ./boot2docker-v1.3.0-darwin-amd64 --retries=45 up
Waiting for VM and Docker daemon to start...
...................................................................
Started.
Writing /Users/sven/.boot2docker/certs/boot2docker-vm/ca.pem
Writing /Users/sven/.boot2docker/certs/boot2docker-vm/cert.pem
Writing /Users/sven/.boot2docker/certs/boot2docker-vm/key.pem

To connect the Docker client to the Docker daemon, please set:
    export DOCKER_HOST=tcp://192.168.59.105:2376
    export DOCKER_CERT_PATH=/Users/sven/.boot2docker/certs/boot2docker-vm
    export DOCKER_TLS_VERIFY=1

bash-3.2$ ./boot2docker-v1.3.0-darwin-amd64 delete
bash-3.2$ ./boot2docker-v1.3.0-darwin-amd64 init
bash-3.2$ ./boot2docker-v1.3.0-darwin-amd64 --retries=30 up
Waiting for VM and Docker daemon to start...
..........................................................
Started.
  Trying to get Docker socket one more time
Error requesting socket: exit status 1
Auto detection of the VM's Docker socket failed.
Please run `boot2docker -v up` to diagnose.

So I'm going to propose we increase the number of retries - that way it won't be any slower for users of fast machines, but is going to work on horribly IO bound, slow CPUs. and for really bad situations, users can set the value in their ./boot2docker/config

SvenDowideit commented 9 years ago

I think https://github.com/boot2docker/boot2docker-cli/pull/281 is a better fix.

tianon commented 9 years ago

LGTM