a148bf60af
Merge pull request #11 from mlaventure/chp-cli-134
...
Remove stack configs on stack removal
2017-06-05 09:46:13 -07:00
19e7c1efe9
Remove stack configs on stack removal
...
Signed-off-by: John Stephens <johnstep@docker.com >
(cherry picked from commit f05cd11ee2
2017-05-31 11:35:59 -07:00
32807d0a87
Handle a Docker daemon without registry info
...
The current implementation of the ElectAuthServer doesn't handle well when the
default Registry server is not included in the response from the daemon Info
endpoint.
That leads to the storage and usage of the credentials for the default registry
(`https://index.docker.io/v1/ `) under an empty string on the client config file.
Sample config file after a login via a Docker Daemon without Registry
information:
```json
{
"auths": {
"": {
"auth": "***"
}
}
}
```
That can lead to duplication of the password for the default registry and
authentication failures against the default registry if a pull/push is performed
without first authenticating via the misbehaving daemon.
Also, changes the output of the warning message from stdout to sdterr as
per dnephin suggestion.
Signed-off-by: Marcus Martins <marcus@docker.com >
(cherry picked from commit 862649707e
2017-05-31 11:34:01 -07:00
f3810787c8
pass in optional GITCOMMIT override
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
(cherry picked from commit 446af3a9b7
2017-05-24 23:03:09 +00:00
2bcfe6ffc2
bump VERSION files to 17.06.0-ce-rc1
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-05-24 02:24:43 +00:00
0b4548c769
allow version number to be set in builds
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
(cherry picked from commit 3dfe334a7a
2017-05-24 02:21:53 +00:00
6065480cb3
moving opts to cli repo
...
Signed-off-by: Abhinandan Prativadi <abhi@docker.com >
Upstream-commit: 0893ab8560
2017-05-17 21:08:58 -07:00
e4194f2c92
moby vendoring
...
Signed-off-by: Abhinandan Prativadi <abhi@docker.com >
Upstream-commit: 2e07636e5e
2017-05-17 21:08:57 -07:00
dd32a4ed8f
Adding network options to service create/update
...
Changes added to accept network specific options in
docker service create/update
Signed-off-by: Abhinandan Prativadi <abhi@docker.com >
Upstream-commit: 40341ae089
2017-05-17 21:07:48 -07:00
6046962f0a
Merge pull request #49 from aboch/nlo2
...
Add network create flags --scope, --config-only, --config-from
Upstream-commit: d156151ba1
2017-05-17 20:08:23 -07:00
e90e12563c
Vendor moby/moby @4874e0
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: f7415aa953
2017-05-17 19:55:09 -07:00
9b300a1def
Merge pull request #30 from nishanttotla/rename-trust-function
...
Moving docker service digest pinning to client side
Upstream-commit: 74cc280521
2017-05-18 03:05:48 +02:00
d8354ad717
Adding a flag to allow disabling registry lookup
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 39d03bb2bd
2017-05-17 17:55:11 -07:00
fd1d1e23c8
Service create/update set QueryRegistry appropriately
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: c61ea6f789
2017-05-17 17:39:35 -07:00
17199df157
Add support for config-only, config-from and scope options
...
- To promote a network to swarm mode
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: b5e43fb5ec
2017-05-17 17:17:50 -07:00
6ff9bdf996
Merge pull request #80 from AkihiroSuda/adjust-docker-stats
...
[Carry moby/moby#32777 ] Adjusted docker stats memory output
Upstream-commit: 85c2330dfa
2017-05-18 01:55:52 +02:00
621e243582
Merge pull request #101 from jlhawn/update_container_wait
...
Update `run` and `start` to use container wait API
Upstream-commit: b3e7e1ff74
2017-05-18 01:31:40 +02:00
705b40c511
Merge pull request #21 from aduermael/prune-security
...
prune commands : make sure label filters are considered
Upstream-commit: 63ecaf1d4f
2017-05-17 16:23:27 -07:00
6ab9e202e7
Refactor holdHijackedConnection
...
It has been refactored to a hijackedIOStreamer type which has several
methods which are used to prepare input and handle streaming the input
and output separately.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 6eca53c7ae
2017-05-17 15:18:01 -07:00
484d9f1587
Merge pull request #92 from vdemeester/add-codecov
...
Add codecov configuration
Upstream-commit: 8372ae744e
2017-05-17 13:50:03 -07:00
8068ecfd18
make system prune “--filter” flag available only for docker 17.04 (api v1.28) and newer
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com >
Upstream-commit: 1cc1f54d90
2017-05-17 12:36:09 -07:00
dd8e5ae38a
Merge pull request #90 from dnephin/add-windows-autogen
...
Add windows resources to binary
Upstream-commit: b28c4822cc
2017-05-17 11:59:54 -07:00
96f059a410
Update CLI package with containerWait changes
...
The docker/client package was updated to support the updated Container
Wait API functionality. The run and start commands have been updated to
use the new wait features.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 38591f20d0
2017-05-17 11:44:54 -07:00
ed481a9078
Update Vendor
...
Includes updates from docker/docker and imagespec
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 4f9ac4899f
2017-05-17 11:44:54 -07:00
6e96eb3d23
Merge pull request #87 from dnephin/add-watcher
...
Support running unit tests when files are saved
Upstream-commit: 3d655c090a
2017-05-17 10:19:10 -04:00
64cad477fc
Merge pull request #42 from dperny/service-logs-support-details
...
Add support for details on service logs
Upstream-commit: ae1124abad
2017-05-17 10:15:55 -04:00
6ae5b03502
Merge pull request #96 from nishanttotla/vendor-swarmkit
...
Vendor swarmkit 998a47fb9c2b727c8a48d372309af0b3032051e2
Upstream-commit: b3be2a0316
2017-05-17 14:05:19 +02:00
8339d63cee
Merge pull request #95 from dnephin/use-check-redirect
...
Use CheckRedirect so that client behaves the same way with GO 1.8
Upstream-commit: dee8e6ab2d
2017-05-17 10:13:42 +02:00
ba46f33bdd
Add support for details on service logs
...
Adds CLI and client support for details on service logs. CLI component
of moby/moby#32996 .
Signed-off-by: Drew Erny <drew.erny@docker.com >
Upstream-commit: ebc0eff478
2017-05-16 16:53:58 -07:00
fe92c98764
Merge pull request #89 from aaronlehmann/pretty
...
Add --pretty option to "secret inspect" and "config inspect"
Upstream-commit: 5b19f39017
2017-05-17 01:38:10 +02:00
66a0573519
Add --pretty option to "secret inspect" and "config inspect"
...
This adds a pretty template for both inspect subcommands. For configs,
it's particularly useful because it's a way to expose the config payload
in the CLI in a non-base64-encoded way.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 62567078ff
2017-05-16 15:12:20 -07:00
5d9a68e410
Vendor swarmkit 998a47fb9c2b727c8a48d372309af0b3032051e2
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 4ac30da2a9
2017-05-16 15:06:07 -07:00
e78b25ca60
Merge pull request #48 from cyli/root-rotation-cli
...
Synchronous CLI command for root CA rotation
Upstream-commit: c17acee8cf
2017-05-16 14:58:05 -07:00
00f1ab7ba6
Merge pull request #98 from aaronlehmann/logs-padding-underflow
...
service: Avoid underflow in logs padding calculation
Upstream-commit: ebbab14224
2017-05-16 23:36:25 +02:00
d92c450866
Avoid loop when discarding contents of progress pipe
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 51f698337d
2017-05-16 14:34:59 -07:00
37f8c1ed6a
Re-vendor docker/docker.
...
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: 103bfb2739
2017-05-16 14:31:19 -07:00
a87d4d281d
Provide command line tool to view and rotate swarm's currently CA root certificate.
...
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: 3fe8321d0c
2017-05-16 14:31:15 -07:00
ff47f5ac2e
Add support for configs to compose format
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e574286ba2
2017-05-16 17:10:14 -04:00
2e0471b665
Merge pull request #71 from thaJeztah/add-credspec-to-compose
...
add credential-spec to compose
Upstream-commit: 90809f8fd9
2017-05-16 16:45:06 -04:00
497edf6960
service: Avoid underflow in logs padding calculation
...
This command inserts a variable amount of padding in the log line:
padding := strings.Repeat(" ", f.padding-getMaxLength(task.Slot))
If the service is scaled up, or the slot numbers are noncontiguous, the
subtraction can underflow, causing a crash.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: ab6bc5dce6
2017-05-16 12:27:31 -07:00
2112e5a5da
Use CheckRedirect so that client behaves the same way with GO 1.8
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f9ab6a77b0
2017-05-16 11:48:00 -04:00
81a1bf8cf1
Add codecov configuration
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f4b8aec86e
2017-05-16 16:53:35 +02:00
71cfdc53d3
Remove unused windows resourcefiles.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 329f4e29c5
2017-05-15 22:50:33 -04:00
2d89d443c2
Fix float64 comparison in stats_helpers_test.go
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 3c78bc775c
2017-05-16 02:13:00 +00:00
798e7f5d71
Adjusted docker stats memory output
...
Signed-off-by: Sergey Tryuber <Sergeant007@users.noreply.github.com >
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 82600b7021
2017-05-16 02:00:47 +00:00
d7802c7d2b
Add windows resources to binary.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 8a6ad48d2b
2017-05-15 18:03:03 -04:00
473491581d
Support running unit tests when files are saved.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 74c06a140b
2017-05-15 17:02:58 -04:00
54778e28e7
Merge pull request #78 from dnephin/fix-cross-build
...
Fix cross compile build
Upstream-commit: a2225276af
2017-05-15 12:31:34 -07:00
5c35f1a58b
add credential-spec to compose
...
Signed-off-by: Michael Friis <friism@gmail.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 4e7943646b
2017-05-15 15:00:26 -04:00
15f41f0cf9
Merge pull request #82 from vdemeester/opts-from-docker
...
Import `opts` package from moby/moby
Upstream-commit: 36e557f1a3
2017-05-15 11:38:59 -07:00
