toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,449 Commits 3 Branches 295 Tags
6f56735237c2bb32203683717b387c8c8800c3bf
Commit Graph
38449 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Hsu 6f56735237 Merge pull request #266 from johnstep/windows-manifest-lists 
[17.10] Backport version fix for Windows manifest lists
 2017-10-11 16:08:09 -07:00
Andrew Hsu e274827392 Merge pull request #267 from seemethere/cherry_pick_cli_607 
[17.10] Mutate image references where needed for trusted pulls
 2017-10-11 16:03:47 -07:00
Andrew Hsu fc8971da3b Merge pull request #265 from andrewhsu/olay 
[17.10] Fallback to use naive diff driver if enable CONFIG_OVERLAY_FS_REDIREC…
 2017-10-11 10:49:01 -07:00
Daniel Nephin 9f566ba32b Update e2e test for image pull to check stdout 
Also add TEST_DEBUG env variable for debugging E2E tests.
And change icmd environment helpers to fit the CmdOp interface os they
can be passed to 'icmd.RunCmd()'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit b11c11ea74)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2017-10-11 10:47:45 -07:00
Daniel Nephin 785d4378ad Refactor runPull to remove second GetImageReferencesAndAuth 
Fix unit tests to catch the regression.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit e548861481)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2017-10-11 10:47:45 -07:00
Riyaz Faizullabhoy e9a538eda6 factor out rigging for pushing unsigned busybox image 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
(cherry picked from commit 7dda6fc3c9)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2017-10-11 10:47:45 -07:00
Riyaz Faizullabhoy cdee6d83f4 update image pull tests 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
(cherry picked from commit 46f3d8bb7f)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2017-10-11 10:47:45 -07:00
Daniel Nephin c76d10969f get e2e working with notary service 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit ade675d36c)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2017-10-11 10:47:45 -07:00
Riyaz Faizullabhoy 02f6ddc6ae trust: update references when pulling 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
(cherry picked from commit 067fff8b03)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2017-10-11 10:47:45 -07:00
Riyaz Faizullabhoy 125ffb8b1b update e2e tests for content trust tests 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
(cherry picked from commit 6e3bafd06b)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2017-10-11 10:47:45 -07:00
Andrew Hsu 9c61899f29 Merge pull request #264 from andrewhsu/v 
[17.10] re-vndr libnetwork to 6c51292 and swarmkit to 872861d
 2017-10-11 10:46:00 -07:00
John Stephens 76922d8690 Stop filtering Windows manifest lists by version 
Signed-off-by: John Stephens <johnstep@docker.com>
(cherry picked from commit 8ed8f4a71d7e1a936fa077b4348b7375c81746a6)

Conflicts:
	components/engine/distribution/pull_v2_windows.go

Signed-off-by: John Stephens <johnstep@docker.com>
 2017-10-10 21:42:19 -07:00
Derek McGowan f437cf754f Add support for Windows version filtering on pull 
Update logic to choose manifest from manifest list to check
for os version on Windows. Separate the logic for windows
and unix to keep unix logic the same.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
(cherry picked from commit 38aef56e1fcb8ea318df98c89cf002267b88a136)
Signed-off-by: John Stephens <johnstep@docker.com>
 2017-10-10 21:10:00 -07:00
Lei Jitang 2adb51e303 Fallback to use naive diff driver if enable CONFIG_OVERLAY_FS_REDIRECT_DIR 
When use overlay2 as the graphdriver and the kernel enable
`CONFIG_OVERLAY_FS_REDIRECT_DIR=y`, rename a dir in lower layer
will has a xattr to redirct its dir to source dir. This make the
image layer unportable. This patch fallback to use naive diff driver
when kernel enable CONFIG_OVERLAY_FS_REDIRECT_DIR

Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit 49c3a7c4bac2877265ef8c4eaf210159560f08b4)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-10-10 20:56:55 -07:00
Abhinandan Prativadi a761ee3d4d Modifying swarm integration test 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
(cherry picked from commit 7e6b2165ef58e68ad4eafd457e8de89dd4c2c6b1)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-10-10 18:59:32 -07:00
Andrew Hsu e1484d2ff8 re-vndr swarmkit to 872861d 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-10-10 17:50:47 -07:00
Andrew Hsu d82f9fe3f3 re-vndr libnetwork to 6c51292 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-10-10 17:19:58 -07:00
Andrew Hsu 73ecdcee10 Merge pull request #263 from seemethere/change_ubuntu_trusty_package_mirror 
Switches ubuntu trusty mirror to one that works
 2017-10-10 10:24:53 -07:00
Eli Uriegas c8e9afef61 Switches ubuntu trusty mirror to one that works 
Was getting 404's with the old one, consider this one temporary until
canonical fixes their stuff.

Related:
https://bugs.launchpad.net/cloud-images/+bug/1711735

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 8e177368d0a30614a7ba615f3c2f2ede1e21ff8e)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2017-10-10 10:22:06 -07:00
Andrew Hsu d866876d86 Merge pull request #259 from andrewhsu/v 
[17.10] bump version to 17.10.0-ce-rc1
v17.10.0-ce-rc1 		2017-10-04 14:11:32 -07:00
Andrew Hsu 8ab000a5f4 Merge pull request #256 from vieux/17.10-changelog 
[17.10] add 17.10 changelog
 2017-10-04 14:08:52 -07:00
Andrew Hsu c8ede6fcc6 Merge pull request #260 from seemethere/fix_tests_for_1710_release 
[17.10] Fix tests for 17.10 release
 2017-10-04 14:07:13 -07:00
Christopher Jones 0d46b8e710 [integration-cli] fix s390x flaky test 
s390x node-1 has kernel 4.6.0, kernel.CompareKernelVersion()
returns 0 if the kernels are equal, so include that.

Full logic for CompareKernelVersion() is
a > b ret 1,
a == b ret 0,
a < b ret -1

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
(cherry picked from commit aa5ea652c8864f014e1fa480d7e504f0d742c170)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2017-10-04 13:11:31 -07:00
Eli Uriegas 58f592c0d9 Add note to test changes for rmi 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2017-10-04 10:43:27 -07:00
Corbin e58d3abea8 Switch from using lstat to stat in docker cp test. Use the first 12 characters of the ID for the stats test substring. 
Signed-off-by: Corbin <corbin.coleman@docker.com>
 2017-10-03 14:02:17 -07:00
Eli Uriegas 4f818dd6f7 Add detach flag for scale tests 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2017-09-30 13:23:18 -07:00
Eli Uriegas d73806305a Changes error check form NotNil to IsNil 
rmi -f always returns a 0 exit code so these tests needed to be changed
accordingly.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 5d1587e61e)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2017-09-30 13:23:18 -07:00
Eli Uriegas 4e81e4fa4e Blacklist tests, will be rewritten later on 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2017-09-30 13:23:18 -07:00
Andrew Hsu 8a6c4c93b6 Merge pull request #261 from seemethere/ensure_channel 
[17.10] ensure channel is allocated
 2017-09-30 09:36:10 -07:00
Stephen J Day 7b99808cac cli/command/container: ensure channel is allocated 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
(cherry picked from commit e78772af4d)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2017-09-29 18:14:51 -07:00
Andrew Hsu fab4b40e38 bump version to 17.10.0-ce-rc1 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-09-29 16:12:03 -07:00
Andrew Hsu 079f5eb5e5 removed deprecation line 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-09-29 15:56:26 -07:00
Andrew Hsu db0a220cda update punctuation and spacing 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-09-29 15:47:47 -07:00
Victor Vieux 71bb1e8c44 add 17.10 changelog 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-09-29 15:47:47 -07:00
Andrew Hsu 328a5917ad Merge component 'engine' from git@github.com:moby/moby master 2017-09-29 22:30:27 +00:00
Andrew Hsu 09bc512154 Merge component 'cli' from git@github.com:docker/cli master 2017-09-29 22:08:57 +00:00
Sebastiaan van Stijn 4b8b813d22 Merge pull request #570 from thaJeztah/bump-moby-vendor 
Bump moby vendor to 14ce1f1cf48e9859223c6311de58aec4dc
Upstream-commit: 31908a4b45
Component: cli
 2017-09-29 23:08:16 +02:00
Victor Vieux 0e6592d05e Merge pull request #572 from thaJeztah/bump-vendor-for-powerpc 
revendor logrus and x/crypto
Upstream-commit: 00cc728dfb
Component: cli
 2017-09-29 13:58:38 -07:00
Tõnis Tiigi 4c4e74cebe Merge pull request #35042 from pradipd/panic_fix 
Fixing panic when sandbox is nil
Upstream-commit: ab2b03a0e139537376bbf66c1e1e9e897a403f06
Component: engine
 2017-09-29 12:51:55 -07:00
Pradip Dhara 28e35b96d0 Fixing panic when sandbox is nil 
Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
Upstream-commit: c4ad0747e929a41ecec7e8c2ae2bd0cc037401ed
Component: engine
 2017-09-29 09:23:06 -07:00
Sebastiaan van Stijn c9fbb737e9 Fixes for updated dependencies 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0082310aa5
Component: cli
 2017-09-29 17:45:31 +02:00
Sebastiaan van Stijn c9e8020d97 bump moby/moby and dependencies to 14ce1f1cf48e9859223c6311de58aec4dc0f046c 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 98dbfeee76
Component: cli
 2017-09-29 17:44:49 +02:00
Sebastiaan van Stijn 0b195d3e47 Merge pull request #571 from thaJeztah/bump-vndr 
Bump vndr to a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384
Upstream-commit: 107f6c6ab2
Component: cli
 2017-09-29 17:39:21 +02:00
Sebastiaan van Stijn 6230f06c47 revendor logrus and x/crypto 
updates to the same version as is currently used
on moby/moby; this bump contains fixes for ppc64le.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e3b7700fb9
Component: cli
 2017-09-29 15:32:42 +02:00
Sebastiaan van Stijn 5edb9ec08c Bump vndr to a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384 
Includes a fix to cleanup unused vendor-directories

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 368b639e7e
Component: cli
 2017-09-29 14:58:05 +02:00
Akihiro Suda 907b966c7e Merge pull request #35029 from fntlnz/builder/cleaning 
Cleaning dead code out of the builder
Upstream-commit: de6cb7ab848d6131634e40d21d30bf2fe183e9a3
Component: engine
 2017-09-29 16:28:02 +09:00
Lorenzo Fontana 4034b44eca Cleaning dead code out of the builder 
Signed-off-by: Lorenzo Fontana <lo@linux.com>
Upstream-commit: dff2a23749a6b7c949146d7850f514cd74e3a8d7
Component: engine
 2017-09-29 02:55:35 +02:00
Yong Tang 80c3ad8db1 Merge pull request #35008 from yujuhong/cli-version 
Fix version comparison when negotiating the the API version
Upstream-commit: 14ce1f1cf48e9859223c6311de58aec4dc0f046c
Component: engine
 2017-09-28 11:58:50 -10:00
Sebastiaan van Stijn d62e09de17 Merge pull request #35025 from Microsoft/jjh/TestRunAttachFailedNoLeak 
Windows: RS3: Temporarily disable TestRunAttachFailedNoLeak
Upstream-commit: 048ef0db6a75898aee57bf725ed64940744cd938
Component: engine
 2017-09-28 21:59:32 +02:00
Daniel Nephin 5fe53bab44 Merge pull request #565 from thaJeztah/change-stats-format 
Change default stats format and add --no-trunc flag
Upstream-commit: 64d5c32b8e
Component: cli
 2017-09-28 15:14:43 -04:00