docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Code Activity
22,343 Commits 12 Branches 295 Tags
deaa280da06400902feeca461b67084d8372fb49
Commit Graph

2852 Commits

Author SHA1 Message Date
Arnaud Porterie
64d8a74799 Merge pull request #20426 from calavera/remove_channel_close 
Remove channel close.
Upstream-commit: 038c3b82870646cefd8f631c891cd99120cc4109
Component: engine
 2016-02-18 11:13:30 -08:00
David Calavera
7d665cca4e Merge pull request #17513 from aidanhs/aphs-expose-ipv6-default-bridge 
Expose bridge IPv6 setting to `docker network inspect`
Upstream-commit: 2e6c841b826cc73332c44d5a04a5996fc65af724
Component: engine
 2016-02-18 10:35:04 -08:00
David Calavera
b85a054d81 Merge pull request #20447 from cpuguy83/fix_netnone 
Fix net=none w/ TestDaemonNoSpaceleftOnDeviceError
Upstream-commit: 2f283f3cd8204f8e1e1eb9d571e79a263f202e9d
Component: engine
 2016-02-18 10:10:26 -08:00
Brian Goff
4d9228f02f Merge pull request #20442 from cpuguy83/fix_flakey_TestAuthZPluginAllowEventStream 
Fix flakey TestAuthZPluginAllowEventStream
Upstream-commit: e7b25237514917d16b2422404777ec364200917a
Component: engine
 2016-02-18 12:07:20 -05:00
Brian Goff
93243f693c Fix net=none w/ TestDaemonNoSpaceleftOnDeviceError 
Broken by bcb9adf49e6726eccc1ee1ed41fbe21789c2367f

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 8e0e9e0f24e5802709508b7c7fe61cb5171ec414
Component: engine
 2016-02-18 11:34:34 -05:00
Brian Goff
8de4ae7396 Fix flakey TestAuthZPluginAllowEventStream 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 4cf9b725f2117581ac4ba3e6f1db23da090e1732
Component: engine
 2016-02-18 10:19:19 -05:00
David Calavera
f1882e8081 Remove channel close. 
Send a message instead, discarding duplicated messages.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 010951083060e1267e4dd726f5322d7309a8fd62
Component: engine
 2016-02-17 22:52:06 -05:00
David Calavera
1a7ab19790 Merge pull request #20411 from aaronlehmann/strengthen-TestPullFromCentralRegistryImplicitRefParts 
Improve resilience of TestPullFromCentralRegistryImplicitRefParts
Upstream-commit: e9234d8aaf9061beeb9e138efe3d39a86d0ddea7
Component: engine
 2016-02-17 15:08:20 -08:00
Aaron Lehmann
e1d1f67bc5 Improve resilience of TestPullFromCentralRegistryImplicitRefParts 
Sometimes transient network issues will cause
TestPullFromCentralRegistryImplicitRefParts to end up pulling with the
v1 protocol. This violates the assumptions behind the test. To make the
test more robust, allow a few retries if any pull ends up using the v1
protocol.

Fixes #17214

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 884201115315abb0c7815e44e6728e590476aeb8
Component: engine
 2016-02-17 13:08:51 -08:00
Alexander Morozov
9893f97f62 Merge pull request #20406 from aaronlehmann/integration-test-format-string 
Fix format string in TestExecApiCreateContainerPaused
Upstream-commit: 0cc9720c2a5ad97d5261d3754d4f6788d7276c33
Component: engine
 2016-02-17 11:28:42 -08:00
Aaron Lehmann
dfa517e368 Fix format string in TestExecApiCreateContainerPaused 
It was s% instead of %s.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 2210b15e08b8a81bb7c22b34036a5d0336fa04ef
Component: engine
 2016-02-17 11:05:51 -08:00
Antonio Murdaca
be619004aa integration-cli: use Devicemapper test requirement instead of checking strings 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 337ee2aa63d54392321e2603c0f4e4f2f711dbc5
Component: engine
 2016-02-17 18:18:18 +01:00
Phil Estes
83d138a180 Merge pull request #20366 from LK4D4/socks_proxy 
Add support for forwarding Docker client through SOCKS proxy
Upstream-commit: 5c78515430860ad822e016cc5cd5d5ff3dd6a21c
Component: engine
 2016-02-16 22:29:49 -08:00
Michael Crosby
8107240b18 Require linux for TestExecAfterContainerRestart 
All the other exec tests require linux except this one and it is
causing failures in the TP4 test runs.

ref:
https://jenkins.dockerproject.org/job/Docker-PRs-WoW-TP4/1076/console

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 46e41dc2f86e27ef502c2b1a679ab95d0426c8c3
Component: engine
 2016-02-16 17:50:50 -08:00
Alexander Morozov
e9b00fc7ff Merge pull request #20374 from icecrime/20357_test_logs_since_future_follow 
Fix flaky TestLogsSinceFutureFollow
Upstream-commit: eae59c4226bb94027ed0e51c1899479c44a4cc97
Component: engine
 2016-02-16 15:23:19 -08:00
Arnaud Porterie
f97a378357 Fix flaky TestLogsSinceFutureFollow 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 4928121992cbf3f40ec86909526534d90eb6482e
Component: engine
 2016-02-16 13:49:44 -08:00
Tonis Tiigi
8b2acafeee Fix docker import on compressed data 
Fixes #20296

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: e1c2eb0d35460c2de9cbf4a70439afa63b9d2be1
Component: engine
 2016-02-16 11:19:23 -08:00
Alexander Morozov
4f226110ac Add support for forwarding Docker client through SOCKS proxy 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 05002c2501ac549b3cf677ab04d0f571cc456360
Component: engine
 2016-02-16 11:09:28 -08:00
Darren Stahl
6be195136a Sixth set of TestBuild CI Enabling for Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 5fc0de2688da4fbe010980a832d8f73bff4be444
Component: engine
 2016-02-13 20:54:59 -08:00
Antonio Murdaca
05e211a98f Merge pull request #20290 from calavera/fix_stop_signal_merge 
Inherit StopSignal from Dockerfile.
Upstream-commit: 5a9a435d40fb238b627c9e31858b6e31ae38ec53
Component: engine
 2016-02-13 09:26:11 +01:00
Jess Frazelle
98ffe8be11 Merge pull request #20198 from cpuguy83/check_drivers_b4_vol_create 
Check drivers before vol create
Upstream-commit: 79edcc517231e46d1fa9e03081488527143eefae
Component: engine
 2016-02-12 18:41:48 -05:00
Jess Frazelle
1f2b78374a Merge pull request #20278 from aaronlehmann/build-authconfig 
Pass authentication credentials through to build
Upstream-commit: 64a4605892d8bcc43c73948349bcfede14eb8c3a
Component: engine
 2016-02-12 18:37:49 -05:00
David Calavera
663efc4f39 Inherit StopSignal from Dockerfile. 
Make sure the image configuration is not overriden by the default
value in the `create` flag.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: a252516ec19c9c83055a882da894712f2e812ecc
Component: engine
 2016-02-12 17:56:40 -05:00
Aaron Lehmann
5d5044b24f Pass authentication credentials through to build 
In Docker 1.10 and earlier, "docker build" can do a build FROM a private
repository that hasn't yet been pulled. This doesn't work on master. I
bisected this to https://github.com/docker/docker/pull/19414.
AuthConfigs is deserialized from the HTTP request, but not included in
the builder options.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 6fed46aeb97943315aed12f2dc62565f7bcc53dc
Component: engine
 2016-02-12 10:50:16 -08:00
Morgan Bauer
cacd57e1c5 Merge pull request #20261 from tophj-ibm/change-test-to-use-variable 
Change integration test to use declared variable
Upstream-commit: fffff202fcc3dc63f72ce883d728eb5149e9f1ce
Component: engine
 2016-02-12 07:52:51 -08:00
Brian Goff
cf164a7258 Merge pull request #20256 from jfrazelle/make-tests-faster 
make tests faster no apt-key
Upstream-commit: 3723013a1fd5b747b4a059b86fa9e006d35af007
Component: engine
 2016-02-11 22:01:13 -05:00
Christopher Jones
f115ec243c Change integration test to use variable 
Followup to #20246, changes the test to use already declared variable

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: ce1059973a4a46acc272a8c0fea521c96e628ba7
Component: engine
 2016-02-11 21:20:00 -05:00
David Calavera
992182031d Merge pull request #20250 from vieux/fix_misspell 
fix common misspells
Upstream-commit: 5ca6d3bafd0dd53dd26f8251218c68a8016e5ce7
Component: engine
 2016-02-11 17:22:06 -08:00
Jessica Frazelle
748967285d make tests faster no apt-key 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 0d02f2a0118f7647876e1ce5c19874ea0dd06bd8
Component: engine
 2016-02-11 16:28:00 -08:00
David Calavera
5cfbe3cee6 Merge pull request #20246 from tophj-ibm/19368-fix-flaky-network-test 
Fix flaky test, TestDockerNetworkHostModeUngracefulDaemonRestart
Upstream-commit: 46ec01bd125319635b9700c67032ec097e9a25b8
Component: engine
 2016-02-11 15:50:40 -08:00
Victor Vieux
697a990701 fix common misspell 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 99a396902f0ea9d81ef87a683489b2435408f415
Component: engine
 2016-02-11 15:49:36 -08:00
Aidan Hobson Sayers
cfb6f193ab Expose bridge IPv6 setting to docker network inspect 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: dfb00652aa801ecd7fcc3bf492434bd140d9d1ea
Component: engine
 2016-02-11 22:13:47 +00:00
Vincent Demeester
8be99d9bc5 Merge pull request #20218 from icecrime/fix_remote_integration-cli 
Improve remote integration-cli tests
Upstream-commit: 4cdd0403cdaac7e500f3fa6740c43792a6e066a4
Component: engine
 2016-02-11 22:51:20 +01:00
Christopher Jones
6d38af4937 Fix flaky test, TestDockerNetworkHostModeUngracefulDaemonRestart 
Fixes #19368 by waiting until all container statuses are running
before killing the daemon

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 045aee2002e76cbfc9999472fe6e8fc54e0c0085
Component: engine
 2016-02-11 16:47:40 -05:00
Brian Goff
b27ac0630e Merge pull request #20209 from aaronlehmann/upper-case-hostnames 
Allow uppercase characters in image reference hostname
Upstream-commit: acd8baccff10642e1d44a342414cd196b81a4605
Component: engine
 2016-02-11 10:50:05 -05:00
Arnaud Porterie
47f5776cce Improve remote integration-cli tests 
Progress toward being able to run integration-cli campaign using a
client hitting a remote host.

Most of these fixes imply flagging tests that assume they are running on
the same host than the Daemon. Also fixes the `contrib/httpserver` image
that couldn't run because of a dynamically linked Go binary inside the
busybox image.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: a943c401509e7994ae5c574a4b7e23354e44a105
Component: engine
 2016-02-11 07:31:49 -08:00
Brian Goff
91c83926d7 Remove back-compat hacks from for volume plugins. 
Hacks were added as interim support for 1.10 but should not be needed
for 1.11.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 3403a01b07a73defe9f15c30e16ec8dfcab50439
Component: engine
 2016-02-10 20:43:20 -05:00
Brian Goff
13ec79c31c Probe all drivers if volume driver not specified 
This fixes an issue where `docker run -v foo:/bar --volume-driver
<remote driver>` -> daemon restart -> `docker run -v foo:/bar` would
make a `local` volume after the restart instead of using the existing
volume from the remote driver.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 00ec6102d993a752bd8dfb4ee393a4e58e59a4fe
Component: engine
 2016-02-10 20:43:15 -05:00
David Calavera
c35751d5f0 Merge pull request #20170 from Microsoft/10662-TestBuildCI5 
Fifth set of TestBuild CI enables for Windows
Upstream-commit: 9be87be582f1c4539e84385c1ac917418c015cdd
Component: engine
 2016-02-10 16:02:26 -08:00
Aaron Lehmann
176a1e6aa2 Allow uppercase characters in image reference hostname 
This PR makes restores the pre-Docker 1.10 behavior of allowing
uppercase characters in registry hostnames.

Note that this only applies to hostnames, not remote image names.
Previous versions also prohibited uppercase letters after the hostname,
but Docker 1.10 extended this to the hostname itself.

- Vendor updated docker/distribution.

- Add a check to "normalize" that rejects remote names with uppercase
  letters.

- Add test cases to TestTagValidPrefixedRepo and
  TestTagInvalidUnprefixedRepo

Fixes: #20056

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: e2afab9c4a8be800dffee9b60b2197350987543c
Component: engine
 2016-02-10 14:03:41 -08:00
Vincent Demeester
291efe0a93 Merge pull request #19814 from Microsoft/10662-TestBuildCI3 
Third set of TestBuild* CI enabling for Windows
Upstream-commit: ab0102d671d9d531f99e176858ec5b2506bc77e3
Component: engine
 2016-02-10 21:49:39 +01:00
Darren Stahl
104ddcecd2 Fifth set of TestBuild CI enables for Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 0adcce10a1b9373c0926eaee1269f50765a49f02
Component: engine
 2016-02-10 12:37:58 -08:00
Phil Estes
f6ab952c46 Merge pull request #20183 from hypriot/fix-20002-for-multiarch 
Fix TestAuthZPluginAllowEventStream for multiarch
Upstream-commit: 7e44d0ca5872290a9b56c0a381bc370a3ffbc603
Component: engine
 2016-02-10 09:42:35 -05:00
Brian Goff
403bf945a4 Merge pull request #20174 from tophj-ibm/remove-power-from-logrus-tests 
PPC64LE: Remove testing logrus output from ppc64le
Upstream-commit: cfa806378eafd159fce4b1158b215564419680d0
Component: engine
 2016-02-10 09:07:47 -05:00
Stefan Scherer
31c6500d5a Fix TestAuthZPluginAllowEventStream for multiarch 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
Upstream-commit: 36a974a1a6267828b773de19ed298947c66c4945
Component: engine
 2016-02-10 07:28:50 +01:00
Tibor Vass
c88ca91e41 Merge pull request #20135 from vdemeester/20087-fix-since-before-filters 
Fix the since and before filter behavior
Upstream-commit: 61efb4d08487623474d6c21d68b0b34a2117da67
Component: engine
 2016-02-09 21:13:00 -05:00
David Calavera
9394f6b721 Merge pull request #19661 from shishir-a412ed/tests_rootfs_pr 
Tests for PR # 19123: daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart
Upstream-commit: 321f2913241145061088769ab887ec7c27a87c70
Component: engine
 2016-02-09 17:30:48 -08:00
Tibor Vass
6d4102dcb8 Merge pull request #20133 from mlaventure/dont-bind-mount-mqueue 
Prevent mqueue from implicitely becoming a bind mount with --ipc=host
Upstream-commit: 0b4a7fb06d4b77265831cee1508aad9fbeddb7a2
Component: engine
 2016-02-09 19:55:57 -05:00
Darren Stahl
dd3f7fc6e9 Third set of TestBuild* CI enabling for Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 4603a7259e133f5fdcb9e7856ca857338b26dd38
Component: engine
 2016-02-09 15:19:38 -08:00
David Calavera
7d8fc9149c Merge pull request #19985 from Microsoft/CombineSetupWorkingDir 
Combine SetupWorkingDirectory for Linux and Windows
Upstream-commit: d6870238e329e43d2df291a5f82d27929f9a192d
Component: engine
 2016-02-09 15:18:49 -08:00