docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-19 21:41:31 +03:00
Code Activity
9,813 Commits 12 Branches 297 Tags
ddcedb45f48fab2f89d8a44eebcc3f3b70d3ae6e
Commit Graph

316 Commits

Author SHA1 Message Date
Victor Vieux
78f07b7ada Merge pull request #7344 from shykes/cleanup-server-attach 
Move container-related jobs out of deprecated server/ package
Upstream-commit: 90dadea84dc08e2ea12800b8c3b708885dbb16e2
Component: engine
 2014-07-31 15:56:48 -07:00
Michael Crosby
85222943a2 Merge pull request #7312 from tianon/update-libcontainer 
Bump libcontainer dep
Upstream-commit: b1496effe37ef6161faf0b4e987f4261329c0a66
Component: engine
 2014-07-31 15:20:07 -07:00
Tianon Gravi
cdc00db1ec Add support for autodetected HOME from USER (if HOME is unset) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 57b9467f45571c1bd98ebe4b73c6cf3d97ff051c
Component: engine
 2014-07-31 12:46:36 -06:00
unclejack
625730681d Merge pull request #7100 from discordianfish/fix-port-allocation 
Fix masked err in portmapper
Upstream-commit: 19c8e74fd3deeae7a22eb4c502acd2b9f3072ab0
Component: engine
 2014-07-30 23:51:21 +03:00
Solomon Hykes
9698011529 Move "unpause" to daemon/pause.go 
This is part of an effort to break apart the deprecated server/ package

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 63bd4ad9d6d0c55691ff33cbfd24684ef91649e4
Component: engine
 2014-07-30 14:01:43 +00:00
Solomon Hykes
f0afd9ad9a Move "pause" to daemon/pause.go 
This is part of an effort to break apart the deprecated server/ package

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 42a77de3d3867e2f34b455fc343e293eed994dcd
Component: engine
 2014-07-30 14:01:40 +00:00
Solomon Hykes
af5f787532 Move Server.ContainerAttach to Daemon.ContainerAttach 
This is part of an effort to break apart the legacy server package. Help wanted!

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: c2496d97cc58e0720988acf4e989689945bb3a54
Component: engine
 2014-07-30 11:20:31 +00:00
Solomon Hykes
409af56c06 Move kernel version/capabilities detection to NewDaemon 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 4949e070fbcac1ef9fbeabe59e3f39cdb830e5fd
Component: engine
 2014-07-30 09:26:51 +00:00
Solomon Hykes
f3b5291fed Move canonical root path detection to NewDaemon 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: e92a9e0b53d296f6e0caa925a56ebbd76b20acaa
Component: engine
 2014-07-30 09:26:51 +00:00
Solomon Hykes
504ecb28ba Move TMPDIR symlink cleanup to NewDaemon 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: a7d8c732b1760fcb3d5fb99c035a34123809e9cd
Component: engine
 2014-07-30 09:26:51 +00:00
Solomon Hykes
190fbe906e Check for OS and root privileges in NewDaemon 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 419b9fe16425c301855aab781e1386f7a227a09d
Component: engine
 2014-07-30 09:26:51 +00:00
Erik Hollensbe
e25f77248d Move parsing functions to pkg/parsers and the specific kernel handling 
functions to pkg/parsers/kernel, and parsing filters to
pkg/parsers/filter. Adjust imports and package references.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 4398108433121ce2ac9942e607da20fa1680871a
Component: engine
 2014-07-29 13:09:10 -07:00
Erik Hollensbe
17543b1068 server/buildfile.go -> builder/builder.go; add maintainers file 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 3a177ccd3afdfe481a7248fccb2efe0f2cbdfcca
Component: engine
 2014-07-29 11:35:02 -07:00
Victor Vieux
c827ecda15 Merge pull request #7062 from crosbymichael/fix-lxc-caps 
Fix cap drop issues with lxc
Upstream-commit: ac3eecf3db5f81a553b71267f2e18ca7b7d95fea
Component: engine
 2014-07-28 16:19:08 -07:00
Johannes 'fish' Ziemke
3513533d24 Make sure err never gets masked 
Defining err as named return parameter will make sure the variable gets
assigned before returning and thus avoid masking

Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org> (github: discordianfish)
Upstream-commit: 32bc8658793b278c793cb8755b94df3b210bea5d
Component: engine
 2014-07-25 17:00:41 +02:00
Victor Vieux
2273fb0f55 gofmt -s -w 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 5a0ef08c940b9a17c400389bca8e7f54935ceba9
Component: engine
 2014-07-24 22:25:29 +00: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
Alexandr Morozov
da9850e0f6 Add AUDIT_WRITE cap 
Fixes #6345

Thanks @larsks for outstanding investigation

Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 29ecc95c31ecfe15e3b3d8db94cea1c555e526a3
Component: engine
 2014-07-23 09:57:41 +04:00
Michael Crosby
eeb4d6b698 Copy values out of hostConfig 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: ddb2086ca9e0991ca12e0771a0e581e782c57f50
Component: engine
 2014-07-22 00:16:26 -07:00
Michael Crosby
25ed902e49 Always mark as stopped for non running containers 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: a091d949acd35d93c4f66af7bfad93a79b591990
Component: engine
 2014-07-21 19:59:44 -07:00
Timothy
a502f604a3 Give context for the error that occures when you try to bind mount a volume with a relative path 
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz> (github: timthelion)
Upstream-commit: 7aed2130f95c22e1eb6249ffb84c1cee070cb284
Component: engine
 2014-07-19 04:12:16 +00:00
unclejack
3ba66ad0ce Merge pull request #7069 from crosbymichael/update-libcontainer-july3 
Update libcontainer to be85764f109c3f0f62cd2a5c8be
Upstream-commit: 1646e5d69ac4e7280050594995ef291c75a5c1f5
Component: engine
 2014-07-18 22:34:22 +03:00
unclejack
2104fb8fd4 Merge pull request #7055 from coheyxyz/break-loop 
Break loop correctly
Upstream-commit: dca52c47a4aaa41fc21883ab60c9303a8e9f3dfa
Component: engine
 2014-07-17 18:20:12 +03:00
Kohei Tsuruta
d2349e06da Change switch to if so that the break statements correctly breaks loop 
Docker-DCO-1.1-Signed-off-by: Kohei Tsuruta <coheyxyz@gmail.com> (github: coheyxyz)
Upstream-commit: ffe885ec0e8a06c1614949bf383f6d1532f02c1d
Component: engine
 2014-07-17 20:27:29 +09:00
Michael Crosby
f48be61b0a Fix cross compile non cgo and linux systems 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 7a8ea91392e0cc97caf2a6edc3b262b33a5b446d
Component: engine
 2014-07-16 16:57:49 -07:00
Michael Crosby
d18a40b4ac Make tty term exec driver specific 
lxc is special in that we cannot create the master outside of the
container without opening the slave because we have nothing to provide to the
cmd.  We have to open both then do the crazy setup on command right now instead of
passing the console path to lxc and telling it to open up that console.  we save a couple of
openfiles in the native driver because we can do this.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 0d67b420b59c953cf331f735e49e7acad742a41f
Component: engine
 2014-07-16 16:57:49 -07:00
Michael Crosby
81d8d08389 Don't create pty slave in the daemon for native driver 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 1501c342d815e3a128dac393b69e23f6ec39c2d7
Component: engine
 2014-07-16 16:57:19 -07:00
Victor Vieux
4514b541fc Merge pull request #6797 from zhgwenming/master 
make /.dockerinit bind mount driver specific
Upstream-commit: 6d238c6fba4cef7d50a36bced46923d54140bd2e
Component: engine
 2014-07-16 16:01:43 -07:00
Michael Crosby
96ec084181 Use : to split caps in sysinit flags 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 50b580cfecc8e438223250f058fb7b61c7477a59
Component: engine
 2014-07-16 13:40:10 -07:00
Victor Vieux
2efed02012 Merge pull request #7060 from crosbymichael/case-insensitive-caps 
Allow case insensitive caps for add and drop
Upstream-commit: dae6af1d1c6692d983151674fb6778006ef0a87a
Component: engine
 2014-07-16 12:34:59 -07:00
Michael Crosby
bf242e249b Fix cap drop issues with lxc 
This uses "," instead of spaces so that the flags are parsed correctly
and also does not do a strings.Split on an empty string because
strings.Split will return a slice with one element, and empty string
causing parsing to fail when it validates that the cap exists.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 47917135daa38b40a1a3ee11f31153b031ea7963
Component: engine
 2014-07-16 12:14:26 -07:00
Michael Crosby
5a03c34f92 Allow case insensitive caps for add and drop 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 7c19499c635358719c5a9c9fb1cb66a5fcf12718
Component: engine
 2014-07-16 11:47:55 -07:00
Michael Crosby
cd609dc421 Merge pull request #6954 from LK4D4/fix_container_run_after_restart_#4766 
Set state running before dumping to disk
Upstream-commit: 5702029a0f12cd382845e0ae1a31c61450851ee0
Component: engine
 2014-07-16 11:35:14 -07:00
Albert Zhang
6786e758ae since moved the ./dockerinit mount into lxc driver, fix the lxc testcase accordingly 
Docker-DCO-1.1-Signed-off-by: Albert Zhang <zhgwenming@gmail.com> (github: zhgwenming)
Upstream-commit: b3b6e05f261cadc2ac4a6eb12090920c32043915
Component: engine
 2014-07-15 07:56:19 -04:00
Michael Crosby
ad74ef7753 Update native driver for libcontainer changes 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: f00e64357672ea3a130b2570ce34ea48ad51bbb5
Component: engine
 2014-07-14 12:49:50 -07:00
Michael Crosby
b2c113f9b8 Merge pull request #6968 from vieux/cap_add_drop 
Add support for --cap-add and --cap-drop
Upstream-commit: 7ebd49c49a9f70c87b6dbcff250035d3fd349a20
Component: engine
 2014-07-14 10:42:29 -07:00
Michael Crosby
de7636ac74 Merge pull request #6970 from vieux/add_FSETID 
add FSETID back to the caps whitelist
Upstream-commit: b39fb160c6a2dffc94dd80599c39159393f4e5e9
Component: engine
 2014-07-14 10:37:04 -07:00
Alexandr Morozov
5ddda4b09a Set state running before dumping to disk 
Fixes #4766
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 97a38079010bddfe6316c4087c13825fd8df64b7
Component: engine
 2014-07-14 21:16:27 +04:00
Victor Vieux
e7f2c9317d add check for invalid caps 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: c04230c42b7a953ffe50bc37d351f86e80a442e6
Component: engine
 2014-07-11 23:43:21 +00:00
Victor Vieux
5201bb5120 support add and drop in both order 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 064b5f870db39e33f18d6dd405f2bdab98255ef7
Component: engine
 2014-07-11 23:43:21 +00:00
Victor Vieux
669e2fe479 add basic support for 'all' 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 222a6f44016451dcbd2da0003e64521c06e88ba9
Component: engine
 2014-07-11 23:43:21 +00:00
Victor Vieux
2032a7ad93 small refactoring 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: f3ff323fb364495617de3e43f2d09a145a4f2ee3
Component: engine
 2014-07-11 23:43:21 +00:00
Victor Vieux
d4b6724355 Basic --cap-add and --cap-drop support for lxc 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 21059af3ac0136607dbb57c796f625cfbd045177
Component: engine
 2014-07-11 23:43:21 +00:00
Victor Vieux
ca489c2f49 Basic --cap-add and --cap-drop support for native 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 94e6dc978134b61a2b30aa9118f98f6fadd10535
Component: engine
 2014-07-11 23:43:21 +00:00
Michael Crosby
8850edab1a Merge pull request #6979 from LK4D4/fix_race_inspect_start 
Use container.Lock in public ToDisk method
Upstream-commit: c3f247860aa169f4a9530d025da935d71af72f20
Component: engine
 2014-07-11 13:44:01 -07:00
LK4D4
241e1f987c Use container.Lock in public ToDisk method 
Here was possible race with inspect where we changing HostConfig.Links
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: eae5cf1e20e8d93cc13ea8e1db3cd787250fa76d
Component: engine
 2014-07-11 23:31:03 +04:00
Victor Vieux
f98a366776 add FSETID back to the caps whitelist 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: e8762bfe39531309327138d93c0b586f8b9cea99
Component: engine
 2014-07-11 00:30:56 +00:00
Timothy
c15db86f61 Add --device flag to allow additional host devices in container 
We add a --device flag which can be used like:

 docker run --device /dev/sda:/dev/xvda:rwm ubuntu /bin/bash

To allow the container to have read write permissions to access the host's /dev/sda via a node named /dev/xvda in the container.

Note: Much of this code was written by Dinesh Subhraveti dineshs@altiscale.com (github: dineshs-altiscale) and so he deserves a ton of credit.

Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz> (github: timthelion)
Upstream-commit: e855c4b92170534864b920ec1e267b3a815764f9
Component: engine
 2014-07-10 10:35:53 -07:00
unclejack
b57da60173 Merge pull request #6939 from snitm/thinp-blocksize-fix 
devmapper: revert the default dm-thin-pool blocksize back to 64K
Upstream-commit: 840ed5ace28381e61b6b34063f9afb71d63fb6a9
Component: engine
 2014-07-10 19:57:07 +03:00
Bryan Bess
323df0e24b Fix typos 
Docker-DCO-1.1-Signed-off-by: Bryan Bess <squarejaw@bsbess.com> (github: squarejaw)
Upstream-commit: 1df4049e17e4a3edf4487b072f2085bc2dd2ee0b
Component: engine
 2014-07-09 23:14:06 -05:00