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
8,389 Commits 12 Branches 297 Tags
d979c2acea70a96bb57d7f4eff9bcd4d0926042a
Commit Graph

7740 Commits

Author SHA1 Message Date
Michael Crosby
d979c2acea Merge pull request #5859 from philips/append-etc-hosts-not-bind 
fix(daemon): prepend host /etc/hosts instead of bind mounting
Upstream-commit: 4bb4bf634a0a056ff8fb4186875c004e156f012d
Component: engine
 2014-05-21 15:57:59 -07:00
Victor Vieux
0bf4f2fdea Merge pull request #5895 from tianon/update-authors 
Update AUTHORS and .mailmap
Upstream-commit: fe1d297b9df84ce87d71c4cecd800e2490252547
Component: engine
 2014-05-21 22:57:05 +00:00
Victor Vieux
683b5fb8ba Merge pull request #5981 from philips/bump-go-systemd 
vendor: bump github.com/coreos/go-systemd to v2
Upstream-commit: cedd76cb526ab9b281293bdf658d236ad32a6950
Component: engine
 2014-05-21 15:52:35 -07:00
Brandon Philips
fe98fe4b11 vendor: bump github.com/coreos/go-systemd to v2 
There are a couple of bugfixes since this was last bumped. Pull them in.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: df5585b273686324e9fd8269a6492409698623ee
Component: engine
 2014-05-21 15:31:04 -07:00
Brandon Philips
519b053861 integration-cli: fix spelling error in test 
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 61ac745d7a7dd192948e0c1cfbdff87af7715c92
Component: engine
 2014-05-21 15:20:29 -07:00
Brandon Philips
8fa886baf3 integration-cli: tests for /etc/hosts and net=host 
Some basic tests to make sure this is acting correctly on machines.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 5579bec47be6279569e69c72cccf87864af481de
Component: engine
 2014-05-21 15:20:29 -07:00
Dan Walsh
0ca8d92d2e This check was backwards. 
If I do a

docker events  > /tmp/out

I do not want the control characters getting written to the file.
The check should check the output file not the input file.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 26b4a4920adca614f6be17a96f254f331271faf0
Component: engine
 2014-05-21 17:37:40 -04:00
Victor Vieux
d951df01e3 Merge pull request #5958 from erikh/5738-docker_port_in_use 
docker port in use
Upstream-commit: b7f9e683c3edd5c48062d00cfe3ea279e8037106
Component: engine
 2014-05-21 21:06:27 +00:00
Victor Vieux
d6d188680f Merge pull request #5975 from tianon/revert-run-tmpfs 
Revert "Always mount a /run tmpfs in the container"
Upstream-commit: 457cb86cf2bb40fdce3e6b6a49d5eaec454a617b
Component: engine
 2014-05-21 13:46:48 -07:00
Tianon Gravi
d2e4e6b069 Revert "Always mount a /run tmpfs in the container" 
This reverts commit 905795ece624675abe2ec2622b0bbafdb9d7f44c.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 8e967fe8028d8362fe3dfb293a8e07a959a4dd7f
Component: engine
 2014-05-21 14:28:19 -06:00
Tibor Vass
7594078fbe for perms checking tests, create files from Go and remove them from git 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: bb431a719008ae183179d9d71090bd1224d61480
Component: engine
 2014-05-21 11:35:12 -07:00
Tibor Vass
1e7aa2e3c4 remove chmod 755: fixes #5941 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 56a53c72d285b3f9fa6b34dcb81c9720a1974bde
Component: engine
 2014-05-21 11:35:08 -07:00
James Turnbull
292cf3ffa3 Merge pull request #5965 from cpuguy83/5963-fix-single-dash-in-working-with-volumes 
Fixes some docs issues with using single-dash arguments where they should be double
Upstream-commit: 29a192ca4d7b1d42c805241ecc4106f2ebf3e887
Component: engine
 2014-05-22 03:31:46 +10:00
Victor Vieux
e9e820f9cb Merge pull request #5955 from anandkumarpatel/5923-fix-leaking-go-routine 
5923-fix-leaking-go-routine
Upstream-commit: 286a17ff1995cf7a6d4bb43cdce5d66d89cf4950
Component: engine
 2014-05-21 10:11:56 -07:00
Erik Hollensbe
1e8e32fb77 bridge: retry any proxy set up failures until we get a successful port, defeats a race condition 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 91ba3379312a74132e2578d167c9e36eeb889525
Component: engine
 2014-05-21 09:14:53 -07:00
Erik Hollensbe
ff6d32db91 portallocator: rewrite to simplify, removes race condition 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: f0489ce3a9a4023265bbbd5e9cb333e95f950088
Component: engine
 2014-05-21 09:14:53 -07:00
Brian Goff
a2fa77b792 Fixes some docs issues with using single-dash arguments where they should be double 
I found a bunch of issues where we have "-<opt>" instead of "--<opt>".
Also a couple of other issues, like "-notrunc", which is now "--no-trunc"
Fixes #5963

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 6d9e64b27bbee9bb699ebc0f0ff98bb7f56961b3
Component: engine
 2014-05-21 09:35:22 -04:00
unclejack
d4e2ce7c3d Merge pull request #5954 from vieux/fix_cp_error 
Ignore lchown error on docker cp
Upstream-commit: a94a87778cf21440ff8f9bc8866d12903d590e88
Component: engine
 2014-05-21 15:55:57 +03:00
James Turnbull
2119e00789 Merge pull request #5765 from jamtur01/contribf 
Added to small patch exemption to cover Markdown/syntax errors
Upstream-commit: f37339c2db413c1d3758bc98f14b209ec943d29e
Component: engine
 2014-05-21 17:13:03 +10:00
AnandkumarPatel
3921a34ddb use buffered channel so goroutine does not get blocked on done <- true when a timeout occurs. 
Docker-DCO-1.1-Signed-off-by: Anandkumar Patel <anandkumarpatel@gmail.com> (github: anandkumarpatel)
Upstream-commit: 789a8f26161ca86a721fe6b7295e3eaf9051b3a2
Component: engine
 2014-05-20 21:33:40 -07:00
Victor Vieux
786a16cf57 ignore lchown error on docker cp 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 9e51b7abaea3fb30dc994a1d004cd79f2e100c1a
Component: engine
 2014-05-21 00:23:17 +00:00
Victor Vieux
6b24ea22ae add test 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 5eef0a28cb70881d8f1e34519e9c0df6cb1da071
Component: engine
 2014-05-21 00:10:07 +00:00
Michael Crosby
b9dbdb7d9e Merge pull request #5755 from vieux/move_inspect_daemon 
move inspect from server to daemon
Upstream-commit: 83e9dc720039cfa8685b8dc59f76ca2f1e9489d2
Component: engine
 2014-05-20 15:50:38 -07:00
Tianon Gravi
d7176ddd5c Merge pull request #5950 from tianon/update-deps 
Update gorilla/mux, gorilla/context, and kr/pty deps
Upstream-commit: 1f219672fad7421d5c72ec4990ce2446e9155457
Component: engine
 2014-05-20 16:16:21 -06:00
Michael Crosby
c9d0eafbf0 Merge pull request #5946 from crosbymichael/lxc-host-net 
Fix network mode for lxc 1.0
Upstream-commit: 1310243d488cfede2f5765e79b01ab20efd46cc0
Component: engine
 2014-05-20 14:51:33 -07:00
Victor Vieux
45b3b14782 Merge pull request #5951 from vieux/pr5919 
Fix remote add cache
Upstream-commit: 240fad497415d798fcaef6dcd8d1231f93a4887c
Component: engine
 2014-05-20 14:33:05 -07:00
Victor Vieux
83451c4f0a add test 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 03a109e446351ba40ea5d74e8eb6733b2a9a5045
Component: engine
 2014-05-20 21:31:28 +00:00
Guillaume J. Charmes
9c8b2dfbeb Remove the mtime for temp file. Prevent false negative cache 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: bcfe2ceffb1c4c7006570d4ba21ed2068bb448a1
Component: engine
 2014-05-20 21:31:28 +00:00
Brice Jaglin
76507afd3a force the read of the tarSum so that sums actually get computed 
Docker-DCO-1.1-Signed-off-by: Brice Jaglin <bjaglin@teads.tv> (github: bjaglin)
Upstream-commit: 9810da853bd890b6c963017555c3555ef9e0d842
Component: engine
 2014-05-20 21:31:28 +00:00
Michael Crosby
61e4bbbc1b Merge pull request #5918 from crosbymichael/volumes-commit 
Do not commit host bind mounts into image
Upstream-commit: 70d35b9d39239fa14bea0bc462ff71c17570c93d
Component: engine
 2014-05-20 14:28:49 -07:00
Tianon Gravi
2fdc01b488 Update gorilla/mux, gorilla/context, and kr/pty deps 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: d98af1236c9aeef6f9eef34970e13cbe0ea06ff8
Component: engine
 2014-05-20 15:23:50 -06:00
Michael Crosby
aad71a085e Update runconfig unit test for changes 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e2d79bec3ab76357625ca57d83299012f584c024
Component: engine
 2014-05-20 21:11:33 +00:00
Tianon Gravi
f91b76d592 Merge pull request #5945 from crosbymichael/lxc-version-bump 
Update LXC requirement to 1.0
Upstream-commit: a16cb394fa4ea2c1d4241f184d23380d5b2c9fa0
Component: engine
 2014-05-20 14:54:24 -06:00
Michael Crosby
5d70d92ff7 Update lxc requirement to 1.0 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 94f01184beb731b8c28dd43cf259621ba14f76ff
Component: engine
 2014-05-20 20:45:22 +00:00
Michael Crosby
03422490ae Merge pull request #5916 from rhatdan/crash 
docker '' causes a golang crash.
Upstream-commit: f915988a5d089905b0fd6eb4f472c331569bb079
Component: engine
 2014-05-20 13:42:48 -07:00
Victor Vieux
74d86a8d61 move inspect from server to daemon 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 603e00a3a7644caf118d3efd0932500b4dfc4de3
Component: engine
 2014-05-20 19:36:15 +00:00
Michael Crosby
417fd6d53a Fix network mode for lxc 1.0 
Fixes #5692

This change requires lxc 1.0+ to work and breaks lxc versions less than
1.0 for host networking.  We think that this is a find tradeoff by
bumping docker to only support lxc 1.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 0f278940947d74f2b7889ada18808779312f9608
Component: engine
 2014-05-20 19:10:23 +00:00
Dan Walsh
df1cb6f1b5 docker '' causes a golang crash. 
This patch fixes the problem.

Docker-DCO-1.1-Signed-off-by: Daniel Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: bc081a03d85a88cc2160ade9256d96d7b84c4caa
Component: engine
 2014-05-20 14:04:27 -04:00
Michael Crosby
ae6d266785 Merge pull request #5930 from alexlarsson/add-cap-setfcap 
native driver: Don't drop SETFCAP
Upstream-commit: e5202de9186a2548c54af54739a6cb09046afd61
Component: engine
 2014-05-20 10:29:37 -07:00
Michael Crosby
2c2ee20fef Merge pull request #5929 from alexlarsson/systemd-cgroup-allow-mknod 
cgroups: Allow mknod for any device in systemd cgroup backend
Upstream-commit: f3edb7c0e8197d1573ec3bfa058ed498ebeca2e7
Component: engine
 2014-05-20 10:13:13 -07:00
Tianon Gravi
91009e208d Merge pull request #5844 from stpierre/init-script-wait-for-pidfile 
Wait for pidfile to exist when starting with RedHat init script
Upstream-commit: 47aa9f5a0e38f395cee7517720f8a80587bb911b
Component: engine
 2014-05-20 10:25:03 -06:00
Alexander Larsson
da7177cbfd native driver: Add required capabilities 
We need SETFCAP to be able to mark files as having caps, which is
heavily used by fedora.
See https://github.com/dotcloud/docker/issues/5928

We also need SETPCAP, for instance systemd needs this to set caps
on its childen.

Both of these are safe in the sense that they can never ever
result in a process with a capability not in the bounding set of the
container.

We also add NET_BIND_SERVICE caps, to be able to bind to ports lower
than 1024.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: fcf2e9a9107c6c9aebaf63ce044f636333e7eed8
Component: engine
 2014-05-20 11:31:39 +02:00
Alexander Larsson
d043d726b2 cgroups: Allow mknod for any device in systemd cgroup backend 
Without this any container startup fails:
2014/05/20 09:20:36 setup mount namespace copy additional dev nodes mknod fuse operation not permitted

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 602950435056baa939f428223b6d3ff26ca5403d
Component: engine
 2014-05-20 09:29:32 +02:00
Brandon Philips
16c9a15cd6 fix(daemon): prepend host /etc/hosts instead of bind mounting 
systemd systems do not require a /etc/hosts file exists since an nss
module is shipped that creates localhost implicitly. So, mounting
/etc/hosts can fail on these sorts of systems, as was reported on CoreOS
in issue #5812.

Instead of trying to bind mount just copy the hosts entries onto the
containers private /etc/hosts.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 000a37fe9d13a173ab46fcd5b8e693950a438f98
Component: engine
 2014-05-19 22:32:51 -07:00
Sven Dowideit
457c223488 Merge pull request #5920 from jmccrohan/master 
docs: cli.md; document docker version output
Upstream-commit: bfe72c6189e92d9ee6f2d2f26a5553b4eb863a44
Component: engine
 2014-05-19 21:41:05 -07:00
Jonathan McCrohan
7428c89c95 docs: cli.md; document docker version output 
Commit 3cec63d56f9de6332aa3f33502695283d4feb054 changed the output of
docker version. Updating docs accordingly.

Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)
Upstream-commit: 4052a81830e57c9f1d7d567ba9e53813945c9810
Component: engine
 2014-05-20 02:00:31 +01:00
Sven Dowideit
77c39f7b85 Merge pull request #5905 from jamtur01/faq 
Adding the FAQ back
Upstream-commit: 5511be75127b84933d0f283b21dbd05a1b6edc33
Component: engine
 2014-05-20 10:17:01 +10:00
Michael Crosby
446a0e28d3 Add test for commiting container with bind mount 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d31c37fceb6c09a48b5dd9d6c33a95d734e02704
Component: engine
 2014-05-19 22:57:29 +00:00
Tianon Gravi
4d767cc66f Merge pull request #5890 from LK4D4/fix_tee_hanging_on_test_fails_#5672 
Fix hanging on tests failing
Upstream-commit: 05c3325a02bf2ffee660dcfd36e8d34cb7192b51
Component: engine
 2014-05-19 16:37:19 -06:00
Michael Crosby
2c620b9486 Don't save bind mounts in image 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d535d9810012b18ca83f86aa416ff4a08bb49804
Component: engine
 2014-05-19 22:18:37 +00:00