449c9e0d74
hack: TIMEOUT (for controlling test timeout) and forwarding of
...
BUILDFLAGS to binary/dynbinary.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: aa129b356ff9f16409cba25e9f16805923970cad
Component: engine
2014-09-25 14:25:43 -07:00
c02ebae1f7
Add Daemon test utils
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 054b921a2c140f9b8250f6c7e12dec9fba23ce0f
Component: engine
2014-09-02 10:58:36 -07:00
309f9edb73
Add a "daemon" build tag and toggle it with the already-existing "DOCKER_CLIENTONLY" build variable
...
This works mostly by refactoring our "main" package to be careful about what it imports based on the daemon build tag. :)
Also, I've updated Travis to test "client-only" compilation after it tests the daemon version.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 1b95590d06b20b79041f6d23b9bc35612b82cb51
Component: engine
2014-08-04 15:05:12 -06:00
4d9e0d4b74
Fix more instances of "dotcloud/docker" in hack/ (and add a DOCKER_PKG environment variable to simplify references to our "package path" in our bundlescripts)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 3a14eb066cef537e52f96c6ad76adab2efe02e05
Component: engine
2014-07-30 17:02:04 -06:00
7e29f226f3
Kill all concurrent jobs on error
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 4cfe806db2a41a97079a4881d4a0099a7b5b8149
Component: engine
2014-07-26 13:45:35 -04:00
de5528653f
Add a bunch more tweaks to the parallel test compilation
...
- put all the precompiled test binaries in $DEST so they show up in bundles and can be re-run individually afterwards
- support cases where parallel is not installed (when using dyntest-unit, for example, this is much more common, since it's designed to be run outside the Dockerfile)
- use "mktemp -d" instead of "/tmp" directly for our temporary parallel HOME
- update the default PARALLEL_JOBS to be the value of "nproc" instead of 0, since "0 means as many as possible" (see https://www.gnu.org/software/parallel/man.html#jobs_n )
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: a6085fd430e8f155e4a0738de752df3c77bc132f
Component: engine
2014-07-26 11:46:36 -04:00
3247893959
benign whitespace change
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 3a1385702cdd69a0b85b726dac6e749eb0e97fc1
Component: engine
2014-07-26 11:46:36 -04:00
e0a3dfaf31
compile unit tests in parallel with GNU parallel
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 158e3068bda22ee09b00d37b3e4b33e42ecced1b
Component: engine
2014-07-26 11:46:36 -04:00
6ae4c9014c
update go import path and libcontainer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
2014-07-24 22:19:50 +00:00
d1de6bfa90
Fix dyntest and rename it to dyntest-unit to match the test-unit rename
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 986a151b8afe59b33097235a5964f78fc1a55521
Component: engine
2014-06-19 15:06:34 -06:00
4a0a27b9ff
Don't compile nsinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 3986bc659be9ff83d521f82e3353b1f73b896cbc
Component: engine
2014-06-05 17:03:32 -07:00
62daf025f0
updated documentation for mentioning images vs containers
...
Docker-DCO-1.1-Signed-off-by: Robin Speekenbrink <robin@kingsquare.nl > (github: fruitl00p)
rebased by
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: a0505edc9a890b3d4cdf5cf1850273c250c3dc41
Component: engine
2014-05-29 11:20:41 +10:00
79d31745eb
Add new test-unit make rule which only runs the unit tests. Renames test
...
bundle to test-unit.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
Upstream-commit: a39f3c9200d574c12b88fb91654f1242ec07b7b5
Component: engine
2014-04-29 23:26:27 +00:00
da097b4451
SQLite is also available in FreeBSD
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
Upstream-commit: 92ea101bc4a498e952ede00bff53d0123f22f41c
Component: engine
2014-04-17 07:19:30 +09:00
d9e097fbe6
Unlike GNU find, FreeBSD's find needs a path before an expression
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
Upstream-commit: 66baf56601f4fc1e8f5f2863d227283954b73a77
Component: engine
2014-04-10 07:13:41 +09:00
380ead943d
Use LLVM Clang explicitly on FreeBSD
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
Upstream-commit: 18bea2495d0bcc354a2538cb161081cb56e5c6f7
Component: engine
2014-04-10 07:13:41 +09:00
6a12ffd870
Add new validate-dco and validate-gofmt bundlescripts for DCO and gofmt validation
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 81370b5b0fc6788bbde32fd9f39c6eee1bcb0c2e
Component: engine
2014-04-04 00:41:33 -06:00
b8be547acb
Add "test-integration-cli" to our DEFAULT_BUNDLES list (make all)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 2543912e7b5593722a6a22b9ceb6a23f6268e397
Component: engine
2014-03-31 11:55:55 -06:00
624997be0f
initial version of cli integration tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 6db32fdefdae49843ed9535b3af1099e6bd2755d
Component: engine
2014-03-29 23:09:40 +02:00
4b9413542a
Vendor github.com/godbus/dbus and github.com/coreos/go-systemd
...
We need this to do systemd API calls.
We also add the static_build tag to make godbus not use
os/user which is problematic for static builds.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: d4725801b3401d04b3f35b5783bdc0fc362f7f00
Component: engine
2014-03-27 22:44:26 +01:00
d4638ba0e0
Fix a lot of the sha256 and md5 stuff to be more DRY and extendible, and on more things (specifically, the tgz files too)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 6b46a09186b6a53959d567014b8d0e1cff761bc8
Component: engine
2014-03-19 22:25:09 -06:00
c3a135a2b6
Exclude more "definitely not unit tested Go source code" directories from hack/make/test
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 99b6364790e59a70d57949792fa31014637c93ee
Component: engine
2014-03-12 01:18:12 -06:00
6f72a528dc
Clean up the "go test" output from "make test" to be much more readable/scannable
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: e1c48fa56007e1db028f7f83bfbf79c3d05feccd
Component: engine
2014-03-12 01:17:38 -06:00
2e92b6ef1e
Fix dynbinary so that dockerinit can still be properly static even if it has to link against libapparmor for Ubuntu
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: be344cf0d8e4f9881724f49398603a6e3109bc89
Component: engine
2014-03-06 19:55:22 -07:00
24c5efffe2
Update build tags such that we can properly compile on all platforms (especially for packagers), and updated hack/PACKAGERS.md to mention the DOCKER_BUILDTAGS variable that will need to be set for binaries that might be used on AppArmor (such as Debian and especially Ubuntu)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 0b23393ba1901df3d08916fa977707db58699eca
Component: engine
2014-03-06 13:39:17 -07:00
2ebfedab6d
Add buildflags to allow crosscompilation for apparmor
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: c89fa6645ef87e1863ef5812bd42176f5bd987ca
Component: engine
2014-03-06 12:05:03 -08:00
3337013302
Package coverage when running integration tests
...
If coverpkg is missing on `go test` command, only the current package
will be covered. That's the case of unit tests. For integration tests
we need to explicitly declare each package.
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
Upstream-commit: b3d5e9527a050a0c7252f0125a8a26a6fc5175f1
Component: engine
2014-02-19 16:59:51 +00:00
1e6f0f8de2
Merge pull request #4043 from tianon/hack-git-detection-and-use
...
Add better ".git" detection and use
Upstream-commit: f794fbc2306e633916b7f000d441d234e198fc24
Component: engine
2014-02-13 09:56:14 -07:00
2b6a0d82a2
Fix the one spot I missed dockerversion
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 7ea725fdc530e989516fae60f5dafecb139d75b8
Component: engine
2014-02-11 18:23:17 -07:00
ef486c6630
Move docker version introspection to a sub-package.
...
This facilitates the refactoring of commands.go.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: ae3c7dec3b075a263da8d1e1cc510275b281e799
Component: engine
2014-02-11 16:10:51 -08:00
f694361fe5
Add better ".git" detection and use
...
This way, packagers can set GIT_DIR appropriately if they'd prefer to not have ".git" inside their working directory.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 0a0406450fb83f4ff7d08235cd3e94ea8fba752f
Component: engine
2014-02-10 13:48:43 -07:00
aa80369d9a
Add slightly better GOPATH detection/handling
...
This also adds a new "AUTO_GOPATH" environment variable that will create an appropriate GOPATH as part of the build process.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: d3d85d38fb5bdd0327fdc9fe8b637cb0f4e1dcf2
Component: engine
2014-02-09 18:21:01 -07:00
d51ad14ef1
Update hack/make.sh with slightly clearer output and a more precise "are we in the Docker container?" check
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: b994c1315997945815e7b927b8493595b194d016
Component: engine
2014-01-26 13:24:03 -07:00
923913cbf1
This should make all bash-scripts run on pretty much any posix-system (with bash installed ofc...)
...
Docker-DCO-1.1-Signed-off-by: Kim BKC Carlbacker <kim.carlbacker@gmail.com > (github: bkcsoft)
Upstream-commit: b1953baba28362c928d962f0729325d3293c4753
Component: engine
2014-01-22 02:21:56 +01:00
4e140a2de4
Spelling error.
...
Upstream-commit: 2a1181f404387f6d530a86a6196b40a6dd541c20
Component: engine
2014-01-04 23:15:15 -05:00
93593cd471
Fixes Issue #3400
...
See Issue #3400
Upstream-commit: ad80da33895aa9f2200279282acc25e4b2bcbf27
Component: engine
2013-12-30 20:58:25 -05:00
9526d02fc2
use the Makefile - it makes life so much simpler
...
Upstream-commit: 83d81758b0ca7de9ca38f4ea3a7eaaa8a0c275ad
Component: engine
2013-12-23 23:46:52 +10:00
a7fc58e1eb
Add new "cross" bundle to cross-compile the Docker client for other platforms (currently just 32-bit and 64-bit OS X)
...
Upstream-commit: 62a81370fffb3cfdb15ef19702f0ea07ab2f4c36
Component: engine
2013-12-19 11:33:49 -07:00
70fa345719
Add -a to our BUILDFLAGS directly, which fixes some fun test compilation issues
...
Also, now that we use "-a", we no longer get any benefit from "go test -i", and it actually causes problems sometimes, so let's nuke it.
Upstream-commit: fbac8125408c076317f3f51239394cd6b7351b49
Component: engine
2013-12-18 11:32:25 -07:00
55aa26742d
Fix "go tool cover" detection to only add -cover and -coverprofile if we both have cover support in Go, and if we have the cover tool downloaded
...
Upstream-commit: eddda577a4dd7f8fb4fb67fd1600c2a7c5de40c7
Component: engine
2013-12-16 22:54:06 -07:00
6a19f653da
Add new cover bundlescript for giving a nice report across all the coverprofiles generated by the test scripts
...
Upstream-commit: 59dc2876a7d2ac0e231d7d97511e572a1d739136
Component: engine
2013-12-13 11:59:54 -07:00
bc39a675a4
Add separate "test-integration" bundlescript (and corresponding dyntest-integration bundlescript)
...
Upstream-commit: f0879a1e145f31569e9e4e61f429de858bb636ab
Component: engine
2013-12-08 18:43:24 -07:00
1f4109a158
Clean output and simplify hack/make/*test by adding go_test_dir function in make.sh
...
Upstream-commit: dcfc4ada4dcc8b1f878370976f29ca0485e690f8
Component: engine
2013-12-08 13:49:57 -07:00
18e7ca81c6
Merge pull request #2815 from tianon/hack-make-tgz
...
Add tgz bundlescript
Upstream-commit: 8bd6127ab357a84bb95c8dc69373232549f2c96a
Component: engine
2013-11-25 21:29:14 -08:00
cacce7d99b
Add new tgz bundlescript to default make and release
...
Upstream-commit: b3f5973f41eeb0e445b16ec0813b7996fba2fde7
Component: engine
2013-11-21 22:34:54 -07:00
a0108629ac
Add support for compiling using make.sh without '.git' (ie, from a Github tarball, for example)
...
Upstream-commit: efd0e13ca7e11e6422faf63986f443fe0df0cece
Component: engine
2013-11-21 15:11:17 -07:00
7f47a302d5
Add dynbinary and dyntest scripts for building/testing a separate static dockerinit binary
...
After a nice long brainstorming session with @shykes on IRC, we decided on using a SHA1 hash of dockerinit compiled into the dynamic docker binary to ensure that we always use the two in a perfect pair, and never mix and match.
Upstream-commit: 21161dbd515fb97cf9052a5980de6fc6180a89dc
Component: engine
2013-10-25 15:13:25 -07:00
abf7c9daea
Refactor the handling of static-related build flags
...
This is as discussed with @shykes on IRC
Upstream-commit: d7897508516c05e7ffea5b96053ec80c7771d777
Component: engine
2013-10-25 15:13:25 -07:00
98fe860f99
Add a few small consistency tweaks in hack
...
Upstream-commit: fb8d488896bd147aa810c9736fce1186b8d769b5
Component: engine
2013-10-25 15:13:25 -07:00
952ac8a789
Add links for container relationships and introspection
...
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
2013-10-25 15:13:24 -07:00
