docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-23 15:21:32 +03:00
Code Activity
8,063 Commits 12 Branches 297 Tags
626d91d1bdd15845f2c34fbb81a78010fc61dc3c
Commit Graph

8063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Solomon Hykes
626d91d1bd Merge pull request #5116 from LK4D4/chown_only_on_content_#5110 
Upstream-commit: 1736b025eac26f107fbb8502e276c215d8e86336
Component: engine
 2014-05-08 23:16:22 -07:00
O.S. Tezer
3a9d1a8f79 Merge pull request #5679 from tdaws/master 
Fixed typo in docs - intro - working with docker - working with images. ...
Upstream-commit: f5309a2a090a1c8c0e22d9634f5c4d0cf92f03dc
Component: engine
 2014-05-08 20:15:54 +01:00
Victor Vieux
85637088fc Merge pull request #5680 from alexlarsson/dm-remove-spew 
devmapper: Remove accidental debug spew
Upstream-commit: 8d3c5b7dcaf5fb0e7084adac969bfbe75f3bbaeb
Component: engine
 2014-05-08 10:32:11 -07:00
Alexander Larsson
49a93b84ed devmapper: Remove accidental debug spew 
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: bff0c4f3dc560109ed2d5dc6cae12453c9bc2747
Component: engine
 2014-05-08 19:25:47 +02:00
Michael Crosby
0e12d2d077 Merge pull request #5673 from tianon/kcore-error 
Update restrict.Restrict to both show the error message when failing to mount /dev/null over /proc/kcore, and to ignore "not exists" errors while doing so (for when CONFIG_PROC_KCORE=n in the kernel)
Upstream-commit: 7673e3c58938aa4179f3ec84ed4960b4b6267c14
Component: engine
 2014-05-08 10:20:19 -07:00
Tony Daws
ff4347f669 Fixed typo in docs - intro - working with docker - working with images. It read that you can use both images used by others and images used by others, in a run-on sentence. 
Upstream-commit: ea049a2ebc072819920c42140221ce4ab7bab22e
Component: engine
 2014-05-08 10:05:00 -07:00
Michael Crosby
891da1c12d Merge pull request #5535 from vmarmol/add-maintainers-cgroup 
Adding Rohit Jnagal and Victor Marmol to pkg/cgroups maintainers.
Upstream-commit: 718154b3b6db33a77fb05829d29abcebb77beb86
Component: engine
 2014-05-08 09:48:31 -07:00
Alexander Larsson
63b4ebccb3 Merge pull request #5404 from alexlarsson/dm-new-metadata 
Make devicemapper backend able to support multiple processes
Upstream-commit: 3a1703a79f6702c67ce51ea58f359d1d63bb0c6f
Component: engine
 2014-05-08 14:31:17 +02:00
O.S. Tezer
a4a413f833 Merge pull request #5659 from ryanaslett/master 
Trivial Documentation Change: The Go template is a better pattern for documentation.
Upstream-commit: e4f4ce83d2646030cbe9e7dec41b567596b4c236
Component: engine
 2014-05-08 10:59:35 +01:00
Tianon Gravi
71620ac1c0 Update restrict.Restrict to both show the error message when failing to mount /dev/null over /proc/kcore, and to ignore "not exists" errors while doing so (for when CONFIG_PROC_KCORE=n in the kernel) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: d60301edb88a4e182a10cd2becb3795b2dd13fab
Component: engine
 2014-05-08 01:03:45 -06:00
Victor Vieux
40ac51bff0 Merge pull request #5671 from crosbymichael/merge_release_v0.11.1 
Merge release v0.11.1
Upstream-commit: 81041b3ba696250b9da719875d6c41312c4cc046
Component: engine
 2014-05-07 18:51:29 -07:00
Michael Crosby
de6ae5d92c Change version to v0.11.1-dev 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 0ed9bba1ee48ff925ade710658fecd2270f8a223
Component: engine
 2014-05-07 18:48:38 -07:00
Michael Crosby
040805bfec Merge branch 'release' into merge_release_v0.11.1 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 093aacb740c81a5c96a2300e6b2afae442879915
Component: engine
 2014-05-07 18:47:47 -07:00
Michael Crosby
ea54561d1f Merge pull request #5668 from crosbymichael/bump_v0.11.1 
Bump to version v0.11.1
Upstream-commit: 5f3d6b8e7f4ba3e572f89321753066541d17fbc1
Component: engine
 2014-05-07 18:47:46 -07:00
Michael Crosby
8b1acbeb39 Bump to version v0.11.1 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: fb99f992c081a1d433c97c99ffb46d12693eeb76
Component: engine
 2014-05-07 17:29:56 -07:00
Michael Crosby
f41a1fe05f Merge branch 'master' into bump_v0.11.1 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 6640f46f0ea718a173504018d79248d58f2d2dc1
Component: engine
 2014-05-07 17:27:57 -07:00
Guillaume J. Charmes
4e4fbfd51e Merge pull request #5667 from bitness/typo-fix 
Fix error name typo (ErrInvalidWorikingDirectory)
Upstream-commit: ed00ba84acfaefe9d2dd67dd5b186842990e049a
Component: engine
 2014-05-07 16:53:08 -07:00
Guillaume J. Charmes
b0da971da8 Merge pull request #5665 from vieux/fix_auth_issue 
Fix auth issue
Upstream-commit: c7712b350a51a2727c170d89b3e7ecc7cf70c90d
Component: engine
 2014-05-07 16:36:07 -07:00
Lars R. Damerow
35bec1ebab Fix error name typo (ErrInvalidWorikingDirectory) 
Docker-DCO-1.1-Signed-off-by: Lars R. Damerow <lars@grandstreet.us> (github: bitness)
Upstream-commit: d3150e0927043976b0b88bd61e50dc1e456fa77b
Component: engine
 2014-05-07 16:28:51 -07:00
Victor Vieux
fda92cf483 Revert "refactor build job to know only configFile" 
This reverts commit b9731bccf2b2cc8c06ef8bdb41f72ca4791e63db.

Conflicts:
	server/server.go

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 2aff119baa15cff37f9b2004755f144f16a87801
Component: engine
 2014-05-07 22:59:13 +00:00
Victor Vieux
f18c414a67 Revert "rename configFile to auth in the job" 
This reverts commit e9c3e397436221528312c0d3b291ae5a12862ed2.

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 331e77f9ed938b3a8c7346ef46a9f6f5cd2dc794
Component: engine
 2014-05-07 22:58:09 +00:00
Michael Crosby
f9dae65842 Merge pull request #5660 from crosbymichael/merge_release_v0.11.0 
Merge release to master v0.11.0
Upstream-commit: 93f5d539fed58a28853e3b4840a6de6ded236cf4
Component: engine
 2014-05-07 11:42:49 -07:00
Michael Crosby
883ab8d68e Change version to v0.11.0-dev 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 1ed63f1d16669dc2ce7eb75f3d56ea8a5c27ab39
Component: engine
 2014-05-07 11:38:02 -07:00
Michael Crosby
9e81c975fd Merge branch 'release' into merge_release_v0.11.0 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: b68e0078c218ef1d8f993da668582e8ac0cb630b
Component: engine
 2014-05-07 11:37:32 -07:00
Michael Crosby
484a4cc7b9 Merge pull request #5640 from crosbymichael/bump_v0.11.0 
Bump version to v0.11.0
Upstream-commit: 57aa2f2ef4d1ae82cbd62e09c0c290c51aa01d52
Component: engine
 2014-05-07 11:35:20 -07:00
Michael Crosby
87fbcf8816 Bump version to v0.11.0 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 15209c380c3f510e3f8d5ba1ff5fcc5cc8db3357
Component: engine
 2014-05-07 09:59:55 -07:00
LK4D4
1f5f83d095 Change owner only on copied content 
Fixes #5110
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 91b7d8ebd31dba64b551de85e70786c568cb402a
Component: engine
 2014-05-07 20:40:22 +04:00
Tianon Gravi
15b50925f1 Merge pull request #5642 from jmccrohan/master 
Update mkimage-debootstrap "ubuntuLatestLTS" to "trusty"
Upstream-commit: ddd0470ed1487f1b12286f3213e1d8e98021509d
Component: engine
 2014-05-07 09:45:22 -06:00
Jonathan McCrohan
d7be599a05 mkimage-debootstrap: set ubuntuLatestLTS as Trusty 
Ubuntu 14.04 LTS (Trusty Tahr) was released on Thu, 17 Apr 2014; Update
ubuntuLatestLTS accordingly.

Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)
Upstream-commit: 9e64a4d862e38ead4c2708ce61663f176844406b
Component: engine
 2014-05-07 08:26:24 +01:00
Ryan Aslett
b4dfa516c6 The Go template is a better pattern for documentation. 
Upstream-commit: 7549199cc5e1de910f5dbd539831095739524ea6
Component: engine
 2014-05-07 00:21:02 -07:00
Sven Dowideit
e2dc002b85 Merge pull request #5634 from vieux/improve_mflag_usage 
Add support for \n in usages
Upstream-commit: bd9b27fe18e92f4fb9123d2f254b16818911f11a
Component: engine
 2014-05-07 13:53:04 +10:00
Victor Vieux
a4be23f31a Merge pull request #4 from SvenDowideit/improve_mflag_usage_docs 
update the docs for the new \n rendering
Upstream-commit: 275faf06e8e59ccf448c8e99a6c4c4a93ee59da1
Component: engine
 2014-05-06 19:54:47 -07:00
Michael Crosby
bf609b3ea4 Merge branch 'master' into bump_v0.11.0 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 263d134fff83f90eed5b706d8ddb39e7e36efe32
Component: engine
 2014-05-06 18:03:23 -07:00
Victor Vieux
3893d734fc Merge pull request #5643 from crosbymichael/fix-native-pid 
Set container pid for process in native driver
Upstream-commit: 41b2874b99fa308b23bd9984b28f2c89f69ebd14
Component: engine
 2014-05-06 18:02:55 -07:00
Michael Crosby
1e327c2bc7 Set container pid for process in native driver 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 62e8ddb5791b9ee62c3f4361084dda4a5d7760e1
Component: engine
 2014-05-06 17:04:04 -07:00
Sven Dowideit
9f2043420a update the docs to reflect the nice \n handling 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: cfb232cff27da2dd46ec04a5bf6699ab1d1df91c
Component: engine
 2014-05-07 09:40:49 +10:00
Victor Vieux
fdccd2aaa1 improve some usages 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b622da3cfe211d31df69e72a93ed4fae872aca65
Component: engine
 2014-05-06 21:32:12 +00:00
Victor Vieux
29bfaa0d20 use tabwriter to display usage in mflag 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 77098d5b5bf8840a1179380b34aedb26139b9d65
Component: engine
 2014-05-06 21:31:21 +00:00
Sven Dowideit
49adbc4838 Merge pull request #5622 from SvenDowideit/net-host-docs 
Update the run --net cli help to include the 'host' option
Upstream-commit: d7166536e7f71ca87a8c37d2eb1c06184c9f3bd6
Component: engine
 2014-05-07 07:11:41 +10:00
Michael Crosby
36de1a047f Merge pull request #5631 from vmarmol/cpuacct-usage 
Export cpuacct CPU usage in total cores over the sampled period.
Upstream-commit: 5c12a27838b88580aaa6fd967a9f0b60d3e838af
Component: engine
 2014-05-06 11:47:55 -07:00
Victor Vieux
852833b5b7 Fix logo in README.md 
Upstream-commit: 8d07c2d1aeb3326f1f62854e6adfd26f0d8e0342
Component: engine
 2014-05-06 11:39:11 -07:00
Victor Marmol
7ab4226907 Export cpuacct CPU usage in total cores over the sampled period. 
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Upstream-commit: 543e60eb60fed2734c10953216003325beddd536
Component: engine
 2014-05-06 16:56:39 +00:00
Michael Crosby
8376ec5af9 Merge pull request #5630 from rjnagal/libcontainer-fixes 
Check supplied hostname before using it.
Upstream-commit: 818648ff9f9e506e2d296fb73ef55dc8f87648fb
Component: engine
 2014-05-06 09:49:52 -07:00
Michael Crosby
23cfbb7add Merge pull request #5629 from vmarmol/fix-systemd-softlimit 
Remove support for MemoryReservation in systemd systems.
Upstream-commit: 7e3a1b652193abd8379905cb4dac2df53dc634fb
Component: engine
 2014-05-06 09:48:33 -07:00
Michael Crosby
963c5715cb Merge pull request #5627 from cyphar/integration-cli-fixes 
Fixed completely broken integration-cli tests
Upstream-commit: d16fcc628e5b3229e24ee50579a81379f4040414
Component: engine
 2014-05-06 09:35:30 -07:00
Michael Crosby
667984ea8a Merge pull request #5626 from cyphar/networkfs-etchosts-tests 
Fixed broken tests for pkg/networkfs/etchosts
Upstream-commit: 5034b658e30302095cfbd573a9ce7550570698e7
Component: engine
 2014-05-06 09:31:06 -07:00
Victor Marmol
7754f52438 Remove support for MemoryReservation in systemd systems. This has been 
deperecated since systemd 208.

Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Upstream-commit: 69d43b2674aa8ed69c641556cae68d405505a45b
Component: engine
 2014-05-06 15:53:38 +00:00
cyphar
e1bf9e3403 integration-cli: docker_cli_links: fixed broken tests 
The tests weren't ... tested when last edited, this patch fixes
them so that they run and pass correctly.

Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: 924979259ec4c9ef6beab0468325f1cb04deaacb
Component: engine
 2014-05-07 01:05:15 +10:00
cyphar
0dedb88d50 pkg: networkfs: etchosts: fixed tests 
This patch fixes the fact that the tests for pkg/networkfs/etchosts
couldn't build due to syntax errors.

Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: 14f65ab83b4f72ea56b3e98023e941474d4e9dd8
Component: engine
 2014-05-07 00:42:22 +10:00
O.S. Tezer
670dbc4add Merge pull request #5616 from nirvdrum/patch-2 
Use the contraction for "it is."
Upstream-commit: ba6a732357ce9e2fa3292ce8b46d17dadfe22468
Component: engine
 2014-05-06 11:33:41 +01:00