Tonis Tiigi
073d7841b4
Use separate exec-root for test daemons
...
Fixes #21545
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 0d9b94c4c5
2016-03-31 18:35:03 -04:00
Aaron Lehmann
8b0179c771
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>
(cherry picked from commit e42f85080b
2016-03-31 18:35:03 -04:00
Aaron Lehmann
85d1517184
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>
(cherry picked from commit fb5ea0c0ef
2016-03-31 18:35:03 -04:00
Harald Albers
b59dced332
docs for docker daemon --containerd
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 75f0015c50
2016-03-31 18:35:03 -04:00
Brian Trump
89ede3ae23
Fix a link in the volumes doc to the deprecated doc.
...
Signed-off-by: Brian Trump <btrump@opselite.org>
(cherry picked from commit 02f951b67a
2016-03-31 18:35:02 -04:00
Tonis Tiigi
8facb73a8f
Protect aufs mounts with locks
...
Parallel aufs mount calls produce invalid argument error.
Fixes #21545
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 824c24e680
2016-03-31 18:35:02 -04:00
kamjar gerami
c4fa814ecd
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>
(cherry picked from commit a4d4243b91
2016-03-31 18:35:02 -04:00
Harald Albers
e9279d57f7
fix wrong option name in dm.min_free_space examples
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 2623b3496e
2016-03-31 18:35:02 -04:00
Harald Albers
01c531a72e
bash completion for storage option dm.min_free_space
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit eae4e84c66
2016-03-31 18:35:02 -04:00
Robin Naundorf
a17e61c020
Fixes #21538
...
typo corrected
Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de>
(cherry picked from commit a1d6c60ee0
2016-03-31 18:35:02 -04:00
Sebastiaan van Stijn
19b22712c0
docs: add Ubuntu 16.04 "xenial"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 62e7fde80f
2016-03-31 18:35:02 -04:00
Harald Albers
e6629d4c10
docs for labels on build, networks and volumes
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 995e5beda7
2016-03-31 18:35:01 -04:00
Tibor Vass
0c598f34b6
Merge pull request #21680 from thaJeztah/completion-cherry-picks
...
1.11 Bash and Zsh completion cherry picks
2016-03-31 10:55:39 -04:00
Harald Albers
e799da7e6a
bash completion for docker history --human
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit a2dbf7626c
2016-03-30 22:51:55 -07:00
Harald Albers
50552642ca
bash completions: Improve consistency for options with default=true
...
Completion of these options was not handled consistently.
Now all such options immediatly complete with =false appended.
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 39b9b63e36
2016-03-30 22:51:55 -07:00
Harald Albers
474631498c
bash completion for docker {run,create} --security-opt no-new-privileges
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit e96d086afd
2016-03-30 22:51:55 -07:00
Harald Albers
08ccfd36e1
fix bash completion for docker run --security-opt
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 020998e24c
2016-03-30 22:51:55 -07:00
Steve Durrheimer
c3b3f8201a
Add zsh completion for 'docker {create,run} --userns'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 39d7ff233b
2016-03-30 22:51:55 -07:00
Harald Albers
81a3a72727
bash completion for docker {run,create} --userns
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 62475684b9
2016-03-30 22:51:55 -07:00
Steve Durrheimer
70c594508f
Add zsh completion for 'docker daemon --containerd'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 63b29eda68
2016-03-30 22:51:55 -07:00
Harald Albers
1fa9574e2b
bash completion for docker daemon --containerd
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit aeaba46c2c
2016-03-30 22:51:55 -07:00
Steve Durrheimer
4a59dc5a41
Add zsh completion for 'docker {pull,push} --disable-content-trust'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit b0235ffddd
2016-03-30 22:51:55 -07:00
Steve Durrheimer
c4b33d5334
Add zsh completion for etwlogs and gcplogs log drivers
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit ca3ff89e56
2016-03-30 22:51:55 -07:00
Steve Durrheimer
197d61d01a
Add zsh completion for gelf-compression log driver options
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit ff31f166f2
2016-03-30 22:51:55 -07:00
Steve Durrheimer
abe8c11e36
Add zsh completion for 'docker ps --filter' values
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit f3a27a6fac
2016-03-30 22:51:55 -07:00
Steve Durrheimer
08d09e7733
Add zsh completion for 'docker update --restart'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit ca2cca0255
2016-03-30 22:51:55 -07:00
Steve Durrheimer
e23f622d38
Add zsh completion for journald tag opt
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 93ffc2d954
2016-03-30 22:51:54 -07:00
Steve Durrheimer
73f7f515be
Add zsh completion for 'docker {build, volume create, network create} --label'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 5bfd29b9fb
2016-03-30 22:51:54 -07:00
Harald Albers
501b0c387d
bash completion for labels on build, networks and volumes
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit a2958aa18f
2016-03-30 22:51:54 -07:00
Steve Durrheimer
cf1d012fda
Add zsh completion for 'docker load -q --quiet'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit f8009d10bb
2016-03-30 22:51:54 -07:00
Steve Durrheimer
ad37aac45b
Add zsh completion for new fluentd log driver options
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 396ffa2faf
2016-03-30 22:51:54 -07:00
Alexander Morozov
f66010ad31
Merge pull request #21659 from calavera/vendor_engine_api_0.3.2
...
Vendor engine-api v0.3.2 in release 1.11.
2016-03-30 13:35:36 -07:00
David Calavera
34fca93daf
Vendor engine-api v0.3.2 in release 1.11.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-03-30 13:38:17 -04:00
Kenfe-Mickael Laventure
048db1da22
Update the llvm repo to use the debian jessie url
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 73672c5bd8
2016-03-30 13:38:17 -04:00
Tonis Tiigi
e768fc8468
Allow specifying apt mirror in dockerfile
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 8ec8564691
2016-03-30 13:38:16 -04:00
Tibor Vass
31755449e1
Merge pull request #21518 from tiborvass/cherrypicks-1.11.0-rc2
...
Cherrypicks 1.11.0 rc2
2016-03-25 15:09:41 -04:00
Sebastiaan van Stijn
fef9c5b432
Merge pull request #21521 from kencochrane/add_better_unsupported_message_bump
...
[bump_v1.11.0] Added a better message for when we build an unsupported version
2016-03-25 11:13:42 -07:00
Ken Cochrane
519ac1252c
Added a better message for when we build an unsupported version
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
(cherry picked from commit 181d2725d7
2016-03-25 13:59:49 -04:00
Tibor Vass
89276c679e
Fix release scripts
...
Add some missing dependencies in the Dockerfile:
- apt-utils for apt-ftparchive.conf
- bsdmainutils for our use of the column command in
hack/make/generate-index-listing
We also ensure that the docker daemon is started before calling
release-deb or release-rpm, since .detect-daemon-osarch, which is sourced
in each of them, requires the daemon to be running.
This commit also gets completely rid of s3cmd and fixes references to
AWS_* environment variables (changing from AWS_ACCESS_KEY to
AWS_ACCESS_KEY_ID and AWS_SECRET_KEY to AWS_SECRET_ACCESS_KEY) in order
to please awscli. Also AWS_DEFAULT_REGION is now important to specify,
the default has been set to the region used by get.docker.com and
test.docker.com.
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 996138bf8e
2016-03-25 13:43:08 -04:00
Tonis Tiigi
5a71ca6739
Disable privileged test from in user namespace
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit f01e1c865f
2016-03-25 13:43:08 -04:00
Harald Albers
92c9bab6ab
bash completion for new fluentd log driver options
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 06e357da35
2016-03-25 13:43:08 -04:00
Viktor Stanchev
f04334ea04
fix race condition between list and remove volume
...
This was done by making List not populate the cache.
fixes #21403
Signed-off-by: Viktor Stanchev <me@viktorstanchev.com>
(cherry picked from commit 800b9c5a26
2016-03-25 13:43:08 -04:00
Tonis Tiigi
ea799625bd
Fix symlink copying for deb init scripts
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 61277c395b
2016-03-25 13:43:08 -04:00
cyli
3ef31215f4
Revert "Merge pull request #21003 from riyazdf/hardware-signing-ga"
...
This reverts commit e6d3a9849cd3afe34b51dd33d18045
2016-03-25 13:43:08 -04:00
Tonis Tiigi
4b03e857de
Fix wrong variable name on blkio resources
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 8784bd6fde
2016-03-25 13:43:08 -04:00
Tonis Tiigi
c5e8051c81
Fix setting cgroup permission to user/privileged devices
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit ee61235880
2016-03-25 13:43:07 -04:00
David Calavera
6d324b4192
Downgrade to Go 1.5.3.
...
To not hit the issue with the request Host header.
Signed-off-by: David Calavera <david.calavera@gmail.com>
(cherry picked from commit 3e0bd74a3d
2016-03-25 13:43:07 -04:00
Harald Albers
060330bf46
add docs for docker load --quiet
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 610ec8c739
2016-03-25 13:43:07 -04:00
Madhu Venugopal
413155df6e
Add "--ipv6" flag in IT for network create when using ipv6 subnets
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit ec77c124de
2016-03-25 13:43:07 -04:00
Ken Cochrane
48ce060e8c
Packaging changes required for new containerd binaries
...
These are the changes required due to the new binaries that containerd introduced.
The rpm, and deb packages now include 5 binaries.
docker, containerd, containerd-shim, ctr, and runc
The tar files also include all 5 binaries.
Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
(cherry picked from commit bb66d7144f
2016-03-25 13:43:07 -04:00
