Tianon Gravi
07179a7eb1
Merge pull request #8293 from crosbymichael/update-libcontainer-sep8
...
Update libcontainer to c744f6470e37be5ce1f1ae09b842c15c1bee120d
2014-09-29 18:09:25 -06:00
Victor Vieux
999d4117f6
Merge pull request #8112 from dmcgowan/libtrust_key_management
...
Libtrust key management
2014-09-29 16:32:48 -07:00
Michael Crosby
392eec2075
Update libcontainer to c744f6470e37be5ce1f1ae09b84
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-09-29 21:23:42 +00:00
Tianon Gravi
8ffdf6022e
Move the body of go_compile_test_dir into a file since GNU Parallel breaks on sourcing exported Bash functions thanks to the shellshock fixes
...
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-09-28 21:51:44 -06:00
Derek McGowan
a049ac32d1
Vendor libtrust
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2014-09-26 15:48:12 -07:00
Erik Hollensbe
993033d67a
Merge pull request #8239 from erikh/hack_options
...
hack: TIMEOUT (for controlling test timeout) and forwarding of BUILDFLAGS to binary/dynbinary.
2014-09-25 14:36:00 -07:00
Erik Hollensbe
aa129b356f
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)
2014-09-25 14:25:43 -07:00
Tibor Vass
808257654a
Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-09-24 18:53:27 -04:00
Tibor Vass
3c03506cc2
Merge pull request #8121 from bbinet/cleanup-hello-world-container
...
Automatically clean up hello-world container with --rm
2014-09-22 10:52:50 -04:00
Michael Crosby
2531fba389
Update libcontainer to 185328a42654f6dc9a41814e578
...
Mac address support to the netlink pkg.
Cgroup performance and memory issues.
Netlink refactoring.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-09-19 11:21:44 -07:00
Bruno Binet
d78936b418
Automatically clean up hello-world container with --rm
...
Signed-off-by: Bruno Binet <bruno.binet@gmail.com>
2014-09-19 12:22:39 +02:00
Tianon Gravi
adb6910095
Add "hack/install.sh" to the "PRs welcome" note in the end of the install script
...
Also, simplified the output method by using `cat >&2 <<EOF ...` instead of multiple lines of `echo >&2 '...'`.
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-09-17 08:09:39 -06:00
Tianon Gravi
459b403c2f
Merge pull request #8083 from unclejack/install_apparmor
...
hack/install.sh: install apparmor when enabled
2014-09-17 08:05:29 -06:00
unclejack
9619ce9dd1
hack/install.sh: install apparmor when enabled
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-17 12:13:31 +03:00
Tianon Gravi
41e625eb7c
Merge pull request #8001 from jfrazelle/fix-key-for-test-release-ubuntu
...
use correct apt-key for test.docker.io/ubuntu
2014-09-17 00:06:57 -06:00
Jessica Frazelle
440eb7fee8
use correct apt-key for test.docker.io/ubuntu
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-11 15:22:36 -07:00
Michael Crosby
c604dc292e
Update libcontainer to 84ad9386a0240acb7475429a835
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-09-09 11:05:58 -07:00
Tomasz Lipinski
021722cf7a
Allows installation on Linux Mint Debian Edition
...
Otherwise platform won't be detected
Signed-off-by: Tomasz Lipinski <me@tlipinski.net>
2014-09-08 20:38:02 +02:00
unclejack
6db078dea7
Merge pull request #7191 from tiborvass/test-daemon
...
Add Daemon restart test along with Daemon utils
2014-09-02 22:40:23 +03:00
Tibor Vass
ca24e91408
Merge pull request #7765 from erikh/test_unit_testflags
...
hack/make: fix test-unit target to propogate TESTFLAGS properly
2014-09-02 12:18:40 -07:00
Erik Hollensbe
9a2d4e9273
hack/make: fix test-unit target to propogate TESTFLAGS properly
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-02 12:10:47 -07:00
Tibor Vass
054b921a2c
Add Daemon test utils
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-09-02 10:58:36 -07:00
Michael Crosby
cf31787cd0
Update libcontainer to 55430d0db7c6bb1198c0bb573a9
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-09-01 15:18:25 -07:00
Tianon Gravi
78c6882567
Optionalize the "hg clone" of Go, since it takes forever (now, to update our Go version too, we need to explicitly "./hack/vendor.sh --go")
...
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-08-20 14:17:11 -06:00
Michael Crosby
624b944896
Update libcontainer to db65c35051d05f3fb218a0e84a1
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-20 11:19:55 -07:00
Michael Crosby
a67d06fd43
Update libcontainer to 29363e2d2d7b8f62a5f353be333
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-15 15:41:05 -07:00
Solomon Hykes
7d1b2ebde8
Add Cristian to hack/MAINTAINERS
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-13 08:13:51 +00:00
James Turnbull
3de3719290
Merge pull request #7359 from timthelion/patch-10
...
Add process for PR acceptance, review, rejection
2014-08-12 19:17:10 -04:00
Timothy Hobbs
e4a09cd79d
Add process for PR acceptance, review, rejection
...
This is an extremely tentative PR. However, I feel that the suggestions are generally good.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: timthelion)
2014-08-12 20:29:45 +00:00
Michael Crosby
c74e8b544d
Update libcontainer to f2e78425c377acc7a67a35c3148
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-08 16:12:35 -07:00
Tianon Gravi
5101173e1f
Update hack/vendor.sh to use libcontainer's update-vendor.sh script as the source of truth for libcontainer deps and not include them in Docker's repo twice
...
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-08-06 13:18:24 -06:00
Michael Crosby
6215422286
Update libcontainer to 5589d4d879f1d7e31967a927d3e
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-05 18:13:43 -07:00
Michael Crosby
3c1212ca30
Merge pull request #7377 from tianon/daemon-build-tag
...
Add a "daemon" build tag and toggle it with the already-existing "DOCKER_CLIENTONLY" build variable
2014-08-04 17:32:03 -07:00
Tianon Gravi
6b94f2d9be
Merge pull request #7310 from stevecrozz/maintainers-grammar-update
...
Correct grammar in MAINTAINERS.md
2014-08-04 17:57:08 -06:00
Tianon Gravi
ba663eac3a
Adjust build tags to be client-only in "make cross" too
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-08-04 15:05:12 -06:00
Tianon Gravi
1b95590d06
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)
2014-08-04 15:05:12 -06:00
Stephen Crosby
74212a1565
Correct grammer in MAINTAINERS.md
...
Signed-off-by: Stephen Crosby <stevecrozz@gmail.com>
2014-08-04 13:37:01 -07:00
Michael Crosby
22f373aeda
Update libcontainer to 68ea1234a0b046803aacb2562df
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-04 12:34:11 -07:00
Tibor Vass
4909a70204
Accept vanilla Linux Foundation signoffs
...
This allows signing off commits with `git commit -s`
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Cleaned up DCO regex
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-08-01 19:30:34 -04:00
Ken ICHIKAWA
58588009c0
Btrfs graph driver is not experimental
...
Btrfs graph driver is not experimental now according to #4838 and CHANGELOG.md is saying "btrfs is no longer considered experimental.".
Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com> (github: ichik1)
2014-08-01 14:37:38 +09:00
Sven Dowideit
503d124677
Merge pull request #7035 from tianon/standardize-apt-get-install
...
Standardize "apt-get install" usage across the repo
2014-08-01 11:43:37 +10:00
Tianon Gravi
f4db3985d9
Bump libcontainer dep
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-31 12:46:35 -06:00
Tianon Gravi
3a14eb066c
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)
2014-07-30 17:02:04 -06:00
Tianon Gravi
fc637b5275
Standardize "apt-get install" usage across the repo
...
I might have missed some, but I think this is most of the offenders.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-28 17:41:59 -06:00
Tianon Gravi
5ef1126669
Merge pull request #6943 from tiborvass/parallel_compile_test
...
Parallel compile test binaries
2014-07-28 12:32:56 -06:00
unclejack
d0a0e91f1f
bump Go to 1.3
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-07-26 21:33:31 +03:00
Tibor Vass
4cfe806db2
Kill all concurrent jobs on error
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-07-26 13:45:35 -04:00
Tianon Gravi
0a7cd70924
Fix precompiled unit tests needing their "testdata" contents
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-26 11:46:52 -04:00
Tianon Gravi
a6085fd430
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)
2014-07-26 11:46:36 -04:00
Tibor Vass
3a1385702c
benign whitespace change
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-07-26 11:46:36 -04:00