p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
10,791 Commits 2 Branches 295 Tags
d50b0e242401fb2de287c26952190a9ea802acdf
Commit Graph

464 Commits

Author SHA1 Message Date
Erik Hollensbe
a9f3287fa1 Merge pull request #8239 from erikh/hack_options 
hack: TIMEOUT (for controlling test timeout) and forwarding of BUILDFLAGS to binary/dynbinary.
Upstream-commit: 993033d67ad5d2d9d4981708d7388694c3ecc8af
Component: engine
 2014-09-25 14:36:00 -07:00
Erik Hollensbe
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
Tibor Vass
8a28fc553b Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 808257654a4147ad9b54cfeddc5d0ad236c26e3f
Component: engine
 2014-09-24 18:53:27 -04:00
Tibor Vass
0c49058cda Merge pull request #8121 from bbinet/cleanup-hello-world-container 
Automatically clean up hello-world container with --rm
Upstream-commit: 3c03506cc29fe60eb36dba24dd72dcf0c6185f68
Component: engine
 2014-09-22 10:52:50 -04:00
Michael Crosby
fee8abc42e 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>
Upstream-commit: 2531fba389c8bd25ed1ec7bea38f0ee19c974a26
Component: engine
 2014-09-19 11:21:44 -07:00
Bruno Binet
84da0ae620 Automatically clean up hello-world container with --rm 
Signed-off-by: Bruno Binet <bruno.binet@gmail.com>
Upstream-commit: d78936b41842ce725f293f6bba1e3604c91682a3
Component: engine
 2014-09-19 12:22:39 +02:00
Tianon Gravi
c784504469 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>
Upstream-commit: adb6910095a18bef64a2da6815acd7d322a4c1e9
Component: engine
 2014-09-17 08:09:39 -06:00
Tianon Gravi
83725e3c4e Merge pull request #8083 from unclejack/install_apparmor 
hack/install.sh: install apparmor when enabled
Upstream-commit: 459b403c2ff5341ab15bfaa8fe609571d1a50748
Component: engine
 2014-09-17 08:05:29 -06:00
unclejack
91fbeb48fc hack/install.sh: install apparmor when enabled 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 9619ce9dd14d31cbf52c53741a1f35842bbe99a6
Component: engine
 2014-09-17 12:13:31 +03:00
Tianon Gravi
e64fa9173d Merge pull request #8001 from jfrazelle/fix-key-for-test-release-ubuntu 
use correct apt-key for test.docker.io/ubuntu
Upstream-commit: 41e625eb7cf1dd4fe747c9e63d25c73e99f98eb9
Component: engine
 2014-09-17 00:06:57 -06:00
Jessica Frazelle
ab21dc210b use correct apt-key for test.docker.io/ubuntu 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 440eb7fee88791d4f2f0866b04ff15253b6df8e9
Component: engine
 2014-09-11 15:22:36 -07:00
Michael Crosby
2d85ff46a7 Update libcontainer to 84ad9386a0240acb7475429a835 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: c604dc292e72c0cbb84184b92b4b2bd3631c862e
Component: engine
 2014-09-09 11:05:58 -07:00
Tomasz Lipinski
3d89f95ea0 Allows installation on Linux Mint Debian Edition 
Otherwise platform won't be detected

Signed-off-by: Tomasz Lipinski <me@tlipinski.net>
Upstream-commit: 021722cf7afade02c382294e4f276ca7edd1ca69
Component: engine
 2014-09-08 20:38:02 +02:00
unclejack
c953d01896 Merge pull request #7191 from tiborvass/test-daemon 
Add Daemon restart test along with Daemon utils
Upstream-commit: 6db078dea79633973b77ca5afad924e10340b39f
Component: engine
 2014-09-02 22:40:23 +03:00
Tibor Vass
d93084e649 Merge pull request #7765 from erikh/test_unit_testflags 
hack/make: fix test-unit target to propogate TESTFLAGS properly
Upstream-commit: ca24e91408181d1cbbae04fc18edce2fe61f02aa
Component: engine
 2014-09-02 12:18:40 -07:00
Erik Hollensbe
4444b40c84 hack/make: fix test-unit target to propogate TESTFLAGS properly 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 9a2d4e92730a576a05e40f7575a6c90512896e87
Component: engine
 2014-09-02 12:10:47 -07:00
Tibor Vass
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
Michael Crosby
3d48a27630 Update libcontainer to 55430d0db7c6bb1198c0bb573a9 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: cf31787cd0559012c1ee581eaf27143af1cc6ce3
Component: engine
 2014-09-01 15:18:25 -07:00
Tianon Gravi
8d2d67cdd2 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>
Upstream-commit: 78c68825671eb1bd102d76d671ace9de5a37aa19
Component: engine
 2014-08-20 14:17:11 -06:00
Michael Crosby
065feffb73 Update libcontainer to db65c35051d05f3fb218a0e84a1 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 624b944896d47031f9df166b4275037664a3cb23
Component: engine
 2014-08-20 11:19:55 -07:00
Michael Crosby
693c6c8fed Update libcontainer to 29363e2d2d7b8f62a5f353be333 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: a67d06fd4343024ed25c3faf40e58c9a1935c28a
Component: engine
 2014-08-15 15:41:05 -07:00
Solomon Hykes
defddfab5d Add Cristian to hack/MAINTAINERS 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 7d1b2ebde8a0d1484f486b5ea01b1a77014b958b
Component: engine
 2014-08-13 08:13:51 +00:00
James Turnbull
f82c0c847e Merge pull request #7359 from timthelion/patch-10 
Add process for PR acceptance, review, rejection
Upstream-commit: 3de3719290d63e1827ad61c84256e5cc219dea91
Component: engine
 2014-08-12 19:17:10 -04:00
Timothy Hobbs
db1cb3039c 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)
Upstream-commit: e4a09cd79d0ee3fbb6a33552a21c53491d9f3953
Component: engine
 2014-08-12 20:29:45 +00:00
Michael Crosby
d487159628 Update libcontainer to f2e78425c377acc7a67a35c3148 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: c74e8b544defeca8fb215a2295066e10f91bedda
Component: engine
 2014-08-08 16:12:35 -07:00
Tianon Gravi
a73db3dc5c 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>
Upstream-commit: 5101173e1fa5616768cb7a1b07f6c911f0f63658
Component: engine
 2014-08-06 13:18:24 -06:00
Michael Crosby
17e78a7923 Update libcontainer to 5589d4d879f1d7e31967a927d3e 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 6215422286f59530e598b3317c9ea789f8c1d0c7
Component: engine
 2014-08-05 18:13:43 -07:00
Michael Crosby
28202b64df 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
Upstream-commit: 3c1212ca3009dd5e8c89bfe6ab5bf42756c05da9
Component: engine
 2014-08-04 17:32:03 -07:00
Tianon Gravi
02a1f76d0b Merge pull request #7310 from stevecrozz/maintainers-grammar-update 
Correct grammar in MAINTAINERS.md
Upstream-commit: 6b94f2d9bece828f8959a51b34135f38c6ce5cc9
Component: engine
 2014-08-04 17:57:08 -06:00
Tianon Gravi
587342c3a2 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)
Upstream-commit: ba663eac3a2deba4d89803453b07a09d8628f5f9
Component: engine
 2014-08-04 15:05:12 -06:00
Tianon Gravi
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
Stephen Crosby
e31ec5d7f0 Correct grammer in MAINTAINERS.md 
Signed-off-by: Stephen Crosby <stevecrozz@gmail.com>
Upstream-commit: 74212a15658a3f1c68a381a593488d7fda830272
Component: engine
 2014-08-04 13:37:01 -07:00
Michael Crosby
3026860f67 Update libcontainer to 68ea1234a0b046803aacb2562df 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 22f373aeda63cffb06efca4fae067395191e02e9
Component: engine
 2014-08-04 12:34:11 -07:00
Tibor Vass
e68d8fa768 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)
Upstream-commit: 4909a702045e621f236f5ec5470c8a9ec7fd7022
Component: engine
 2014-08-01 19:30:34 -04:00
Ken ICHIKAWA
bcbc563aab 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)
Upstream-commit: 58588009c00d1c7dd279b95d33759f61499c2848
Component: engine
 2014-08-01 14:37:38 +09:00
Sven Dowideit
c5e8598f0d Merge pull request #7035 from tianon/standardize-apt-get-install 
Standardize "apt-get install" usage across the repo
Upstream-commit: 503d124677f5a0221e1bf8c8ed7320a15c5e01db
Component: engine
 2014-08-01 11:43:37 +10:00
Tianon Gravi
4796299987 Bump libcontainer dep 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: f4db3985d9b6ce481437c9524bb33640d602a2cb
Component: engine
 2014-07-31 12:46:35 -06:00
Tianon Gravi
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
Tianon Gravi
e2390724e7 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)
Upstream-commit: fc637b5275c2fe23c9857a34316a783042d906b8
Component: engine
 2014-07-28 17:41:59 -06:00
Tianon Gravi
ec6e0ee58c Merge pull request #6943 from tiborvass/parallel_compile_test 
Parallel compile test binaries
Upstream-commit: 5ef1126669ee6fac50679e4d65d1eb822a59fbec
Component: engine
 2014-07-28 12:32:56 -06:00
unclejack
79b92f27aa bump Go to 1.3 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: d0a0e91f1f8c3a43f04e7a58e37498124b283594
Component: engine
 2014-07-26 21:33:31 +03:00
Tibor Vass
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
Tianon Gravi
36c95b11f7 Fix precompiled unit tests needing their "testdata" contents 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 0a7cd70924178304d1919ae5ea2cc86620f2be54
Component: engine
 2014-07-26 11:46:52 -04:00
Tianon Gravi
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
Tibor Vass
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
Tibor Vass
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
Tianon Gravi
420900ca68 Merge pull request #7227 from tianon/generate-authors 
Add new script to generate AUTHORS and regenerate AUTHORS (fixing a few new dups too)
Upstream-commit: 7756bcc7abe5d50f74ceebc4a6a7fc9c5ba1a0c7
Component: engine
 2014-07-25 12:31:47 -06:00
Tianon Gravi
d2405bde3d Add new script to generate AUTHORS and regenerate AUTHORS (fixing a few new dups too) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 771ed2391536ad722e32be519039454cc98668e8
Component: engine
 2014-07-24 16:49:39 -06:00
Victor Vieux
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
Tianon Gravi
44fd11bd23 Merge pull request #7148 from tianon/buildtags-docs 
Reorganize and clarify the DOCKER_BUILDTAGS docs
Upstream-commit: 9380e8cbe71f18f20293408246f3652e1c5c9b33
Component: engine
 2014-07-23 22:27:07 -06:00