Skip to content
This repository was archived by the owner on Jan 1, 2021. It is now read-only.

WIP: Ship 1.3.0#566

Merged
tianon merged 1 commit intoboot2docker:masterfrom
bfirsh:ship-1.3.0
Oct 16, 2014
Merged

WIP: Ship 1.3.0#566
tianon merged 1 commit intoboot2docker:masterfrom
bfirsh:ship-1.3.0

Conversation

@bfirsh
Copy link
Copy Markdown
Contributor

@bfirsh bfirsh commented Oct 13, 2014

Based on top of #563 with RC binary from moby/moby#8323. Do not merge until moby/moby#8323 has been merged.

RC release: https://bfirsh.s3.amazonaws.com/boot2docker/boot2docker-1.3.0-fd99db6.iso

@bfirsh bfirsh changed the title Ship 1.3.0 WIP: Ship 1.3.0 Oct 13, 2014
@bfirsh bfirsh force-pushed the ship-1.3.0 branch 2 times, most recently from 9a30b93 to 794ef74 Compare October 13, 2014 10:24
@bfirsh bfirsh added this to the 1.3.0 milestone Oct 13, 2014
@SvenDowideit
Copy link
Copy Markdown
Contributor

I'm building a rebased to master version of this with added 1.3.0 docker test binary, and will work with it for the rest of my day.

@SvenDowideit
Copy link
Copy Markdown
Contributor

  • Darwin: using b2d 1.3 and b2d-cli 1.3 and docker 1.2, it works - you only need --tls (as it should be) ✅
  • Darwin: 1.3 for all 3, and it works, no --tls needed ✅

@SvenDowideit
Copy link
Copy Markdown
Contributor

  • small nit: every time you run boot2docker init or boot2docker shellinit, the b2d certs are re-copied - even if they did not change

@SvenDowideit
Copy link
Copy Markdown
Contributor

I've edited out the BINDDIR remote DOCKER_HOST check in the docker make file, created a new b2d vm: make cross results in fully functional binaries in the bundle dir on OSX (so the vbox share works) - PR needed:

diff --git a/Makefile b/Makefile
index 842cc18..842be75 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,8 @@

 # to allow `make BINDDIR=. shell` or `make BINDDIR= test`
 # (default to no bind mount if DOCKER_HOST is set)
-BINDDIR := $(if $(DOCKER_HOST),,bundles)
+#BINDDIR := $(if $(DOCKER_HOST),,bundles)
+BINDDIR := bundles
 # to allow `make DOCSPORT=9000 docs`
 DOCSPORT := 8000

(will update with make test results in a few hours?)

Signed-off-by: Ben Firshman <[email protected]>
@bfirsh
Copy link
Copy Markdown
Contributor Author

bfirsh commented Oct 14, 2014

Alright, here's a new build, rebased on master: https://bfirsh.s3.amazonaws.com/boot2docker/boot2docker-1.3.0-fd99db6.iso

@SvenDowideit
Copy link
Copy Markdown
Contributor

oh, and LGTM :)

@tianon
Copy link
Copy Markdown
Contributor

tianon commented Oct 16, 2014

LGTM

tianon added a commit that referenced this pull request Oct 16, 2014
@tianon tianon merged commit cfec539 into boot2docker:master Oct 16, 2014
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants