Commit Graph

5 Commits

Author SHA1 Message Date
241c2f0465 Tweak test-docker-py feature
- move docker/docker-py clone to the Dockerfile
- put "integration test daemon startup" code in a separate file for both scripts to source
- add new test-docker-py Makefile target
- include "python-websocket" package in Dockerfile for running the tests

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 100267de81985bbf3b976bfde850def89487dc11
Component: engine
2014-12-19 10:47:01 -07:00
9576e39bda Merge branch 'master' of github.com:docker/docker into debug
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 61586414ca227f7c61395ccf9605f5ceece54399
Component: engine
2014-11-25 14:09:19 -05:00
6ebbd4b25f Allow developers to build docker with debuginfo included
If you execute

DEBUG=-g hack/make.sh dynbinary

Docker will be build with the debug info making it easier to use
cgdb or lightide to debug.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: bce9ed0e4c56b85c8a4a5ba2b1af45035deec9dd
Component: engine
2014-11-20 12:59:50 -05:00
eb838e9fad Adapt project/make.sh for Windows builds
Fixes:
- link -H windows is not compatible with -linkmode external
- under Cygwin go does not play well with cygdrive type paths

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: ce86d5ae6826b0ec3dcf3188f8a6bd37b0afd3b2
Component: engine
2014-11-19 13:41:57 -08:00
e8e8b5b2cb Move 'hack' to the less confusing 'project'
We might want to break it up into smaller pieces (eg. tools in one
place, documents in another) but let's worry about that later.

Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 32e61b8f5c3f855f5e204064be1aea6a877dda43
Component: engine
2014-11-09 21:50:28 +00:00