GordonTheTurtle
59912e9e1d
Merge component 'engine' from git@github.com:moby/moby master
2018-01-11 17:06:24 +00: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
GordonTheTurtle
4cf72cbba1
Merge component 'cli' from git@github.com:docker/cli master
2018-01-08 16:41:25 +00:00
Sebastiaan van Stijn
476b1d747b
Merge pull request #792 from thaJeztah/fix-builder-typo
...
Fix repeated "for" in docs/reference/builder.md
Upstream-commit: 16cccc30f9
Component: cli
2018-01-08 14:34:14 +01:00
Sebastiaan van Stijn
143be37b02
Fix repeated "for" in docs/reference/builder.md
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7e465d1b09
Component: cli
2018-01-08 12:33:06 +01:00
Sebastiaan van Stijn
5017f2840c
Merge pull request #35593 from ndeloof/master
...
Improve swagger schema for code generation
Upstream-commit: 16a1736b9b93e44c898f95d670bbaf20a558103d
Component: engine
2018-01-08 12:17:56 +01:00
Sebastiaan van Stijn
5857ab9402
Merge pull request #35798 from ndeloof/ProgressDetail
...
Progress detail
Upstream-commit: 847df43d1df0ef7343d4f623138dcbb4307d6083
Component: engine
2018-01-08 11:28:49 +01:00
Yong Tang
f75b092795
Add test case for docker ps -f health=starting
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: f509a54bdd29b8f65c17097fde3664c6fad36c21
Component: engine
2018-01-07 05:10:36 +00:00
Yong Tang
7ee813acf5
Update and use FindNetwork on Windows.
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: b249ccb1151a3c2c7e442b6c1a769821afb28fe4
Component: engine
2018-01-07 03:32:37 +00:00
GordonTheTurtle
414f8b2aa4
Merge component 'engine' from git@github.com:moby/moby master
2018-01-06 17:06:58 +00:00
GordonTheTurtle
ecf8d36483
Merge component 'cli' from git@github.com:docker/cli master
2018-01-06 16:41:31 +00:00
Sebastiaan van Stijn
5fe06b3e89
Merge pull request #35033 from chchliang/viservice
...
Add `namespace method` conver in `TestV1IDService`
Upstream-commit: c6378920e14638cc281c5513a989fdff82562426
Component: engine
2018-01-06 14:37:48 +01:00
Sebastiaan van Stijn
6169dab4e0
Merge pull request #789 from mistyhacks/load-supports-gzip
...
docker load supports tar and tar.gz files
Upstream-commit: 6764ce922a
Component: cli
2018-01-06 13:23:34 +01:00
Misty Stanley-Jones
d0f281be92
docker load supports tar and tar.gz files
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: ac7a5650f0
Component: cli
2018-01-05 20:33:31 -08:00
Yong Tang
df9a679f90
Update FindUniqueNetwork to address network name duplications
...
This fix is part of the effort to address 30242 where
issue arise because of the fact that multiple networks
may share the same name (within or across local/swarm scopes).
The focus of this fix is to allow creation of service
when a network in local scope has the same name as the
service network.
An integration test has been added.
This fix fixes 30242.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: cafed80cd019a8b40025eaa5e5b37459362607fb
Component: engine
2018-01-06 01:55:28 +00:00
Sebastiaan van Stijn
e6a8744081
Merge pull request #785 from friism/make-config-wording-more-consistent
...
use 'config' over 'configuration file'
Upstream-commit: a60bdf3bc8
Component: cli
2018-01-05 22:26:48 +01:00
Michael Friis
1bed718e52
use 'config' over 'configuration file'
...
Signed-off-by: Michael Friis <friism@gmail.com >
Upstream-commit: 99e3b4cd93
Component: cli
2018-01-05 13:19:53 -08:00
Sebastiaan van Stijn
0e6233fd86
Merge pull request #681 from mistyhacks/expose-no-protocol
...
Document EXPOSE UDP syntax
Upstream-commit: 6f09f48bf1
Component: cli
2018-01-05 21:39:21 +01:00
Yong Tang
9c4ef1072a
Merge pull request #35509 from cpuguy83/splunk_dont_readall
...
Splunk: limit the reader size on error responses
Upstream-commit: 39faf2a3a83c4abad8ed8030a9b942bbb2978359
Component: engine
2018-01-05 12:34:35 -08:00
Sebastiaan van Stijn
233f49e086
Merge pull request #35570 from zemanlx/feature/journald-with-SYSLOG_IDENTIFIER
...
Add journald tag as SYSLOG_IDENTIFIER
Upstream-commit: d80c13a54114de602c8b75030e3ec9c2cde9575b
Component: engine
2018-01-05 20:56:55 +01:00