docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
11,040 Commits 12 Branches 296 Tags
17a695568cce61b4c95ecf6cfbe9cbe8cdee2417
Commit Graph

475 Commits

Author SHA1 Message Date
Michael Crosby
39417f76ad Update to libcontainer 8d1d0ba38a7348c5cfdc05aea3b 
This fixes issues where the apparmor profile is not applied to processes
via docker exec.  As a side effect the parent processes were unable to
kill the additional child processes because of the profile mismatch.

Easy way to reproduce on an apparmor system:
docker run -ti debian:jessie bash
ps auxZ
- look at the labels

- in another shell
docker exec <name> sleep 1000

- go back to the first container and
ps auxZ
- make sure all processes have the correct docker-default profile

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 018ce19b31bbd8d752658835e9442fa7d59a47e3
Component: engine
 2014-10-14 06:24:38 +00:00
Michael Crosby
b3ff7a5ede Update libcontainer to 4f409628d80b9842004a3f17c92 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 8fedf718ce0c788311d8d3382b0aaeb9b9a792d4
Component: engine
 2014-10-13 19:53:20 +00:00
Jérôme Petazzoni
bdbbff32ad Add -E flag to sudo (fixes #8494) 
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com> (github: jpetazzo)
Upstream-commit: e01e913d80dcbd509a003feb55c7cdb6fc9758c2
Component: engine
 2014-10-09 14:54:22 -07:00
Michael Crosby
9b0677b8de Merge pull request #8320 from dmcgowan/provenance_pull 
Official image provenance pull flow
Upstream-commit: eaaf9e31258ca0af042e07c707f6bbb3afeb293b
Component: engine
 2014-10-03 10:56:54 -07:00
Michael Crosby
824c8d6309 Update libconatiner to b3570267c7b7995d5d618974d8f 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 193654e3ef26067315d6c68c3066215e5c509ae5
Component: engine
 2014-10-02 22:19:56 +00:00
Derek McGowan
8635bae7b0 Update libtrust version 
Updated to version of libtrust with the trust graph implementation

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 8a6c7100ea7f6ea82ba567863b6401f45766625b
Component: engine
 2014-10-01 13:19:40 -07:00
Tianon Gravi
b79cf494d2 Merge pull request #8293 from crosbymichael/update-libcontainer-sep8 
Update libcontainer to c744f6470e37be5ce1f1ae09b842c15c1bee120d
Upstream-commit: 07179a7eb1a0cb7816b618a108d46cb4a4e699ca
Component: engine
 2014-09-29 18:09:25 -06:00
Victor Vieux
baaf0d57f5 Merge pull request #8112 from dmcgowan/libtrust_key_management 
Libtrust key management
Upstream-commit: 999d4117f6544aeefaba3c40aef678042c71aa7a
Component: engine
 2014-09-29 16:32:48 -07:00
Michael Crosby
9ea819ca0c Update libcontainer to c744f6470e37be5ce1f1ae09b84 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 392eec20751bd1da7f84fa4974042eaa263a56d2
Component: engine
 2014-09-29 21:23:42 +00:00
Tianon Gravi
c8d8a3e7a1 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>
Upstream-commit: 8ffdf6022e88e19c6d1f434a69ff5cbd3dc7db6b
Component: engine
 2014-09-28 21:51:44 -06:00
Derek McGowan
82830cd901 Vendor libtrust 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: a049ac32d1850e9bc5b16640a859b1709bc4af62
Component: engine
 2014-09-26 15:48:12 -07:00
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