1b8b63be5c
Merge pull request #126 from marcusmartins/handle_empty_registry_info
...
Handle a Docker daemon without registry info
2017-05-26 15:32:09 -07:00
862649707e
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>
2017-05-26 14:46:39 -07:00
d5b505ee8c
Only set default aliases when the network is user defined.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-26 14:25:20 -04:00
341703d21e
Add tests for verifyExternalNetwork
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-26 12:21:04 -04:00
123f0bfd98
With the introduction of node-local network support, docker services can
...
be attached to special networks such as host and bridge. This fix brings
in the required changes to make sure the stack file accepts these
networks as well.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2017-05-25 19:50:08 -07:00
11e7d35f9c
Merge pull request #127 from andrewhsu/gitcommit
...
allow override of git hash when building binary
2017-05-24 15:57:02 -07:00
446af3a9b7
pass in optional GITCOMMIT override
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-05-24 22:45:42 +00:00
61c0b9f78d
Merge pull request #102 from keloyang/attach-block
...
Recheck the container's state to avoid attach block.
2017-05-24 12:09:38 +01:00
5981675d5f
Update go-winio to v0.4.1
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-05-23 11:11:43 -07:00
e47cc91ac9
Merge pull request #109 from vdemeester/codecov-in-circle
...
Add test-coverage & codecov target and update circleci
2017-05-23 11:59:05 -04:00
28eb46de56
Merge pull request #119 from andrewhsu/ver
...
allow version number to be set in builds
2017-05-22 18:16:41 -07:00
3dfe334a7a
allow version number to be set in builds
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-05-22 13:22:42 -07:00
70a9905ee5
Spelling fixes
...
* appropriate
* assumption
* attach
* because
* building
* customized
* mapping
* propagated
Signed-off-by: Josh Soref <jsoref@gmail.com>
2017-05-22 01:39:06 +00:00
f9dc3337f9
Recheck the container's state to avoid attach block.
...
If use docker attach command to attach to a stop container, it will return
"You cannot attach to a stopped container" error, it's ok, but when
attach to a running container, it(docker attach) use inspect to check
the container's state, if it pass the state check on the client side,
and then the container is stopped, docker attach command still attach to
the container and not exit.
Signed-off-by: Shukui Yang <yangshukui@huawei.com>
2017-05-20 08:02:06 +08:00
f6d148c632
Upload coverage report from outside of test container.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-19 17:37:38 -04:00
d79d903864
Add test-coverage & codecov target and update circleci
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-05-19 17:22:37 -04:00
883d28cfce
Merge pull request #106 from dnephin/improve-makefile
...
Remove @ from Makefiles
2017-05-19 16:03:04 -04:00
1fc7eb5d64
Merge pull request #104 from dnephin/add-ppc64le-to-cross
...
Add ppc64le to cross
2017-05-19 08:02:01 -07:00
46049dd0b6
Enabled linux/ppc64le cross build.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-18 13:07:26 -04:00
eea4a38cd6
Merge pull request #77 from vdemeester/move-duration-opts
...
Move duration opts into an opts package
2017-05-18 11:15:30 +02:00
3dfb8343b1
Merge pull request #62 from abhinandanpb/master
...
Adding network specific option in csv format for service create/update
2017-05-17 21:17:23 -07:00
0893ab8560
moving opts to cli repo
...
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-05-17 21:08:58 -07:00
2e07636e5e
moby vendoring
...
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-05-17 21:08:57 -07:00
40341ae089
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>
2017-05-17 21:07:48 -07:00
d156151ba1
Merge pull request #49 from aboch/nlo2
...
Add network create flags --scope, --config-only, --config-from
2017-05-17 20:08:23 -07:00
f7415aa953
Vendor moby/moby @4874e0
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-05-17 19:55:09 -07:00
74cc280521
Merge pull request #30 from nishanttotla/rename-trust-function
...
Moving docker service digest pinning to client side
2017-05-18 03:05:48 +02:00
39d03bb2bd
Adding a flag to allow disabling registry lookup
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2017-05-17 17:55:11 -07:00
c61ea6f789
Service create/update set QueryRegistry appropriately
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2017-05-17 17:39:35 -07:00
b5e43fb5ec
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>
2017-05-17 17:17:50 -07:00
85c2330dfa
Merge pull request #80 from AkihiroSuda/adjust-docker-stats
...
[Carry moby/moby#32777 ] Adjusted docker stats memory output
2017-05-18 01:55:52 +02:00
b3e7e1ff74
Merge pull request #101 from jlhawn/update_container_wait
...
Update `run` and `start` to use container wait API
2017-05-18 01:31:40 +02:00
63ecaf1d4f
Merge pull request #21 from aduermael/prune-security
...
prune commands : make sure label filters are considered
2017-05-17 16:23:27 -07:00
6eca53c7ae
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)
2017-05-17 15:18:01 -07:00
8372ae744e
Merge pull request #92 from vdemeester/add-codecov
...
Add codecov configuration
2017-05-17 13:50:03 -07:00
73ebb07df5
Remove @ from Makefiles.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-17 15:56:19 -04:00
1cc1f54d90
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>
2017-05-17 12:36:09 -07:00
b28c4822cc
Merge pull request #90 from dnephin/add-windows-autogen
...
Add windows resources to binary
2017-05-17 11:59:54 -07:00
38591f20d0
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)
2017-05-17 11:44:54 -07:00
4f9ac4899f
Update Vendor
...
Includes updates from docker/docker and imagespec
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2017-05-17 11:44:54 -07:00
3d655c090a
Merge pull request #87 from dnephin/add-watcher
...
Support running unit tests when files are saved
2017-05-17 10:19:10 -04:00
ae1124abad
Merge pull request #42 from dperny/service-logs-support-details
...
Add support for details on service logs
2017-05-17 10:15:55 -04:00
b3be2a0316
Merge pull request #96 from nishanttotla/vendor-swarmkit
...
Vendor swarmkit 998a47fb9c2b727c8a48d372309af0b3032051e2
2017-05-17 14:05:19 +02:00
dee8e6ab2d
Merge pull request #95 from dnephin/use-check-redirect
...
Use CheckRedirect so that client behaves the same way with GO 1.8
2017-05-17 10:13:42 +02:00
ebc0eff478
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>
2017-05-16 16:53:58 -07:00
5b19f39017
Merge pull request #89 from aaronlehmann/pretty
...
Add --pretty option to "secret inspect" and "config inspect"
2017-05-17 01:38:10 +02:00
62567078ff
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>
2017-05-16 15:12:20 -07:00
4ac30da2a9
Vendor swarmkit 998a47fb9c2b727c8a48d372309af0b3032051e2
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2017-05-16 15:06:07 -07:00
c17acee8cf
Merge pull request #48 from cyli/root-rotation-cli
...
Synchronous CLI command for root CA rotation
2017-05-16 14:58:05 -07:00
ebbab14224
Merge pull request #98 from aaronlehmann/logs-padding-underflow
...
service: Avoid underflow in logs padding calculation
2017-05-16 23:36:25 +02:00
Aaron Lehmann
Marcus Martins
Daniel Nephin
Madhu Venugopal
Tibor Vass
Andrew Hsu
Sebastiaan van Stijn
Darren Stahl
Daniel Nephin
Kenfe-Mickaël Laventure
Josh Soref
Shukui Yang
Vincent Demeester
Abhinandan Prativadi
Alessandro Boch
Nishant Totla
Josh Hawn
Gaetan de Villele
John Stephens
Brian Goff
Vincent Demeester
Drew Erny