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
26,136 Commits 12 Branches 296 Tags
bced48a04a3de730c97cf8cf5ada9cd90ca3d396
Commit Graph

26136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Cormack
bced48a04a Merge pull request #25034 from thaJeztah/update-swarm-usage 
Update usage of "Swarm" for consistency
Upstream-commit: c388a5bdfa922d85373cc8a77a08612ca4b67861
Component: engine
 2016-07-29 01:01:00 +01:00
Alexander Morozov
9c4e84e8f7 Merge pull request #24976 from lixiaobing10051267/masterFound2 
To break the loop when found in search_test.go
Upstream-commit: 803e2f285a974b23db2b042846d33e98c5ed53d6
Component: engine
 2016-07-28 16:59:46 -07:00
Justin Cormack
fd99a88e88 Merge pull request #24835 from justincormack/armextlink 
Do not default to external linking on arm, i386
Upstream-commit: a846fa7ac9ab85f8a2798ef299f88324047ec8c9
Component: engine
 2016-07-29 00:57:56 +01:00
Alexander Morozov
4cd88300bd Merge pull request #24502 from allencloud/change-comparison-log-in-container-config 
update comparison log in container config
Upstream-commit: ca43efb40eb011e0f8adaca2eda77a5330f02089
Component: engine
 2016-07-28 16:51:11 -07:00
Alexander Morozov
488d786bb3 Merge pull request #24745 from daehyeok/logrus 
Refactoring for logrus formatting
Upstream-commit: 170abb5f7cabf4921a378d76532e74a272fbe39c
Component: engine
 2016-07-28 16:50:19 -07:00
Alexander Morozov
3ee2799172 Merge pull request #24555 from thaJeztah/to-infinity-and-beyond 
Don't set ulimits (nproc) for all init scripts
Upstream-commit: 4084bf7ad23f1c82601e4cbcc2d224c3bc7e0b12
Component: engine
 2016-07-28 16:48:16 -07:00
Alexander Morozov
c6812e2679 Merge pull request #24663 from hopkings2008/repeated_api 
remove the second repeated line cli.api = api since api is a pointer
Upstream-commit: d8a2568e6b3aeab8d7d11a05d3ec98cf0245211d
Component: engine
 2016-07-28 16:45:30 -07:00
Alexander Morozov
f3d95a7a8f Merge pull request #22982 from nalind/log-newlines 
Improve logging of long log lines
Upstream-commit: e43033bc238ce61466c0abe3702878eeeba5e917
Component: engine
 2016-07-28 16:41:01 -07:00
John Howard
daa8773ec1 Merge pull request #25190 from mavenugo/dl 
Cherry-pick #25191 to master
Upstream-commit: 57698cfe7902199bed476657c8f1255af38f9f24
Component: engine
 2016-07-28 16:30:02 -07:00
Madhu Venugopal
f9dff992a9 Vendoring libnetwork to avoid a deadlock 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 4f369a74fac5023e9a46de4b4dbe121a7c2b2c81)
Upstream-commit: 61e59693dc3407ba1d68f8a5be17c117a96467e4
Component: engine
 2016-07-28 15:12:45 -07:00
Michael Crosby
dbdb5ac0d4 Merge pull request #25185 from crosbymichael/cherry-restore 
Check if the container is running if no event
Upstream-commit: 42c783ac3ae16b8358313fefa9fb100b1e01f927
Component: engine
 2016-07-28 11:23:26 -07:00
Michael Crosby
665067dce6 Check if the container is running if no event 
When there is no event for the container it can happen because of a
crash and the container state on the persistent disk will have a
mismatch between what was in `/run` ( machine crash ).

This situation will create an unkillable container in docker because
containerd does not see it and it is not running but docker thinks it is
and you cannot tell it anything different.

This fixes the issue by checking if containerd has the container running
if we do not have an event instead of just returning.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 2650b1b6abd87d7d888e27abd6110dea83dcd080
Component: engine
 2016-07-28 11:17:02 -07:00
Tibor Vass
333de2a679 Merge pull request #25154 from aaronlehmann/remove-join-tokens-from-info-master 
Remove join-tokens from the /info API
Upstream-commit: 58d0d5b6b5cc048bf5b59f69862182e55526f91e
Component: engine
 2016-07-28 11:08:50 -07:00
Michael Crosby
8e586b192e Merge pull request #25077 from cpuguy83/fix_TestApiSwarmRestartCluster 
Fix race in `TestApiSwarmRestartCluster`
Upstream-commit: 262063531a4845c436b64deff9a7fca9f90c0c13
Component: engine
 2016-07-28 10:15:31 -07:00
Sebastiaan van Stijn
a2827e4f47 Merge pull request #25137 from justincormack/32bit-seccomp-test 
Add a test that the default seccomp profile allows execution of 32 bit binaries
Upstream-commit: 8a8a63aa32a60e12b3c4d8e9e3397a8bd3b96d54
Component: engine
 2016-07-28 17:01:04 +02:00
Brian Goff
c723d60fcd Merge pull request #25168 from miaoyq/optimize-a-print 
optimize a print in `volume/volume.go`
Upstream-commit: b09f28016166ea36f36916098ab18fd86a0eaa57
Component: engine
 2016-07-28 09:16:17 -04:00
Yanqiang Miao
57c5690493 optimize a print in 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update 'optimize-a-print'

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: a503f3ac2fdb5f24b7ca982fc6447423095f229e
Component: engine
 2016-07-28 19:20:20 +08:00
Sebastiaan van Stijn
e1bdcf299e Merge pull request #25152 from thaJeztah/re-enable-api-1.25 
docs: re-enable API 1.25
Upstream-commit: 193b03615957e0aa41dbb5e675ab3530a501adb1
Component: engine
 2016-07-28 09:38:20 +02:00
Sebastiaan van Stijn
7fc346bc16 Merge pull request #25020 from jfrazelle/update-non-events 
update security non-events
Upstream-commit: 14664beda923dc9249cbd4ac4f024319668e57c0
Component: engine
 2016-07-28 09:29:51 +02:00
Sven Dowideit
2277dd5414 Merge pull request #25156 from londoncalling/docs-v112-getstarted-a 
modifed d4mac and d4win download links to stable for v1.12
Upstream-commit: 352c720d69f6c37c9b1e15332f46ea2dc4335cb9
Component: engine
 2016-07-28 17:08:54 +10:00
Victoria Bialas
77366c6416 modifed d4mac and d4win download links to stable for v1.12 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: ef528abcda1a4a7a1b605b57b56c5f3b630146bc
Component: engine
 2016-07-27 18:57:38 -07:00
Aaron Lehmann
555a24da1d Remove join-tokens from the /info API 
join-tokens are not needed for this endpoint, and should not be as part
of /info

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit d8f3b3f006629c5c1368eca96bcd5bda2a54acd7)
Upstream-commit: 96b2a6e548bc3abf0f0a505ee020d2fe1e8997de
Component: engine
 2016-07-27 18:11:51 -07:00
Sebastiaan van Stijn
6a47f2d601 docs: re-enable API 1.25 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2b9838eafed6c9f56a47fecc997cdef9b0203e9a
Component: engine
 2016-07-28 02:11:34 +02:00
Jess Frazelle
c5246dacc1 update non-events 
Signed-off-by: Jess Frazelle <jessfraz@google.com>
Upstream-commit: 6837cfc13cba842186a7261aa9bbd3a8755fd11e
Component: engine
 2016-07-27 19:21:16 -04:00
Arnaud Porterie
bbee4a3aa4 Merge pull request #25013 from dnephin/remove-extraneous-aliases 
Remove extraneous mount cli aliases
Upstream-commit: 95ede360e8bd857a6fad2ff0ce08093bfcd6af09
Component: engine
 2016-07-27 22:51:56 +00:00
Sebastiaan van Stijn
aa7e6b8845 Update usage of "Swarm" for consistency 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f0230049f0afd318217c60ebe486aab3b54538fd
Component: engine
 2016-07-27 23:31:55 +02:00
Sebastiaan van Stijn
ae11b0dc77 Merge pull request #24816 from stevvooe/service-ps-over-tasks 
cli: `docker service|node|stack ps` instead of tasks
Upstream-commit: 1a7d339d3698d13a4cf9592e8e73df27bf43664f
Component: engine
 2016-07-27 23:13:28 +02:00
Michael Crosby
3cd473134d Merge pull request #24760 from anusha-ragunathan/plugin-events 
Make daemon events listen for plugin lifecycle events.
Upstream-commit: 297745b1cdfb79a12986465f8150e22b0018c640
Component: engine
 2016-07-27 13:36:49 -07:00
Daniel Nephin
1cd561da3b Remove extraneous mount aliases. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 39a3700c01142713e88ff954e86b5dc38174511b
Component: engine
 2016-07-27 15:05:31 -04:00
Tibor Vass
e696a8fadd Merge pull request #25131 from mavenugo/restoreln 
Vendoring libnetwork to fix #25109
Upstream-commit: b90f6d780a4b24bcd877505d177593dd5af8107d
Component: engine
 2016-07-27 11:09:27 -07:00
Stephen J Day
6a1ceaa1e1 cli: docker service|node|stack ps instead of tasks 
Rather than conflict with the unexposed task model, change the names of
the object-oriented task display to `docker <object> ps`. The command
works identically to `docker service tasks`. This change is superficial.

This provides a more sensical docker experience while not trampling on
the task model that may be introduced as a top-level command at a later
date.

The following is an example of the display using `docker service ps`
with a service named `condescending_cori`:

```
$ docker service ps condescending_cori
ID                         NAME                  SERVICE             IMAGE   LAST STATE              DESIRED STATE  NODE
e2cd9vqb62qjk38lw65uoffd2  condescending_cori.1  condescending_cori  alpine  Running 13 minutes ago  Running        6c6d232a5d0e
```

The following shows the output for the node on which the command is
running:

```console
$ docker node ps self
ID                         NAME                  SERVICE             IMAGE   LAST STATE              DESIRED STATE  NODE
b1tpbi43k1ibevg2e94bmqo0s  mad_kalam.1           mad_kalam           apline  Accepted 2 seconds ago  Accepted       6c6d232a5d0e
e2cd9vqb62qjk38lw65uoffd2  condescending_cori.1  condescending_cori  alpine  Running 12 minutes ago  Running        6c6d232a5d0e
4x609m5o0qyn0kgpzvf0ad8x5  furious_davinci.1     furious_davinci     redis   Running 32 minutes ago  Running        6c6d232a5d0e
```

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 0aa4e1e68973ede0c73f8a4356e2a17fc903f549
Component: engine
 2016-07-27 11:06:42 -07:00
Justin Cormack
980ac6c629 Add a test that the default seccomp profile allows execution of 32 bit binaries 
While testing #24510 I noticed that 32 bit syscalls were incorrectly being
blocked and we did not have a test for this, so adding one.

This is only tested on amd64 as it is the only architecture that
reliably supports 32 bit code execution, others only do sometimes.

There is no 32 bit libc in the buildpack-deps so we cannot build
32 bit C code easily so use the simplest assembly program which
just calls the exit syscall.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 93bbc76ee53240e0862c6f1ff409e7a4ee0883dc
Component: engine
 2016-07-27 18:42:34 +01:00
Aaron Lehmann
bbe75712c3 Merge pull request #25010 from sfsmithcha/change_rolling_update 
update rolling update tutorial to reflect default parallelism
Upstream-commit: a861255ac2696ece63ef23c369685c0ec133e08c
Component: engine
 2016-07-27 10:13:16 -07:00
Charles Smith
6c0a8ccd7a update rolling update tutorial to reflect default parallelism and update on failure 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 6440cacd49226e97b2dcb64eb31cb32b87b1ff18
Component: engine
 2016-07-27 09:36:05 -07:00
Brian Goff
156db134e4 Merge pull request #25111 from coolljt0725/fix_25110 
Fix daemon panic on restoring containers
Upstream-commit: abf0e9f071c878ed33e84ca5c3cc1fc866f30652
Component: engine
 2016-07-27 11:43:45 -04:00
Madhu Venugopal
62baa45d6c Vendoring libnetwork to fix #25109 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: b1ae883d3f8c35f9142966af7bf5278e7a10b268
Component: engine
 2016-07-27 08:41:46 -07:00
Sebastiaan van Stijn
cb9f5d85ea Merge pull request #25067 from lixiaobing10051267/masterBreak 
Add break after found = true
Upstream-commit: 2c947a4b009f90ce79abbdf137ea908320ab28ec
Component: engine
 2016-07-27 14:44:13 +02:00
Sven Dowideit
69eee2ec52 Merge pull request #25120 from thaJeztah/put-back-1.12-links 
Add back links to 1.12 release in deprecated.md
Upstream-commit: 296378d575f8111ba4a831c2d03baa21ed30582d
Component: engine
 2016-07-27 21:48:10 +10:00
Sven Dowideit
cb17293750 Merge pull request #25119 from thaJeztah/pre-1.12-ga-fixes 
Remove release-candidate advisories
Upstream-commit: 415ef83e02a11a086128d2247e09c72e22a09406
Component: engine
 2016-07-27 21:43:37 +10:00
Sebastiaan van Stijn
49967c7276 Merge pull request #25104 from cpuguy83/fix_TestApiSwarmRaftQuorum 
fix race in TestApiSwarmRaftQuorum
Upstream-commit: e07ff10f706a5bb9aa403c8d56876b09f9cba857
Component: engine
 2016-07-27 12:50:09 +02:00
Vincent Demeester
ce6c596db3 Merge pull request #25107 from stevvooe/cleanup-leader-election-test 
integration-cli: cleanup leader election tests
Upstream-commit: ef63637b995b07a08b6cb326dc8953b927e9df1d
Component: engine
 2016-07-27 12:47:33 +02:00
Vincent Demeester
619c13b7c9 Merge pull request #25057 from lixiaobing10051267/masterTestChtimes 
Modify func name from TestChtimes to TestChtimesLinux
Upstream-commit: 6857c0a040cc3aabadd0dbf2a1a517ddc3d02fc8
Component: engine
 2016-07-27 11:58:04 +02:00
Vincent Demeester
05b77e523d Merge pull request #25071 from yongtang/07252016-docs-bundlefile-example 
Add a bundlefile example in the documentation
Upstream-commit: 468ca5bb087a5bc91f5337450554a4692ed02329
Component: engine
 2016-07-27 11:56:38 +02:00
Vincent Demeester
4fdbca5a16 Merge pull request #25080 from crosbymichael/build-directive 
Move directive out of globals
Upstream-commit: ffd96a7c733983a14edbb72b8a8685b7fb0102b6
Component: engine
 2016-07-27 11:35:25 +02:00
Sebastiaan van Stijn
ef4baa67b4 Add back links to 1.12 release in deprecated.md 
These links were temporarily changed, because the
docs were published before the 1.12.0 tag was
available.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: cd69b94241b94d16ac6dfad6e6bc7fc981dc2cca
Component: engine
 2016-07-27 11:30:42 +02:00
Sebastiaan van Stijn
83871d9ca6 Merge pull request #25118 from thaJeztah/various-docs-fixes 
fix minor docs issues
Upstream-commit: fb7edde4f217eeb76291b9ae9b7eadbc0cb6aeaf
Component: engine
 2016-07-27 11:27:34 +02:00
Sebastiaan van Stijn
07a9303505 Remove release-candidate advisories 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 053ac127ab0f784bebeda38f29f2d7615d2ffcb8
Component: engine
 2016-07-27 11:24:16 +02:00
Sebastiaan van Stijn
669220f611 fix minor docs issues 
this brings back the trailing whitespace in "runmetrics",
that were there intentially to force a line-break

also removes a duplicate redirect, that was present
on two pages

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d8434eba462752327d4c7769d3ce2c85013c211e
Component: engine
 2016-07-27 11:09:57 +02:00
Sebastiaan van Stijn
b404d167d7 Merge pull request #24970 from sfsmithcha/daemonless_containers 
add doc for live-restore setting and daemonless containers, fix admin…
Upstream-commit: d8c9fd0af9be3e937ec0520e0dcbe9a80eb321c4
Component: engine
 2016-07-27 11:00:15 +02:00
Sebastiaan van Stijn
b8668fb50c Merge pull request #24955 from sfsmithcha/add_how_services_work 
add how services work to how swarm mode works guide
Upstream-commit: 59e341667fdf24f8de7af7337dceea196d816457
Component: engine
 2016-07-27 10:59:08 +02:00