docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-25 03:42:05 +03:00
Code Activity
25,695 Commits 12 Branches 297 Tags
3c899b874096352dd0a22479358d2d5ed91aaa2f
Commit Graph

3761 Commits

Author SHA1 Message Date
Vincent Demeester
cbbd824f10 Merge pull request #24548 from cpuguy83/24167_fix_log_config_merge 
Fix panic while merging log configs to nil map
Upstream-commit: 7a1442baf6e31b3c94a2e9fd92155a75c1987868
Component: engine
 2016-07-12 23:40:47 +02:00
Vincent Demeester
83f818387f Merge pull request #24549 from cpuguy83/fix_nil_meminfo 
Fix panic when meminfo couldn't be read
Upstream-commit: 534c3e328fa14cee9b012b18faa35fd1571703ef
Component: engine
 2016-07-12 23:05:27 +02:00
Brian Goff
3abfcc9b91 Merge pull request #24546 from mavenugo/stend 
Fixing a stale endpoint issue that blocks ingress network cleanup 
Upstream-commit: 933584f16fbd8fa1ffef691ed8d1673e7c896781
Component: engine
 2016-07-12 16:40:19 -04:00
Brian Goff
b8f5ee5430 Fix panic when meminfo couldn't be read 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 5f7b1b604c9e44477aee196b17fb4b5692cbbaa6
Component: engine
 2016-07-12 15:30:21 -04:00
Brian Goff
f1f9d4454d Fix panic while merging log configs to nil map 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 7dff31064824ed1f9b046fe5c29bd707e663ee0b
Component: engine
 2016-07-12 15:24:42 -04:00
Arnaud Porterie
832af6ffb8 Merge pull request #24528 from rsippl/24526-empty-services-list 
Return an empty services list if no services are running
Upstream-commit: 79432b436793b9850f50de38166740698aca41bf
Component: engine
 2016-07-12 18:31:28 +00:00
Madhu Venugopal
e096d83b0e Fixing a stale endpoint issue that blocks ingress network cleanup 
fixes #24400

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: a4926a4d92eb7940d079de01d7fafe43060fcd56
Component: engine
 2016-07-12 11:27:58 -07:00
Sebastiaan van Stijn
9b4a3ab43b Merge pull request #24518 from dmcgowan/overlay2-override-kernel-check 
Allow option to override kernel check in overlay2
Upstream-commit: a44f0107023aa62d202b068c0a8d4b5ad0640838
Component: engine
 2016-07-12 19:22:27 +02:00
Sebastiaan van Stijn
048f3b1b85 Merge pull request #24504 from hqhq/soften_update_kmem 
Soften limitation of update kernel memory
Upstream-commit: 110b2aecda9625dd5679733686d1cc169f87a463
Component: engine
 2016-07-12 13:58:17 +02:00
Ralf Sippl
52fb31b62e Return an empty services list if no services are running 
Signed-off-by: Ralf Sippl <ralf.sippl@gmail.com>
Upstream-commit: c8e4e95db9b0d3115435b8f0e94c78a2e0cb92d0
Component: engine
 2016-07-12 11:41:04 +02:00
Brian Goff
1da671b499 Merge pull request #24229 from anusha-ragunathan/shutdown-plugins 
Shutdown plugins during daemon shutdown.
Upstream-commit: b91e2dd9942f4c34b62de37c3862b9febd270b22
Component: engine
 2016-07-11 22:14:50 -04:00
Qiang Huang
1a97e07ac0 Soften limitation of update kernel memory 
Kernel memory is not allowed to be updated if container is
running, it's not actually a precise kernel limitation.

Before kernel version 4.6, kernel memory will not be accounted
until kernel memory limit is set, if a container created with
kernel memory initialized, kernel memory is accounted as soon
as process created in container, so kernel memory limit update
is allowed afterward. If kernel memory is not initialized,
kernel memory consumed by processes in container will not be
accounted, so we can't update the limit because the account
will be wrong.

So update kernel memory of a running container with kernel memory
initialized is allowed, we should soften the limitation by docker.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 08c7075c403b86111b2c393b49075a81a1d2263f
Component: engine
 2016-07-12 08:07:24 +08:00
Derek McGowan
a5531ff991 Allow option to override kernel check in overlay2 
Add option to skip kernel check for older kernels which have been patched to support multiple lower directories in overlayfs.

Fixes #24023

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: ff98da0607c4d6a94a2356d9ccaa64cc9d7f6a78
Component: engine
 2016-07-11 16:48:08 -07:00
Anusha Ragunathan
495149133d Shutdown plugins during daemon shutdown. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 863ab9ab134d0baef3c7e5d745eded891e87e734
Component: engine
 2016-07-11 14:21:27 -07:00
John Howard
4451288540 Merge pull request #24427 from swernli/remove_custom_images 
Removing Custom Images support
Upstream-commit: b215c4c9748c008b5bdcd3ea267ac21e666da1ff
Component: engine
 2016-07-11 14:01:41 -07:00
Vincent Demeester
7fcae13aa7 Merge pull request #24474 from mavenugo/fix-24452 
swarmkit expects network-id for as target
Upstream-commit: 36f3d4af233acd7c32caf94ed98ccee4585cc1f7
Component: engine
 2016-07-11 20:59:38 +02:00
Brian Goff
737108710c Merge pull request #24139 from runshenzhu/health-check 
add health check in docker build-in swarm mode
Upstream-commit: e2fc1439a11cff5f719ae47265da135d26dd36ad
Component: engine
 2016-07-11 09:43:59 -04:00
Sebastiaan van Stijn
2768065432 Merge pull request #24468 from yongtang/24374-docker-info-seccomp 
Fix seccomp output in `docker info`
Upstream-commit: bc5fa7c5e04f776ee5a4636a78b59462463b92ac
Component: engine
 2016-07-10 04:22:26 -07:00
Madhu Venugopal
f2aefa4f7f swarmkit expects network-id for as target 
For any operation that involves netwoks (other than network create),
swarmkit expects the target as network-id. Service upate was using
network-name as the target and that caused the issue.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: b32cfb32a3f654f27bc9d4356b36c6a7e5e53b21
Component: engine
 2016-07-08 18:00:41 -07:00
Yong Tang
f711cd5f01 Fix seccomp output in docker info 
This fix tries to address the issue raised in #24374 where
`docker info` outputs seccomp support in Ubuntu 14.04 but
the seccomp wass not actually supported.

The issue is that in the current docker implementation, seccomp
support is only checked against the kernel by inspect CONFIG_SECCOMP
and CONFIG_SECCOMP_FILTER. However, seccomp might not be enabled
when building docker (through golang build flag).

This fix adds a supportSeccomp boolean variable. The supportSeccomp
is only set to true when seccomp is enabled when building docker.

This fix fixes #24374.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: a3b9dd89a1b19e7f84617b91f3756ae816c11035
Component: engine
 2016-07-08 17:26:42 -07:00
Tonis Tiigi
8d74981897 Add logdrivers to executor from swarmkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 8a50315f3ce89b24e3556dba288b2ce7b4daf026
Component: engine
 2016-07-08 13:33:40 -07:00
Tonis Tiigi
7ac8dc18c4 Update executor volumes from swarmkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 6586f4f0719ae59c4a2b74acd91a1a888a0018b5
Component: engine
 2016-07-08 13:33:40 -07:00
Sebastiaan van Stijn
e1639e03c6 Merge pull request #24358 from AkihiroSuda/fixdockertop 
Validate arguments for `ps` in `docker top`
Upstream-commit: 152f5a5cedb062c26745cab81159b6bb2e05c0b1
Component: engine
 2016-07-08 10:57:13 -07:00
Tõnis Tiigi
eaf2bbac5f Merge pull request #24435 from cpuguy83/24350_cleanup_on_no_running_containers 
Fix daemon not cleaned up w/ live restore enabled
Upstream-commit: a34534fe95f0b7378837a5d5993b1058d41a635e
Component: engine
 2016-07-08 10:23:14 -07:00
Sebastiaan van Stijn
4e31188a93 Merge pull request #24431 from mavenugo/revert 
Check for swarm-mode network conflict during create network
Upstream-commit: e10c11e4a1ac39a408f7503b594207e481387c87
Component: engine
 2016-07-08 09:41:34 -07:00
Antonio Murdaca
bff94672e9 daemon: ensure we set default options to stock runtime 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 59162641cc20640afb785540b5f47178835de656
Component: engine
 2016-07-08 15:58:06 +02:00
Akihiro Suda
6e2ed85ac6 Validate arguments for ps in docker top 
Fix #24357

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 253933220965574422aa6679255359d8bd15d435
Component: engine
 2016-07-08 05:58:11 +00:00
Brian Goff
fde455a0e2 Fix daemon not cleaned up w/ live restore enabled 
This patch makes sure daemon resources are cleaned up on shutdown if
there are no running containers.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2d5dc94b9b547a9ba73f7b613e358b03fdfb2b84
Component: engine
 2016-07-07 22:25:41 -04:00
Tibor Vass
e4b8c6fd9c Merge pull request #23312 from justincormack/proxy 
Make the docker proxy a standalone binary not a re-exec
Upstream-commit: 07dd69df8d6c5f4da0059d49e128fef9277fcb5d
Component: engine
 2016-07-07 17:14:40 -07:00
Madhu Venugopal
9280648ffe Revert "Fixed a few network UI issues in swarm-mode" 
This reverts commit 0ce5158a2a9a3f10a62d3c1ea289c55e524cdac5.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 4623276886033aedb4932c3996c7f61e7fc35861
Component: engine
 2016-07-07 16:23:42 -07:00
Stefan J. Wernli
5590093d90 Removing Custom Images support 
Now that Windows base images can be loaded directly into docker via "docker load" of a specialized tar file (with docker pull support on the horizon) we no longer have need of the custom images code path that loads images from a shared central location.  Removing that code and it's call points.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: 3e109f349ff42ea1a0f555b6e645c51d9bc1539b
Component: engine
 2016-07-07 14:56:37 -07:00
Justin Cormack
2ccfe96ba1 Update swarmkit vendoring 
Needed for libnetwork vendoring

Update Secret API name change correspondingly

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: d428a7a425f071ee9e5707c7319d3197540adc19
Component: engine
 2016-07-07 21:01:54 +01:00
Sebastiaan van Stijn
f7a6ca3323 Merge pull request #22868 from Microsoft/jjh/dockerfilecmd 
Windows: CMD not honouring arg escaping
Upstream-commit: 6167a9ab166ce1e6fd0ffa653b9476d33983f15b
Component: engine
 2016-07-07 09:21:26 -07:00
Vincent Demeester
f5a13a7cbe Use "on-failure" for both containers and services 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a859a336475f39c7b7d7739c58a1dae40df86a86
Component: engine
 2016-07-07 11:32:19 +02:00
Brian Goff
7ac01fb32e Use newer default values for mounts CLI 
In the API:
`Writable` changed to `ReadOnly`
`Populate` changed to `NoCopy`

Corresponding CLI options updated to:
`volume-writable` changed to `volume-readonly`
`volume-populate` changed to `volume-nocopy`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 56f3422468a0b43da7bae7a01762ce4f0a92d9ff
Component: engine
 2016-07-06 22:34:39 -04:00
runshenzhu
f773935c3b add health check in docker cluster 
Signed-off-by: runshenzhu <runshen.zhu@gmail.com>
Upstream-commit: 1ded1f26e154e283ab26f347971d4d4a51edc94f
Component: engine
 2016-07-06 13:43:20 -07:00
Vincent Demeester
786983bb63 Merge pull request #24323 from avsm/better-leave-grammar 
Improve the warning messages when leaving a Swarm cluster
Upstream-commit: c70e432cee7ce2052a729f85da31420b6c01d72c
Component: engine
 2016-07-06 12:00:20 +02:00
Vincent Demeester
e4dfc2d04c Validate hostname starting from 1.24 API. 
In order to keep a little bit of "sanity" on the API side, validate
hostname only starting from v1.24 API version.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6daf3d2a783fd042e870c8af8bbd19fc28989505
Component: engine
 2016-07-06 09:13:59 +02:00
Arnaud Porterie
48bf87974d Merge pull request #24158 from mavenugo/smissues 
Fixed a few network UI issues in swarm-mode
Upstream-commit: 5b4131681595b6f5304f3d94868a1642f92f2998
Component: engine
 2016-07-05 20:28:20 +00:00
Alexander Morozov
f3ff9e9f18 Merge pull request #24173 from vdemeester/tasks-filter-service-node-by-name 
Allow service and node filter to be name in `tasks` subcommands 
Upstream-commit: db75aa029d1843b3fdabb16c5cd9e1b3a99f39b2
Component: engine
 2016-07-05 12:16:57 -07:00
Arnaud Porterie
eff3f9141a Merge pull request #23996 from dmcgowan/always-store-image-digest-update 
[carry 23503]  Always store the image digest when pulling and pushing an image.
Upstream-commit: ee0283c97a44fd8e67f2df81d076eb4b1858b3d2
Component: engine
 2016-07-05 16:18:20 +00:00
Vincent Demeester
f2db9c3fd0 Merge pull request #24332 from allencloud/fix-typos 
fix typos
Upstream-commit: dc31f4f6db5edff7c8554ec0725365a344bdec20
Component: engine
 2016-07-05 16:29:29 +02:00
allencloud
9921891219 fix typos 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: edc307cb9213d11d9c5911b08ebd921a097939c0
Component: engine
 2016-07-05 20:42:17 +08:00
Anil Madhavapeddy
21a36cd129 Improve the warning messages when leaving a Swarm cluster 
Signed-off-by: Anil Madhavapeddy <anil@docker.com>
Upstream-commit: 22a3d1fa209282e938ca16f31cce0dab4f35bf72
Component: engine
 2016-07-05 09:14:23 +01:00
Francis Chuang
78dacb842c Fix a grammatical error in errClusterNetworkOnRun()'s error message. 
Signed-off-by: Francis Chuang <francis.chuang@boostport.com>
Upstream-commit: 1205a5584650388f36cda922556a31cbce827915
Component: engine
 2016-07-05 16:18:06 +10:00
Otto Kekäläinen
0bdbf282f3 Fix spelling in comments, strings and documentation 
Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
Upstream-commit: 644a7426cc31c338fedb6574d2b88d1cc2f43a08
Component: engine
 2016-07-03 20:58:11 +03:00
Sebastiaan van Stijn
a3ed3e2e3c Merge pull request #23947 from cpuguy83/fix_mount_target 
Volume mounts need to use "Binds" API field
Upstream-commit: adb48487f2ec65a9facab04f1ec6c20aefb3e41f
Component: engine
 2016-07-01 13:23:14 -07:00
Vincent Demeester
db7f1cc524 Merge pull request #24128 from thaJeztah/rename-desired_state-filter 
rename desired_state filter to desired-state
Upstream-commit: b8988824616017a7ff4a13475dde23f7677aa21c
Component: engine
 2016-07-01 18:34:02 +02:00
Tonis Tiigi
bda6fa8f54 Add support for external CAs 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 11085b2260a78b3248f3e98e0a1e3203431fae22
Component: engine
 2016-06-30 17:22:47 -07:00
Tonis Tiigi
b73379e968 Update to new swarmkit/engine-api 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 9b652738363d92fbe6e43b3981cdcc94bdb72c76
Component: engine
 2016-06-30 17:22:47 -07:00