1
0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Commit Graph

20598 Commits

Author SHA1 Message Date
Brian Goff
1a2b70c103 use debian:jessie for ensure-syscall-test
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 7c9e9afeb78ad3265c2ec5d4c6969c0d6182af2b
Component: engine
2016-02-09 13:13:38 -05:00
unclejack
bce1c13026 Dockerfile,contrib,hack: remove buildpack-deps
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 49a45d80f26ceb963a00428522ff485fd9f9afdc
Component: engine
2016-02-04 20:22:34 +02:00
Antonio Murdaca
76c413d163 Merge pull request #19949 from Microsoft/jjh/testapiresize
Windows CI: Port docker_api_resize_test.go
Upstream-commit: 38e774d32caf29155d27aad4fad964b082246a73
Component: engine
2016-02-04 10:11:32 +01:00
John Howard
96b7f387ba Windows CI: Port docker_api_resize_test.go
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 4080ce35e0ffec4703c04e8d9fa0e2def41fddfe
Component: engine
2016-02-03 20:30:06 -08:00
Tibor Vass
e7c326da3c Merge pull request #19702 from tiborvass/host-specific-passthru-token
Add test to make sure the new registry pass-thru token is only sent to the intended hosts
Upstream-commit: 66a4e557f955713adea5c97e42202fdbc0f5c06c
Component: engine
2016-02-03 21:57:32 -05:00
Sebastiaan van Stijn
54169c11ac Merge pull request #19877 from HackToday/fixdoc
Add support details for storage driver
Upstream-commit: a03e85b4482ab741000159f3e911c8729b387cd8
Component: engine
2016-02-04 03:07:15 +01:00
Jess Frazelle
a2042aca33 Merge pull request #19886 from AndrewGuenther/185160-init-socket-fix
Wait to fire start event until socket is created
Upstream-commit: d47812dd1d1de206e29a644e125a0a0f28655c6c
Component: engine
2016-02-03 17:38:52 -08:00
Jess Frazelle
d95ef1e6ea Merge pull request #19952 from WeiZhang555/fix-err-restarting-1
Fix error message for pause a restarting container
Upstream-commit: dcde68b955a8f75119573ec6011cb1b1a9457f60
Component: engine
2016-02-03 17:34:19 -08:00
Tibor Vass
9044b5c3c7 Merge pull request #19979 from mavenugo/gccgoci
Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart
Upstream-commit: f0a58947abceb524044d7aa88aeae61523c0bc9b
Component: engine
2016-02-03 20:33:52 -05:00
Jess Frazelle
8cc70508c1 Merge pull request #19980 from tonistiigi/fix-microsoft-vendor-dir
Remove case sensitive duplicate dir in vendor
Upstream-commit: e74c07b947adf2d6d804068e4a647265e6e419f2
Component: engine
2016-02-03 17:32:14 -08:00
Kai Qiang Wu(Kennan)
bace12bd53 Add support details for storage driver
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: feab8b179e20833dd0a65e58934cf24938da6d84
Component: engine
2016-02-04 00:51:02 +00:00
Jess Frazelle
46199bee06 Merge pull request #19982 from tianon/seccomp-completion
Add some basic bash completion for seccomp values
Upstream-commit: ea4086ea91798d8b860d90eaf32ef216b05f4e7c
Component: engine
2016-02-03 16:15:12 -08:00
Madhu Venugopal
8ebdd00a4c Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 76a765140e831bdd5b7139b86db001ec6872023a
Component: engine
2016-02-03 14:44:55 -08:00
Jess Frazelle
ddb874b792 Merge pull request #19858 from felixge/vboxfs-sendfile-warning
docs: point out known issue with nginx/vboxfs
Upstream-commit: 1ae6da75c8f0c51dc13a632d76f7769a70db36b1
Component: engine
2016-02-03 13:50:34 -08:00
Tianon Gravi
a9dee671aa Add some basic bash completion for seccomp values
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 75aa7dbe4f24cd8ac293f304f0d556c90200eea0
Component: engine
2016-02-03 13:48:34 -08:00
Jess Frazelle
e930e772f5 Merge pull request #19942 from LK4D4/fix_vet_errors
Fix minor vet warnings
Upstream-commit: fdcce4ac0302729be91ff9de670fdb5be1c50b58
Component: engine
2016-02-03 13:31:11 -08:00
Tibor Vass
ef50eb04ca Merge pull request #19973 from icecrime/cross_platforms_logout
Remove unnecessary call to `/info` endpoint
Upstream-commit: 7ecba9c6687ee922b1c77add0c92ad11858de558
Component: engine
2016-02-03 16:26:43 -05:00
Alexander Morozov
05cb58c519 Merge pull request #19972 from jfrazelle/fix-opensuse
fix opensuse rpm
Upstream-commit: 57025bd58821a6972185fb4c0a5559289d769ef6
Component: engine
2016-02-03 13:19:51 -08:00
Arnaud Porterie
6e2fab11f7 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>
Upstream-commit: 243d0d6bbe0376fb43a2718710f31bb068d22168
Component: engine
2016-02-03 13:10:25 -08:00
Tonis Tiigi
f7ee374e15 Remove case sensitive duplicate dir in vendor
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b9a395c85de3f4ea10810c8df789fc67e5b4b604
Component: engine
2016-02-03 13:06:32 -08:00
Tibor Vass
556e3002c9 Merge pull request #19975 from aaronlehmann/resolve-auth-config
Introduce a client-side version of resolveAuthConfig
Upstream-commit: 7e236e623b234616ca8536a0d2e3f96103aa061b
Component: engine
2016-02-03 15:57:29 -05:00
Tibor Vass
d3428a009e Merge pull request #19971 from aaronlehmann/revert-19743
Revert "Set idle timeouts for HTTP reads and writes in communications with the registry"
Upstream-commit: 3fa0d09e74131f4a4dca43a1a28eb014028be62d
Component: engine
2016-02-03 15:33:29 -05:00
Vincent Demeester
a223b8eb7f Merge pull request #19976 from mbanikazemi/docs-kuryr
Add Kuryr Network Plugin to the docs
Upstream-commit: e17f2e7f048153b0d4f3779f9534f9dcee4b04de
Component: engine
2016-02-03 21:13:48 +01:00
Vincent Demeester
d4d13b919a Merge pull request #19962 from marsmensch/doc_breaking_formatting_fix
Fix formatting in breaking changes doc
Upstream-commit: 9123a24cc8218e5222c2c4f4c9153d6971f3d128
Component: engine
2016-02-03 20:43:52 +01:00
Mohammad Banikazemi
01001e4c62 Add Kuryr Network Plugin to the docs
Signed-off-by: Mohammad Banikazemi <mb@us.ibm.com>
Upstream-commit: 4904210d9cd4381363a28ed40ee5cb525948c5f7
Component: engine
2016-02-03 14:21:54 -05:00
Alexander Morozov
3f8eca9ec3 Merge pull request #19943 from aboch/ec
Store endpoint config on network connect to a stopped container
Upstream-commit: 3b80b1947c0f7ac879c4fdf5d6f50e5e3e97d07e
Component: engine
2016-02-03 11:06:35 -08:00
Alexander Morozov
d9ed04ff60 Merge pull request #18680 from aaronlehmann/duplicate-pull-complete-message
Avoid outputting last progress item twice
Upstream-commit: bce70cdc2c4f80e75ca7435e2f3016b904b5c3f2
Component: engine
2016-02-03 11:01:45 -08:00
Aaron Lehmann
9ca2cca984 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>
Upstream-commit: ff17cd0bf07fb8fbd811b3a1bf472d701405b1d1
Component: engine
2016-02-03 11:01:29 -08:00
Jess Frazelle
a2f4392bb3 Merge pull request #19870 from hqhq/hq_sync_Dockerfile
Sync with Dockerfile
Upstream-commit: ea28ca435074f2f756cfd553b172df27a8121e29
Component: engine
2016-02-03 10:57:36 -08:00
Alexander Morozov
5649ae9668 Merge pull request #19959 from WeiZhang555/fix-cli-print-err
Remove redundant error message
Upstream-commit: 28a7577a029780e4533faf3d057ec9f6c7a10948
Component: engine
2016-02-03 10:56:19 -08:00
Alexander Morozov
7eab87efde Fix minor vet warnings
Also use Asserts where it's possible.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 7a20a270bc7ce34c9a6f7cc9eebb38c0bb332b7f
Component: engine
2016-02-03 10:43:01 -08:00
Jessica Frazelle
455910471d fix opensuse rpm
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 1cbd77262987d821a675f51da1213c7bf171e05b
Component: engine
2016-02-03 10:34:17 -08:00
Arnaud Porterie
b8fbe028ea Enable cross-platforms logout from Registry
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 8ee7ad2209502f43496ff65e32fbcd7573b13c26
Component: engine
2016-02-03 10:32:22 -08:00
Florian Maier
0abee8411c Fix formatting in breaking changes doc
Signed-off-by: Florian Maier <contact@marsmenschen.com>
Upstream-commit: f0df677913ce9bc6da5253dcca62690917923a3c
Component: engine
2016-02-03 19:22:14 +01:00
Aaron Lehmann
cc7637793b Revert "Set idle timeouts for HTTP reads and writes in communications with the registry"
This reverts commit 84b2162c1a15256ac09396ad0d75686ea468f40c.

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>
Upstream-commit: cbda80aaff026329a13bb2d0943a4c428251e207
Component: engine
2016-02-03 09:59:56 -08:00
Phil Estes
553379f1b3 Merge pull request #19966 from twistlock/user_namespace__unnecessary_text_in_error
user namespaces: duplicate dot in user namespaces error message
Upstream-commit: b2c162a0b34ac0c5caaa1f30b1a3a7d6844b83a9
Component: engine
2016-02-03 12:51:51 -05:00
Phil Estes
8303acb47b Merge pull request #19964 from vdemeester/factor-prefix-and-slash-platform
Add a getPrefixAndSlashFromDaemonPlatform …
Upstream-commit: e3f96b093a3a19044d2a0d096571f22c1317c8e3
Component: engine
2016-02-03 11:16:29 -05:00
Vincent Demeester
71738b2706 Merge pull request #18966 from mariusGundersen/machine-readable-state
Expose the machine readable state of a container when listing containers
Upstream-commit: 98c4f0bbc3580df2b1dabde513e9aa97362fa3cc
Component: engine
2016-02-03 16:41:45 +01:00
Liron Levin
d672770336 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>
Upstream-commit: 858f852da48a7d075cbc5139356a36ac975bf10f
Component: engine
2016-02-03 16:56:34 +02:00
Vincent Demeester
3e36908d7b Add a getPrefixAndSlashFromDaemonPlatform …
… to limit code duplication in integration tests :P

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 382c96ee7b02f393e7515e4cc4882738398b86a6
Component: engine
2016-02-03 15:16:00 +01:00
Vincent Demeester
7f7ec57612 Merge pull request #19948 from Microsoft/jjh/testclirm
Windows CI: Port docker_cli_rm_test.go
Upstream-commit: bc082033147418c9d2b45dad104f84e8a6d29ae9
Component: engine
2016-02-03 15:05:21 +01:00
Felix Geisendörfer
c22fe80e6f 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>
Upstream-commit: 9afdd436cdb0d13eff8f34026a7f7e4d40cfda53
Component: engine
2016-02-03 15:02:48 +01:00
Sebastiaan van Stijn
3d7b972d74 Merge pull request #19961 from coolljt0725/check_nil
1.10.0-rc3: Check nil before set resource.OomKillDisable
Upstream-commit: f37e10aee3e23f60bc3d964dd9004c371d8f1371
Component: engine
2016-02-03 14:52:18 +01:00
Zhang Wei
083b040a59 Fix error message for pause a restarting container
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 2c63ac3a974a7ab56ffeddece76cc29710ef2996
Component: engine
2016-02-03 21:20:27 +08:00
Sebastiaan van Stijn
e9b0659a70 Merge pull request #19947 from Microsoft/jjh/testclistart
Windows CI: Port docker_cli_start_test.go
Upstream-commit: 0736dba624e616d8b8af26f03ea1a438535e8dc1
Component: engine
2016-02-03 13:40:55 +01:00
Qiang Huang
27af1fc1fb Sync with Dockerfile
Add support for seccomp and buildpack-deps, and
updated some commit numbers.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: d8d47f428d3a37dd758e3bd714024f6be4df3707
Component: engine
2016-02-03 12:09:52 +00:00
Sebastiaan van Stijn
c0abf32b68 Merge pull request #19914 from coolljt0725/fix_top_restart
Fix docker top a restarting container
Upstream-commit: b75d0929b1df1481a928531102531a38f143ad49
Component: engine
2016-02-03 11:28:10 +01:00
Lei Jitang
fc2d98659e Check nil before set resource.OomKillDisable
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 09a33b5f60557ee3846baa48f5628bc6b8a70a9b
Component: engine
2016-02-03 04:31:00 -05:00
Vincent Demeester
5f2192d684 Merge pull request #19946 from Microsoft/jjh/stats
Windows: Turn off stats
Upstream-commit: 4ef06e9ef18e7538c71818175d3228ba65c00b64
Component: engine
2016-02-03 09:28:25 +01:00
Vincent Demeester
90f951a226 Merge pull request #19940 from bfirsh/add-1.10-migration-docs
Add 1.10 migration docs
Upstream-commit: 052e5f222e5c422b31160255b499a298b9b89898
Component: engine
2016-02-03 08:52:17 +01:00