toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,235 Commits 3 Branches 295 Tags
9d7fa4df844a89cf40fd2420ee85f4b2e4996cbe
Commit Graph

41235 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GordonTheTurtle
9d7fa4df84 Merge component 'cli' from git@github.com:docker/cli master 2018-06-11 16:41:37 +00:00
Silvin
6467f7f59f Merge pull request #1121 from vdemeester/gotestyourself-with-tools 
Update gotestyourself to gotest.tools
Upstream-commit: 4cb3c70f36
Component: cli
 2018-06-11 14:49:20 +02:00
GordonTheTurtle
ecac08f83b Merge component 'engine' from git@github.com:docker/engine master 2018-06-09 17:07:47 +00:00
GordonTheTurtle
42c1cad746 Merge component 'cli' from git@github.com:docker/cli master 2018-06-09 16:41:42 +00:00
Tibor Vass
ef2084848e Merge pull request #37250 from tonistiigi/update-containerd-vendor 
vendor: update containerd to 63522d9
Upstream-commit: 0c4ed4e4aef158b59b6d4d6a6dfea7f612129f9f
Component: engine
 2018-06-09 09:18:46 -07:00
Vincent Demeester
8c923be7a4 Merge pull request #36687 from cpuguy83/remove_custom_tls_dialer 
Use stdlib TLS dialer
Upstream-commit: f5e60bbf21ea014a2854349ebc1c4e7e04e30398
Component: engine
 2018-06-09 15:52:57 +02:00
Sebastiaan van Stijn
3c1e80ab62 Merge pull request #1116 from vdemeester/vendor-bump-moby 
Bump moby version (and its dependencies)
Upstream-commit: 75c1bb1f33
Component: cli
 2018-06-08 21:35:58 -07:00
Tonis Tiigi
9a81ad55fc vendor: update containerd to 63522d9 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 44f3dd7653a1c5739d2c25d1227d945d9c686c86
Component: engine
 2018-06-08 19:19:06 -07:00
Sebastiaan van Stijn
1986a1408c Merge pull request #37172 from zq-david-wang/resizefix2 
Fix race condition between exec start and resize.
Upstream-commit: 5e11f66cb6de472d11647e8b1a744afc941859ad
Component: engine
 2018-06-08 15:43:25 -07:00
Brian Goff
cbea8edb83 Use stdlib TLS dialer 
Since go1.8, the stdlib TLS net.Conn implementation implements the
`CloseWrite()` interface.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2ac277a56f50d0ad1831603dccbca5c19ff717e9
Component: engine
 2018-06-08 14:24:30 -07:00
Sebastiaan van Stijn
bae6d423c4 Merge pull request #37184 from cpuguy83/attach_leak 
Fix fd leak on attach
Upstream-commit: 5cb95f693dc7170a97401e6e3059e8fd134dc475
Component: engine
 2018-06-08 13:08:06 -07:00
Sebastiaan van Stijn
07f52be94c Merge pull request #37236 from johnstep/fix-client-test-env-cleanup 
Clean up in TestNegotiateAPIVersionEmpty
Upstream-commit: 67f26c79d94ded25f0a2abcc0d631a94714af5e0
Component: engine
 2018-06-08 13:06:53 -07:00
GordonTheTurtle
3dfd20c925 Merge component 'engine' from git@github.com:docker/engine master 2018-06-08 17:05:09 +00:00
GordonTheTurtle
2a42a9a588 Merge component 'cli' from git@github.com:docker/cli master 2018-06-08 16:41:22 +00:00
Vincent Demeester
e92ec69f61 Update tests to use gotest.tools 👼 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 2c4de4fb5e
Component: cli
 2018-06-08 18:24:26 +02:00
Vincent Demeester
a7c8326a15 Replace gotestyourself by gotest.tools 
github.com/gotestyourself/gotestyourself moved to gotest.tools with
version 2.0.0. Moving to that one, bumping it to v2.1.0.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: dd9478a1f7
Component: cli
 2018-06-08 18:23:38 +02:00
Sebastiaan van Stijn
6a80f2d39d Merge pull request #36161 from fanjiyun/edit 
When link id is empty for overlay2, do not remove this link.
Upstream-commit: a7b6643c5f12e9048e6434aca5855d2041bbaada
Component: engine
 2018-06-08 09:12:22 -07:00
Vincent Demeester
d697e2a9fb Bump mergo to v0.3.5 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 48ed659bc6
Component: cli
 2018-06-08 17:15:12 +02:00
Vincent Demeester
5522fc00fc Merge pull request #1119 from silvin-lubecki/fix-help-docker-client-initialization 
Check errors when initializing the docker client in the help command
Upstream-commit: aac3124794
Component: cli
 2018-06-08 17:05:21 +02:00
Sebastiaan van Stijn
3a0f08270b Merge pull request #37240 from francescomari/toolbox-link 
Fix link to Docker Toolbox
Upstream-commit: d072a3658b5dc81f31c6cb59eea42681db8df52c
Component: engine
 2018-06-08 07:23:32 -07:00
Silvin Lubecki
17705eb1b4 Fix #1113 "Segfault on --help with --tlsverify if no ca certificate is present" 
Errors were not checked while initializing the docker client in the help command

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: f4b0780e20
Component: cli
 2018-06-08 16:14:48 +02:00
Francesco Mari
1fd604f1f8 Fix link to Docker Toolbox 
Signed-off-by: Francesco Mari <mari.francesco@gmail.com>
Upstream-commit: a045b027bf8f9e19fd53c2b33399fad901b1dd34
Component: engine
 2018-06-08 16:12:00 +02:00
Vincent Demeester
bfd82b2547 Bump moby version (and its dependencies) 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b1065767cd
Component: cli
 2018-06-08 11:26:10 +02:00
Vincent Demeester
885386e772 Merge pull request #37195 from adshmh/refactor-integration-test-create-network-calls-macvlan 
Refactor macvlan network integration tests to use network.Create
Upstream-commit: 162ba6016def672690ee4a1f3978368853a1e149
Component: engine
 2018-06-08 09:46:04 +02:00
Vincent Demeester
0fba2438fd Merge pull request #37234 from kolyshkin/plugin-panic 
Fix daemon panic on restart when a plugin is running
Upstream-commit: 712dd62a348b2da1508bc81cfb852b0f05c0ede3
Component: engine
 2018-06-08 09:45:25 +02:00
Vincent Demeester
10e74b4423 Merge pull request #37235 from kunaltyagi/vim-filename 
[vim] Be case insensitive for D in dockerfile
Upstream-commit: fe3d0233ef711a049a0409f33fb298f13cd0f31d
Component: engine
 2018-06-08 09:39:18 +02:00
Tõnis Tiigi
d23610aaff Merge pull request #37233 from dnephin/add-metrics-for-pull 
Add image metrics for push and pull
Upstream-commit: 4703b284e6695524a58ae0cd6f94eaf7359bd500
Component: engine
 2018-06-08 00:26:12 -07:00
Sebastiaan van Stijn
d95a00a489 Merge pull request #37189 from arm64b/create-intermediate-for-COPY-ADD 
Refactor and cleanup the intermediate container creation
Upstream-commit: 52ea99eda2ea29d9a0e4111f1e7a0b382d8d9408
Component: engine
 2018-06-07 21:20:17 -07:00
Sebastiaan van Stijn
f15217a073 Merge pull request #34218 from yosifkit/close-readclosers 
Close readclosers returned by DecompressStream
Upstream-commit: e3e552ac8129de1af66af90f67b694843ab0df0a
Component: engine
 2018-06-07 20:42:30 -07:00
David Wang
87cfb7e0a8 Fix race condition between exec start and resize 
Signed-off-by: David Wang <00107082@163.com>
Upstream-commit: e6783656f917c5a8b8c6f346b4ff840d97b1b6ce
Component: engine
 2018-06-08 11:07:48 +08:00
John Stephens
f2b19f94a1 Clean up in TestNegotiateAPIVersionEmpty 
Signed-off-by: John Stephens <johnstep@docker.com>
Upstream-commit: b801361064f708bf7f8adb93a18570c25de58219
Component: engine
 2018-06-07 20:05:29 -07:00
Sebastiaan van Stijn
cdee8f774a Merge pull request #37183 from vdemeester/service-create-init 
Add support for `init` on services
Upstream-commit: f11f24958852986cfc996e6076fed75bfcbf1ed1
Component: engine
 2018-06-07 19:22:14 -07:00
Kunal Tyagi
3f03982f9a Allow vim be case insensitive for D in dockerfile 
Signed-off-by: Kunal Tyagi <tyagi.kunal@live.com>
Upstream-commit: 6b8dab2181097c83670b65c2f76f83307058c987
Component: engine
 2018-06-08 10:30:40 +09:00
Sebastiaan van Stijn
a1a394884c Merge pull request #37231 from adshmh/use-unique-names-for-integration-tests-service-create 
use unique names for resources in create service integration tests
Upstream-commit: 5ff12f6ba13edf16a174250b65b1c7294fbd5a45
Component: engine
 2018-06-07 17:47:07 -07:00
fanjiyun
2ca4487c26 When id is empty for overlay2/overlay, do not remove the directories. 
Signed-off-by: fanjiyun <fan.jiyun@zte.com.cn>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0e8f96e31724a7bb49d0ade9acec116f68c85c74
Component: engine
 2018-06-07 17:35:54 -07:00
Brian Goff
54e00c6a5c Fix panic on daemon restart with running plugin 
Scenario:

Daemon is ungracefully shutdown and leaves plugins running (no
live-restore).
Daemon comes back up.
The next time a container tries to use that plugin it will cause a
daemon panic because the plugin client is not set.

This fixes that by ensuring that the plugin does get shutdown.
Note, I do not think there would be any harm in just re-attaching to the
running plugin instead of shutting it down, however historically we shut
down plugins and containers when live-restore is not enabled.

[kir@: consolidate code to deleteTaskAndContainer, a few minor nits]

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: dbeb4329655e91dbe0e6574405937f03fabf3f2f
Component: engine
 2018-06-07 17:27:02 -07:00
Daniel Nephin
97950284c3 Add image metrics for push and pull 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
Upstream-commit: 6910019bbebd71d6bb5c949a40e96b49a6b41f45
Component: engine
 2018-06-07 18:26:12 -04:00
Vincent Demeester
92d9a5ddfd Merge pull request #37215 from adshmh/integration-container-links-tests-use-unique-names 
container links integration tests use unique names
Upstream-commit: d47c45175b13e97475649dfe8b1ab1034c4865d0
Component: engine
 2018-06-07 22:34:12 +02:00
Vincent Demeester
e55ae1efdd Merge pull request #37232 from vdemeester/o-rly 
Mark @thajeztah as a MAINTAINER…
Upstream-commit: d9b96d90c62063b506d28f685870f65f1fd4154d
Component: engine
 2018-06-07 22:33:45 +02:00
Silvin
709a15352d Merge pull request #1115 from vdemeester/o-rly 
Mark @thajeztah as a MAINTAINER…
Upstream-commit: 001c8f2f7f
Component: cli
 2018-06-07 20:55:40 +02:00
Joe Ferguson
dc6063672c Close readclosers returned by DecompressStream 
Signed-off-by: Joe Ferguson <joe@infosiftr.com>
Upstream-commit: 76e99e1a8b60c831415d2f6a6a7954e16c25620b
Component: engine
 2018-06-07 11:16:13 -07:00
Vincent Demeester
5ea7988613 Mark @thajeztah as a MAINTAINER… 
… discovered recently that our very own Sebastiaan was not even listed
in the maintainers, so fixing this mistake !

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 9fda91bed4
Component: cli
 2018-06-07 19:52:40 +02:00
Vincent Demeester
c2a60aeb45 Mark @thajeztah as a MAINTAINER… 
… discovered recently that our very own Sebastiaan was not even listed
in the maintainers, so fixing this mistake !

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 7f9dd507d3f50cd343480cb0776a3ccca83c5764
Component: engine
 2018-06-07 19:50:41 +02:00
GordonTheTurtle
b41fea2d2c Merge component 'engine' from git@github.com:docker/engine master 2018-06-07 17:07:30 +00:00
Arash Deshmeh
29579f20f8 use unique names for resources in create service integration tests 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: d5ae23fc11b91275801dcab2326e803725a645a6
Component: engine
 2018-06-07 12:11:11 -04:00
Vincent Demeester
43d60463c2 Add support for init on services 
It's already supported by `swarmkit`, and act the same as
`HostConfig.Init` on container creation.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: e401b88e59e098745744917c555d549f08353e6d
Component: engine
 2018-06-07 14:17:55 +02:00
Sebastiaan van Stijn
025606b2a1 Merge pull request #36644 from jessfraz/rawaccess 
api: add MaskedPaths and ReadonlyPaths options
Upstream-commit: 1fe0e49d2057d5ee1b12cc6f53e4c41a197e7fec
Component: engine
 2018-06-06 18:16:16 -07:00
Sebastiaan van Stijn
bf25aa33ff Merge pull request #37209 from thaJeztah/bump_libnetwork 
bump libnetwork to 3931ba4d815e385ab97093c64477b82f14dadefb
Upstream-commit: 21291e5aefe1f13f3208d57bcc4183848c492bd1
Component: engine
 2018-06-06 13:41:33 -07:00
Anusha Ragunathan
5028541e5c Merge pull request #37192 from thaJeztah/update_miekd_dns 
Update miekg/dns to v1.0.7
Upstream-commit: 9b0b9a0ece532caa806594b5fbc5eef2d6777b10
Component: engine
 2018-06-06 11:24:54 -07:00
GordonTheTurtle
57b10679e6 Merge component 'engine' from git@github.com:docker/engine master 2018-06-06 17:06:45 +00:00