Commit Graph

16 Commits

Author SHA1 Message Date
d63f98eeb4 Rename .dockerversion to .go-autogen so it's clear that all autogenerated code goes here
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 8625a281c66180af867f59a041560bf5035ae404
Component: engine
2015-03-03 12:42:38 -07:00
3aaa63fb85 Cleanup "autogen/" if we have successful build
This way, we only leave around autogenerated files if the build fails (which is reasonable IMO, since that's when you'd need them for debugging the build failure).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 44adbf23b5476ce26f807f956a21f27f07311a10
Component: engine
2015-02-23 14:12:44 -07:00
f634216d52 Removing -X flag option and autogenerated code to create Dockerversion.go functionality
Addresses #9207

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 6871b9b16afe46e7566ac2937246b4a64be97269
Component: engine
2015-02-20 05:40:12 +00:00
f303319a62 Run tests in stricter environment
Use `env -i` to very explicitly control exactly which environment variables leak into our tests.  This enforces a clean separation of "build environment knobs" versus "test suite knobs".

This also includes a minor tweak to how we handle starting our integration daemon, especially to catch failure to start sooner than failing tests.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: ed345fb18ee9d003f30884b696628b75380a426a
Component: engine
2015-02-18 23:30:43 -07:00
255fb9b1d6 Validate toml
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
Upstream-commit: d245a8a706558c4a66498cb8d1a1d8fe38dd67ee
Component: engine
2015-01-30 15:22:11 -08:00
83a3f5c28f Update project/make.sh to use execdriver buildtag if passed.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 547c95957679672c3ed2e97c7a2950d3c0a03321
Component: engine
2015-01-23 16:18:39 -08:00
1e4478b6cf Let's try fixing "netgo" again
Since "go test" doesn't seem to support "-installsuffix" as quite the same perfect solution that "go build" is happy to let it be, let's just switch those crappy old "integration/" tests to use our separate static dockerinit binary so we don't have to worry about compiling the entire test harness statically. 👍

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 232d59baeb13778abc242a602ca434d83e1eb6e8
Component: engine
2015-01-19 12:48:25 -07:00
fcb3e5c2df Revert "Add proper "netgo" compiling, thanks to rsc ♥"
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jfrazelle@users.noreply.github.com> (github: jfrazelle)
Upstream-commit: e7cfb1c28b2a52f34c8e48ede2e24645991d1104
Component: engine
2015-01-14 09:55:35 -08:00
162b61e657 Add proper "netgo" compiling, thanks to rsc ♥
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: b5aba426d4bb903825ec4b3b4912f521daac4c2a
Component: engine
2015-01-13 21:35:21 -07:00
c24f558440 Fix a few minor issues with building/running inside msysGit
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: d43f0b9fc5ec3eae816466ec0307682c13945b31
Component: engine
2015-01-09 17:28:40 -07:00
70d58a0c84 Fix tabs in project/make.sh
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: d27248007f9f4034d1a630e0ac3826af3c3357ec
Component: engine
2014-12-29 11:02:12 -08:00
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