Commit Graph

22152 Commits

Author SHA1 Message Date
Jess Frazelle fdcce4ac03 Merge pull request #19942 from LK4D4/fix_vet_errors
Fix minor vet warnings
2016-02-03 13:31:11 -08:00
Tibor Vass 7ecba9c668 Merge pull request #19973 from icecrime/cross_platforms_logout
Remove unnecessary call to `/info` endpoint
2016-02-03 16:26:43 -05:00
Alexander Morozov 57025bd588 Merge pull request #19972 from jfrazelle/fix-opensuse
fix opensuse rpm
2016-02-03 13:19:51 -08:00
Arnaud Porterie 243d0d6bbe Remove unnecessary call to /info
Avoid using the `/info` endpoint in the `login` and `logout` workflows
when the Registry endpoint is overriden by the user through the command
line.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-02-03 13:10:25 -08:00
Tonis Tiigi b9a395c85d Remove case sensitive duplicate dir in vendor
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-02-03 13:06:32 -08:00
Tibor Vass 7e236e623b Merge pull request #19975 from aaronlehmann/resolve-auth-config
Introduce a client-side version of resolveAuthConfig
2016-02-03 15:57:29 -05:00
Tibor Vass 3fa0d09e74 Merge pull request #19971 from aaronlehmann/revert-19743
Revert "Set idle timeouts for HTTP reads and writes in communications with the registry"
2016-02-03 15:33:29 -05:00
Vincent Demeester e17f2e7f04 Merge pull request #19976 from mbanikazemi/docs-kuryr
Add Kuryr Network Plugin to the docs
2016-02-03 21:13:48 +01:00
Vincent Demeester 9123a24cc8 Merge pull request #19962 from marsmensch/doc_breaking_formatting_fix
Fix formatting in breaking changes doc
2016-02-03 20:43:52 +01:00
Mohammad Banikazemi 4904210d9c Add Kuryr Network Plugin to the docs
Signed-off-by: Mohammad Banikazemi <mb@us.ibm.com>
2016-02-03 14:21:54 -05:00
Alexander Morozov 3b80b1947c Merge pull request #19943 from aboch/ec
Store endpoint config on network connect to a stopped container
2016-02-03 11:06:35 -08:00
Alexander Morozov bce70cdc2c Merge pull request #18680 from aaronlehmann/duplicate-pull-complete-message
Avoid outputting last progress item twice
2016-02-03 11:01:45 -08:00
Aaron Lehmann ff17cd0bf0 Introduce a client-side version of resolveAuthConfig
This is similar to the version in the registry package, but uses the
daemon's default index (as opposed to the default for the client's
platform) if using the "official index".

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-02-03 11:01:29 -08:00
Jess Frazelle ea28ca4350 Merge pull request #19870 from hqhq/hq_sync_Dockerfile
Sync with Dockerfile
2016-02-03 10:57:36 -08:00
Alexander Morozov 28a7577a02 Merge pull request #19959 from WeiZhang555/fix-cli-print-err
Remove redundant error message
2016-02-03 10:56:19 -08:00
Alexander Morozov 7a20a270bc Fix minor vet warnings
Also use Asserts where it's possible.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-02-03 10:43:01 -08:00
Jessica Frazelle 1cbd772629
fix opensuse rpm
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-03 10:34:17 -08:00
Arnaud Porterie 8ee7ad2209 Enable cross-platforms logout from Registry
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-02-03 10:32:22 -08:00
Florian Maier f0df677913 Fix formatting in breaking changes doc
Signed-off-by: Florian Maier <contact@marsmenschen.com>
2016-02-03 19:22:14 +01:00
Aaron Lehmann cbda80aaff Revert "Set idle timeouts for HTTP reads and writes in communications with the registry"
This reverts commit 84b2162c1a.

The intent of this commit was to set an idle timeout on a HTTP
connection. If a read took more than 60 seconds to complete, or a write
took more than 60 seconds to complete, the connection would be
considered dead.

This doesn't work properly, because the HTTP internals apparently read
from the connection concurrently while writing. An upload that doesn't
complete in 60 seconds leads to a timeout.

Fixes #19967

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-02-03 09:59:56 -08:00
Phil Estes b2c162a0b3 Merge pull request #19966 from twistlock/user_namespace__unnecessary_text_in_error
user namespaces: duplicate dot in user namespaces error message
2016-02-03 12:51:51 -05:00
Phil Estes e3f96b093a Merge pull request #19964 from vdemeester/factor-prefix-and-slash-platform
Add a getPrefixAndSlashFromDaemonPlatform …
2016-02-03 11:16:29 -05:00
Vincent Demeester 98c4f0bbc3 Merge pull request #18966 from mariusGundersen/machine-readable-state
Expose the machine readable state of a container when listing containers
2016-02-03 16:41:45 +01:00
Liron Levin 858f852da4 user namespaces: duplicate dot in user namespaces error message
duplicate dot in user namespaces error message:

$ docker run -ti --net=host ubuntu /bin/bash
docker: Error response from daemon: Cannot share the host or a
container's network namespace when user namespaces are enabled..

Signed-off-by: Liron Levin <liron@twistlock.com>
2016-02-03 16:56:34 +02:00
Vincent Demeester 382c96ee7b Add a getPrefixAndSlashFromDaemonPlatform …
… to limit code duplication in integration tests :P

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-02-03 15:16:00 +01:00
Vincent Demeester bc08203314 Merge pull request #19948 from Microsoft/jjh/testclirm
Windows CI: Port docker_cli_rm_test.go
2016-02-03 15:05:21 +01:00
Felix Geisendörfer 9afdd436cd docs: point out known issue with nginx/vboxfs
see https://github.com/docker/docker/issues/18666

Signed-off-by: Felix Geisendörfer <felix@debuggable.com>
2016-02-03 15:02:48 +01:00
Sebastiaan van Stijn f37e10aee3 Merge pull request #19961 from coolljt0725/check_nil
1.10.0-rc3: Check nil before set resource.OomKillDisable
2016-02-03 14:52:18 +01:00
Zhang Wei 2c63ac3a97 Fix error message for pause a restarting container
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-02-03 21:20:27 +08:00
Sebastiaan van Stijn 0736dba624 Merge pull request #19947 from Microsoft/jjh/testclistart
Windows CI: Port docker_cli_start_test.go
2016-02-03 13:40:55 +01:00
Qiang Huang d8d47f428d Sync with Dockerfile
Add support for seccomp and buildpack-deps, and
updated some commit numbers.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-02-03 12:09:52 +00:00
Sebastiaan van Stijn b75d0929b1 Merge pull request #19914 from coolljt0725/fix_top_restart
Fix docker top a restarting container
2016-02-03 11:28:10 +01:00
Lei Jitang 09a33b5f60 Check nil before set resource.OomKillDisable
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-02-03 04:31:00 -05:00
Vincent Demeester 4ef06e9ef1 Merge pull request #19946 from Microsoft/jjh/stats
Windows: Turn off stats
2016-02-03 09:28:25 +01:00
Vincent Demeester 052e5f222e Merge pull request #19940 from bfirsh/add-1.10-migration-docs
Add 1.10 migration docs
2016-02-03 08:52:17 +01:00
Sebastiaan van Stijn f3263201ab Merge pull request #19951 from icecrime/18546_carry
Carry #18546
2016-02-03 08:51:54 +01:00
Zhang Wei 894266c1bb Remove redundant error message
Currently some commands including `kill`, `pause`, `restart`, `rm`,
`rmi`, `stop`, `unpause`, `udpate`, `wait` will print a lot of error
message on client side, with a lot of redundant messages, this commit is
trying to remove the unuseful and redundant information for user.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-02-03 15:45:20 +08:00
David Calavera d2bc2f081f Merge pull request #19945 from amitkris/master
bump logrus to v0.9.0
2016-02-02 21:10:30 -08:00
Arnaud Porterie fa160753c1 Merge pull request #19954 from Microsoft/jjh/disableclientsetstls
Disable flakey TestClientSetsTLSServerName
2016-02-02 20:09:16 -08:00
John Howard 6b8341a2d5 Disable flakey TestClientSetsTLSServerName
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 19:56:31 -08:00
Arnaud Porterie 2fd35de274 Fix typo
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-02-02 19:07:58 -08:00
Troy Denton 0e14754766 Update networkingcontainers.md
updated line on how to exit the container after the ping test - in my environment (Ubuntu 14.04.1, bash) ctrl-c does not work to exit the shell, and `exit` must be used instead.

Signed-off-by: Troy Denton <Troy.Denton@younessleeptechnologies.com>
2016-02-02 19:05:55 -08:00
John Howard 07fd173225 Windows CI: Port docker_cli_rm_test.go
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 18:43:50 -08:00
John Howard b47749102d Windows CI: Port docker_cli_start_test.go
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 18:23:29 -08:00
Lei Jitang 5566ccb7aa Fix docker top a restarting container
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-02-02 21:05:01 -05:00
John Howard 55268f4e91 Windows: Turn off stats
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 17:59:11 -08:00
Ben Firshman c8f263c73d Add 1.10 migration docs
Originally from https://blog.docker.com/2016/01/docker-1-10-rc/

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-02-02 17:54:33 -08:00
Amit Krishnan 408092e56b bump logrus to v0.9.0
Signed-off-by: Amit Krishnan <amit.krishnan@oracle.com>
2016-02-02 17:53:51 -08:00
Arnaud Porterie 6f88a3d7d3 Merge pull request #19939 from Microsoft/jjh/testcreate
Windows CI: TestCreate* porting
2016-02-02 17:48:43 -08:00
Alessandro Boch 9b63e4e7f5 Store endpoint config on network connect to a stopped container
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-02-02 17:25:44 -08:00