p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,439 Commits 2 Branches 295 Tags
4ab8a85d3080a36aeee699c90c3d5627aa0188cf
Commit Graph

39439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GordonTheTurtle
4ab8a85d30 Merge component 'engine' from git@github.com:moby/moby master 2018-01-13 17:03:55 +00:00
GordonTheTurtle
f9646377ed Merge component 'cli' from git@github.com:docker/cli master 2018-01-13 16:41:07 +00:00
Vincent Demeester
6303353f60 Merge pull request #807 from thaJeztah/golint-fixes 
golint: remove redundant ifs
Upstream-commit: 1694921047
Component: cli
 2018-01-13 14:55:14 +01:00
Sebastiaan van Stijn
4db79d6583 golint: remove redundant ifs 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d845b4d36a
Component: cli
 2018-01-13 13:16:34 +01:00
Sebastiaan van Stijn
c3d475f697 Merge pull request #36000 from emil2k/fix-container-log-err 
Wrap response error for container logs method.
Upstream-commit: 6415f1dcf5c79da853c604733c56b43ae3d18ced
Component: engine
 2018-01-13 03:16:38 +01:00
Sebastiaan van Stijn
2c7eb8f0d8 Merge pull request #35998 from arm64b/fix-timeout-multi-services 
Fix timeout issue of  multi-services creation on AArch64
Upstream-commit: 86cb53e80060f6028e7847daef5b790fa7b9995f
Component: engine
 2018-01-13 03:14:31 +01:00
Sebastiaan van Stijn
e19dd094e6 Merge pull request #36001 from tophj-ibm/frozen-z-ci 
[ci] use alternate sh comparison
Upstream-commit: bc183a0062c1283cfc47f42ec78501868629dd2b
Component: engine
 2018-01-13 01:00:21 +01:00
GordonTheTurtle
298483e61f Merge component 'engine' from git@github.com:moby/moby master 2018-01-12 17:04:42 +00:00
GordonTheTurtle
e1c32a9951 Merge component 'cli' from git@github.com:docker/cli master 2018-01-12 16:41:09 +00:00
Christopher Jones
837919cf56 [ci] use alternate bash comparison 
The pattern `echo str | grep -qE pattern` likes to fail on the z CI here for
an unknown reason. Use `grep -qE pattern <<< str` instead.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 24da8a0ed415c019179ca2c4f7496cbdffb7e4d0
Component: engine
 2018-01-12 11:05:20 -05:00
Emil Davtyan
4f33349d30 Wrap response error for container logs method. 
Signed-off-by: Emil Davtyan <emil2k@gmail.com>
Upstream-commit: 2d6fb87ca41c52b255e874be62f2a3c2181a7639
Component: engine
 2018-01-12 16:43:51 +01:00
Dennis Chen
d6831a1fa6 Fix timeout issue of multi-services cration on AArch64 
Now we only adjust the timeout value for `arm` while not `arm64`,
actually the avarage duration for this test is about 25s to crate
multiple services on arm64, else the integration test will terminate
with below error:

> --- FAIL: TestCreateServiceMultipleTimes (24.11s)
>         daemon.go:285: [ddc3c7c1476c2] waiting for daemon to start
>         daemon.go:317: [ddc3c7c1476c2] daemon started
>         poll.go:121: timeout hit after 10s: task count at 4 waiting for 0
>         daemon.go:275: [ddc3c7c1476c2] exiting daemon
>         clean.go:108: Removing image sha256:e6a8d12d58602a19277ee5632b7ff9fa56a4ea52ba00eedf1d3f6f5a495fe761
>         clean.go:108: Removing image sha256:876244cc2ecb8fe1b0b2e817e3b78709a2a735edb093bc6849f99aa6c18f3a01

This PR adjusts the timeout value for both `arm64` and `arm` to mitigate
this issue on those 2 platforms.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
Upstream-commit: 4542016cbe985d2af60c25f6a5b24df50bb50aba
Component: engine
 2018-01-12 11:52:35 +00:00
Vincent Demeester
2539b89332 Merge pull request #803 from thaJeztah/remove-orchestrator-aliases 
Remove aliases for orchestrator
Upstream-commit: b7b3e9a261
Component: cli
 2018-01-12 08:59:52 +01:00
Sebastiaan van Stijn
5127f79a88 Remove aliases for orchestrator 
Prefer "strict" values for orchestrator, as it's
easier to add aliases (if we think it's needed) than
to remove them later.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a812995f98
Component: cli
 2018-01-11 21:16:37 +01:00
Brian Goff
4bf05acc16 Merge pull request #35982 from cpuguy83/fix_concurrent_daemon_test_issues 
Fix race with concurrent daemon startup in tests
Upstream-commit: 92309e34e42aec3a0e041403bdd3c4fc0dc20269
Component: engine
 2018-01-11 14:26:35 -05:00
Sebastiaan van Stijn
cfd3975d5f Merge pull request #802 from thaJeztah/fix-yaml-generation 
Fix docs YAML generation setting "kubernetes" for "swarm"
Upstream-commit: 41368a84bb
Component: cli
 2018-01-11 19:56:36 +01:00
Sebastiaan van Stijn
3e7d4bee2e Fix docs YAML generation setting "kubernetes" for "swarm" 
Due to a copy/paste error, commands annotated with "swarm"
were incorrectly setting the "kubernetes" property.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6be06a3db2
Component: cli
 2018-01-11 18:30:50 +01:00
GordonTheTurtle
59912e9e1d Merge component 'engine' from git@github.com:moby/moby master 2018-01-11 17:06:24 +00:00
Brian Goff
8bf6743e94 Fix race with concurrent daemon startup in tests 
Using parallel tests is nice, however it can cause an issue with
multiple daemons trying to make changes to iptables at the same time
which causes flakey tests.

This just disables iptables for the set of tests since it is not
required.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9e3193810da91d81f6b2dba3171443557f756794
Component: engine
 2018-01-11 11:47:21 -05:00
Yong Tang
a64e387daf Merge pull request #35976 from thaJeztah/bump-libnetwork2 
Bump libnetwork to a1dfea384b39779552a3b4837ea9303194950976
Upstream-commit: cc79c6c7dab994c72133c782a24c69b5ad0f8993
Component: engine
 2018-01-10 22:56:00 -08:00
Sebastiaan van Stijn
f408947b41 Bump libnetwork to a1dfea384b39779552a3b4837ea9303194950976 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4c3afb53e633a832871cada30890e3497fceff02
Component: engine
 2018-01-10 18:09:05 +01:00
GordonTheTurtle
eae3cf0a12 Merge component 'engine' from git@github.com:moby/moby master 2018-01-10 17:07:15 +00:00
GordonTheTurtle
a9d3d30077 Merge component 'cli' from git@github.com:docker/cli master 2018-01-10 16:41:31 +00:00
Yong Tang
1682b7c735 Merge pull request #35902 from dnephin/cleanup-graphdriver-quota-tests 
Skip graphdriver/quota TestBlockDev if dependencies are not available
Upstream-commit: 88b94d7849c2ec3ab61b179c8bfdeb28507cf451
Component: engine
 2018-01-10 05:32:16 -08:00
Yong Tang
dc5184e050 Merge pull request #30897 from yongtang/30242-network-duplicate-names 
Update `FindNetwork` to address network name duplications
Upstream-commit: 484612f388cabf4b6f4df915f2bf268a8ffdd9fc
Component: engine
 2018-01-10 05:30:58 -08:00
Yong Tang
b1b02a3b31 Merge pull request #35968 from Microsoft/jjh/go-winio-0.4.6 
Revendor Microsoft/go-winio @ v0.4.6
Upstream-commit: 062b4c8013a50afd4c96f4964f0d759c00f000ea
Component: engine
 2018-01-10 05:23:50 -08:00
Vincent Demeester
bf3f938c50 Merge pull request #35940 from yongtang/35920-filter-health-starting 
Fix issue of filter in `docker ps` where `health=starting` returns nothing
Upstream-commit: 7c7a7c7944a28e16aed4d2a0f2d590541f1c5687
Component: engine
 2018-01-10 14:12:47 +01:00
Sebastiaan van Stijn
77c9b11634 Merge pull request #35970 from RenaudWasTaken/cli-fix 
Fix node-generic-resources CLI typo
Upstream-commit: 178d0278296c9a0778755f0804ced34756ee4fc7
Component: engine
 2018-01-10 12:49:00 +01:00
Doug Davis
6252dbd48d Merge pull request #35969 from Microsoft/jjh/typo-would 
Fix typo 'woudld' to 'would'
Upstream-commit: 7f81894df299fbedee2fe891276ba60ccca897a4
Component: engine
 2018-01-09 22:40:30 -05:00
Renaud Gaubert
c31e485134 Fix node-generic-resources CLI typo 
Signed-off-by: Renaud Gaubert <rgaubert@nvidia.com>
Upstream-commit: 6702ac590e6148cb3f606388dde93a011cb14931
Component: engine
 2018-01-10 00:51:47 +01:00
John Howard
6b1b00bfce Fix typo 'woudld' to 'would' 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d92acd59108565ac2e552e9f04e873decd192e6d
Component: engine
 2018-01-09 14:25:33 -08:00
John Howard
6611bbb002 Revendor Microsoft/go-winio @ v0.4.6 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 2956ef1db218f228e6bba5ca8c875aa692092b3d
Component: engine
 2018-01-09 13:41:16 -08:00
Brian Goff
2f79038e74 Merge pull request #35748 from dnephin/try-new-containerd-cio 
Update vendor of containerd, use new containerd/cio
Upstream-commit: 274538c70bfb537430b8543646bc9de36c4d879c
Component: engine
 2018-01-09 15:56:05 -05:00
Sebastiaan van Stijn
6094444b27 Merge pull request #793 from thaJeztah/bump-version-to-v18.02-dev 
Bump version to v18.02.0-dev
Upstream-commit: 4c7749e523
Component: cli
 2018-01-09 20:44:53 +01:00
GordonTheTurtle
940cce76d9 Merge component 'engine' from git@github.com:moby/moby master 2018-01-09 17:07:27 +00:00
Daniel Nephin
6f88b66c36 Fix libcontainerd/client.Restore() handling of io cleanup 
Make the behvious of cleaning up DirectIO more obvious

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9d20d5eb3fd744088e700292b15d56de29a3361d
Component: engine
 2018-01-09 12:03:02 -05:00
Daniel Nephin
cf94b87820 Use cio.FIFOSet.Close() to cleanup fifos 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d72dfbfa8db9a99be34c2d7963717a08ab7358c5
Component: engine
 2018-01-09 12:00:28 -05:00
Daniel Nephin
097704d16a Remove libcontainerd.IOPipe 
replaced with cio.DirectIO

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3fec7c0858a0a3dee5423e6bffc3a3a1b238c30f
Component: engine
 2018-01-09 12:00:28 -05:00
Daniel Nephin
9cffb84b7c Update vendor 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4f5c47aae4105840a16047b7bca424319a7db709
Component: engine
 2018-01-09 12:00:27 -05:00
Sebastiaan van Stijn
2e2fe70626 Bump version to v18.02.0-dev 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1350a08b4f
Component: cli
 2018-01-09 10:30:59 +01:00
Yong Tang
bcd054dac5 Merge pull request #35957 from crosbymichael/ramdisk 
Honor DOCKER_RAMDISK with containerd 1.0
Upstream-commit: 94b8a116fbf1cd90e68d8f5361b520d326a66f9b
Component: engine
 2018-01-08 17:38:17 -08:00
Brian Goff
207f11f4b6 Merge pull request #35959 from dnephin/remove-str-error-checking 
Use errdefs instead of string contains for checking not found
Upstream-commit: 7f6fdce901d51e2692f7d5229d7ba8b4bad6c6a9
Component: engine
 2018-01-08 20:33:51 -05:00
Yong Tang
ec52ac3e88 Merge pull request #35958 from yongtang/35956-doc-CopyFromContainer 
Update doc for CopyFromContainer
Upstream-commit: b4c7017f8d95ab42b1f9aa40260966df2c121cd5
Component: engine
 2018-01-08 15:22:40 -08:00
Eli Uriegas
790deda568 Merge pull request #386 from seemethere/bump_ver_18_02_dev 
[master] bump VERSION to 18.02.0-ce-dev
 2018-01-08 14:15:00 -08:00
Eli Uriegas
adaa8a0f77 bump VERSION to 18.02.0-ce-dev 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2018-01-08 21:32:48 +00:00
Daniel Nephin
88fc146546 Use errdefs instead of string contains for checking not found 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9b62d4ffa39f7c042f94f9a3670cae2a816535da
Component: engine
 2018-01-08 14:32:39 -05:00
Daniel Nephin
58f87a5e9a Cleanup graphdriver/quota test 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e3a6323419c8b2a81a21134ed49a1624eb483c81
Component: engine
 2018-01-08 13:41:45 -05:00
Yong Tang
844b65b181 Update doc for CopyFromContainer 
This fix updates doc for CopyFromContainer to explicitly
mention that the content received from the reader is
a TAR archive.

This fix closes 35965.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: e330e7a5ce77736c76c36ba77983accfae01c405
Component: engine
 2018-01-08 18:29:59 +00:00
GordonTheTurtle
785a293997 Merge component 'engine' from git@github.com:moby/moby master 2018-01-08 17:06:08 +00:00
Michael Crosby
1f027b4d1b Honor DOCKER_RAMDISK with containerd 1.0 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 54051e9e64185e442e034c7e49a5707459a9eed2
Component: engine
 2018-01-08 12:01:03 -05:00