Aaron Lehmann
e42f85080b
Correct login debug log message
...
I noticed the following message in a daemon log:
```
attempting v2 login to registry endpoint {%!s(bool=false) https://registry:5000 v2 %!s(bool=false) %!s(bool=true) %!s(*tls.Config=&{<nil> <nil> [] map[] <nil> 0xc82075c030 [] 0 <nil> false [49196 49200 49195 49199 49162 49161 49172 49171 53 47] true false [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0] <nil> 769 0 [] {{0 0} 0} {{0 0} 0 0 0 0} []})}
```
loginV2 tries to log an APIEndpoint as a string, but this struct does
not have a String method. Log the actual URL that will be used as the
endpoint, instead.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2016-03-28 18:22:24 -07:00
Nishant Totla
0ebb26bdd4
Printing engine version in Info
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
2016-03-28 17:40:50 -07:00
Joffrey F
7116aefe43
Fix assert_hostname logic in tls_config_from_options
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2016-03-28 17:39:20 -07:00
Tonis Tiigi
0d9b94c4c5
Use separate exec-root for test daemons
...
Fixes #21545
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-03-28 17:38:14 -07:00
Maksim Malchuk
f2acfa9492
Correct error handling for external SSH client
...
In some cases, (e.g. private key not accessible or has incorrect
permissions) docker-machine failed with error "Something went wrong
running an SSH command!". This commit will add the correct debug
messages and show the correct errors for the bad private keys.
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com >
2016-03-29 03:32:00 +03:00
Aaron Lehmann
fb5ea0c0ef
Mention "docker login" in push/pull documentation
...
It was suggested to me that documentation for "docker pull" and "docker
push" should reference "docker login", to make clearer how to specify
credentials for a push or pull operation. Add a note to the manual pages
and reference documentation explaining how registry credentials are
managed.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2016-03-28 17:22:41 -07:00
Michael Crosby
051c5ddadc
Merge pull request #21552 from tonistiigi/aufs-mount-locks
...
Protect aufs mounts with locks
2016-03-28 17:00:43 -07:00
Brian Trump
02f951b67a
Fix a link in the volumes doc to the deprecated doc.
...
Signed-off-by: Brian Trump <btrump@opselite.org >
2016-03-28 16:55:24 -07:00
Sebastiaan van Stijn
1e1da2a29b
Merge pull request #21582 from kamigerami/fixes-21581-no--subnetwork-option-as-specified-in-docs-for-work-with-networks.md
...
fixes-#21581-no--subnetwork-option-as-specified-in-docs
2016-03-28 16:25:52 -07:00
Tõnis Tiigi
553edd1d19
Merge pull request #21251 from cyphar/refactor-copyonbuild
...
pkg: archive: don't fail Untar if xattrs are not supported
2016-03-28 16:15:18 -07:00
HuKeping
0a60261fab
Use constant for root role
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2016-03-29 07:08:23 +08:00
HuKeping
ddff581bd8
Use constant for targets role
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2016-03-29 07:08:16 +08:00
Alessandro Boch
16bf3eede0
Vendoring boltb/bolt v1.2.0
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2016-03-28 15:49:41 -07:00
Dongluo Chen
c567e4e675
Merge pull request #1987 from allencloud/log-error-when-getting-swarm-kernel-and-os-info
...
handle error when getting kernel and os info error
2016-03-28 15:44:43 -07:00
David Calavera
d7382c1fa3
Merge pull request #21577 from albers/completion-dm.min_free_space
...
bash completion for `dm.min_free_space`
2016-03-28 15:42:21 -07:00
Tiago Pires
a6f19ef936
FIX #3141 Refactor netstat command and tests
...
Updated `netstat` command to minimize its output with `-t` and `-l`
flags.
Refactored regex on `libmachine/provision/utils.go`:`checkDaemonUp` to
avoid `matchNetstatOut` returning `true` when remote machine has a
similar port to dockerPort listening (e.g. dockerPort := 2376 and
remote machine has port 23760 listening).
Refactored `utils_test.go` with more accurate `netstat` output.
Signed-off-by: Tiago Pires <tandrepires@gmail.com >
2016-03-28 23:29:26 +01:00
Victor Vieux
d848e92b93
Merge pull request #2041 from vieux/update_dockerclient
...
update dockerclient to get labels on volumes, networks, etc...
2016-03-28 15:27:29 -07:00
Arnaud Porterie
121b78c27d
Merge pull request #21590 from tonistiigi/apt-mirror
...
Allow specifying apt mirror in dockerfile
2016-03-28 15:08:40 -07:00
Riyaz Faizullabhoy
8d18e6b30f
move hardware signing out of experimental, remove dependencies to yubico-piv-tool
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-03-28 14:33:06 -07:00
Olivier Gambier
60b9f1756d
Merge pull request #1570 from RichardScothern/version
...
Rev base version to 2.4.0
2016-03-28 13:56:24 -07:00
Richard Scothern
1ea9a3638d
Rev base version to 2.4.0
...
Now that we've tagged a release candidate, we can now say all builds are
"2.4.0+unknown" if the makefile is not used.
Signed-off-by: Richard Scothern <richard.scothern@docker.com >
2016-03-28 13:54:28 -07:00
Tonis Tiigi
8ec8564691
Allow specifying apt mirror in dockerfile
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-03-28 13:47:28 -07:00
Tomasz Kopczynski
555d8cb293
Dockerignore tests
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl >
2016-03-28 22:31:35 +02:00
David Calavera
f0d26e1665
Remove runconfig package dependency from image and container routers.
...
Use an interface to specify the behavior of a configuration decoder.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2016-03-28 16:23:51 -04:00
David Calavera
3ca29823d4
Remove runconfig dependency from network routes.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2016-03-28 16:23:50 -04:00
David Calavera
be390c30cd
Merge pull request #21523 from LK4D4/cancellable_routes
...
Embed context.Context to routes with usage of CloseNotify
2016-03-28 12:44:07 -07:00
John Howard
ff3525c80f
Windows: bridgeConfig rework
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2016-03-28 12:24:01 -07:00
Christopher Jones
3e3ac8abea
ppc64le: bump golang back to 1.6
...
Despite the current issue with unix sockets and golang, I'm bumping this back up to 1.6.
Go <1.6 has major compatibility issues on ppc64* including not supporting dynamic binding,
so we would have to go back to gccgo, which is worse in a lot of other categories. Ultimately for us,
the amount of people affected by this issue isn't worth switching compilers.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
2016-03-28 15:10:42 -04:00
Nathan LeClaire
0d58079bf5
Merge pull request #3233 from AndreLouisCaron/env-silent-in-cmd
...
Silences docker-machine env command on Windows.
2016-03-28 11:55:39 -07:00
David Calavera
cf91a1be45
Merge pull request #21553 from tonistiigi/test-repeat
...
Add support for repeating integration tests
2016-03-28 11:39:22 -07:00
David Calavera
dd7691423f
Merge pull request #21566 from allencloud/upper-case-docker-info-display
...
upper case docker info details
2016-03-28 11:37:23 -07:00
David Calavera
dd757deae0
Merge pull request #21556 from twistlock/basic_authn_client_cert
...
Extend Docker authorization with TLS user information
2016-03-28 11:36:02 -07:00
David Calavera
d48b1c6de5
Merge pull request #21579 from albers/completion-run--userns
...
bash completion for `docker {run,create} --userns`
2016-03-28 11:31:55 -07:00
David Calavera
22ca91b084
Merge pull request #21580 from sdurrheimer/zsh-completion-create-run-userns
...
Add zsh completion for 'docker {create,run} --userns'
2016-03-28 11:31:39 -07:00
David Calavera
20ab670090
Merge pull request #21584 from albers/completion-fix--security-opt
...
fix bash completion for `docker run --security-opt`
2016-03-28 11:29:31 -07:00
Tõnis Tiigi
3b39363495
Merge pull request #21578 from VorT3x/master
...
Fix misspellings
2016-03-28 10:47:11 -07:00
Richard Scothern
72ec74834b
Merge pull request #1569 from GameScripting/patch-1
...
added heading to get more focus into the headers that need to be set
2016-03-28 10:34:48 -07:00
Nathan LeClaire
5d6d325ec4
Bump to 1.11.0-rc2
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2016-03-28 10:13:40 -07:00
Daniel Huhn
321e0420bf
added heading to get more focus into the headers that need to be set
...
Signed-off-by: Daniel Huhn <daniel@danielhuhn.de >
2016-03-28 18:07:03 +02:00
Harald Albers
020998e24c
fix bash completion for docker run --security-opt
...
Signed-off-by: Harald Albers <github@albersweb.de >
2016-03-28 08:07:28 -07:00
kamjar gerami
a4d4243b91
fixes-#21581-no--subnetwork-option-as-specified-in-docs-for-work-with-networks.md: fixed typo in docs
...
Signed-off-by: kamjar gerami <kami.gerami@gmail.com >
2016-03-28 17:02:27 +02:00
Shishir Mahajan
b16decfccf
CLI flag for docker create(run) to change block device size.
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
2016-03-28 10:05:18 -04:00
Harald Albers
62475684b9
bash completion for docker {run,create} --userns
...
Signed-off-by: Harald Albers <github@albersweb.de >
2016-03-28 06:47:33 -07:00
Steve Durrheimer
39d7ff233b
Add zsh completion for 'docker {create,run} --userns'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
2016-03-28 15:39:27 +02:00
Yong Tang
270562f439
Update vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9.
...
This PR updates vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9
in order to support `SecurityOptions` in `Info`.
See #20909 , #21172 for details related to `SecurityOptions`.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
2016-03-28 13:38:15 +00:00
Dmitri Logvinenko
6dede879fd
Fix misspellings
...
Signed-off-by: Dmitri Logvinenko <dmitri.logvinenko@gmail.com >
2016-03-28 16:21:02 +03:00
Lei Jitang
35986d4824
Merge pull request #21575 from sdurrheimer/zsh-completion-daemon-containerd
...
Add zsh completion for 'docker daemon --containerd'
2016-03-28 20:46:39 +08:00
Steve Durrheimer
63b29eda68
Add zsh completion for 'docker daemon --containerd'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
2016-03-28 14:40:56 +02:00
Harald Albers
75f0015c50
docs for docker daemon --containerd
...
Signed-off-by: Harald Albers <github@albersweb.de >
2016-03-28 05:40:27 -07:00
Harald Albers
2623b3496e
fix wrong option name in dm.min_free_space examples
...
Signed-off-by: Harald Albers <github@albersweb.de >
2016-03-28 05:20:06 -07:00