Commit Graph

36394 Commits

Author SHA1 Message Date
af94197a36 Merge pull request #268 from andrewhsu/v
[17.10] bump version to 17.10.0-ce-rc2
2017-10-11 17:38:08 -07:00
24ee573f35 Merge pull request #270 from andrewhsu/sk
[17.10] re-vndr swarmkit to 1d2bc2e
2017-10-11 17:37:36 -07:00
1311aaf76e Merge pull request #271 from andrewhsu/d
[17.10] backport doc fixes and shell completion script fixes
2017-10-11 16:10:39 -07:00
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
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
e7f51b183f Fix markdown link in service-create reference docs
Markdown nested in a HTML table doesn't work, so changing
the link to a plain HTML link.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 6b6511f191)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-10-11 15:32:32 -07:00
792e8f9a82 Fix dockerd reference heading levels
Commit ddadd3db49 changed
the heading levels of various sections, but as a result,
the "daemon configuration file" section (and other sections)
changed from a H2 to a H4, therefore no longer showing
up in the page's TOC / navigation bar.

This patch changes the heading level to a H3 for
sections that should show up in the page navigation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit aca0421eb8)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-10-11 15:31:37 -07:00
8b13940b3b Update rmi.md
Signed-off-by: Daniel Goosen <daniel.goosen@surveysampling.com>
(cherry picked from commit 9004495541)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-10-11 15:30:49 -07:00
550052ebae Add bash completion for secret create --driver
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 1d7a31f87e)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-10-11 15:29:15 -07:00
b0596beda5 Add bash completion for stack deploy --resolve-image
Also adds minimal documentation for this flag.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 9559b9b7a8)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-10-11 15:28:15 -07:00
6fc2c6b8c5 Update deprecation for synchronous service updates
- The default was not changed in 17.09 but will be in 17.10
- `service scale` and `service rollback` are also affected.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 20d9ceca78)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-10-11 15:26:34 -07:00
f26232e8f6 Update bash completion for synchronous docker service commands
The default value for
`docker service create|update|scale|rollback --detach|-d` changed from
`true` to `false`.
This updates bash completion to complete just `--detach|-d`.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 60bfaba6fb)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-10-11 15:26:34 -07:00
018b6401f5 re-vndr swarmkit to 1d2bc2e
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-10-11 14:27:34 -07:00
56bd88c226 bump version to 17.10.0-ce-rc2
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-10-11 10:55:10 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
e1484d2ff8 re-vndr swarmkit to 872861d
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-10-10 17:50:47 -07:00
d82f9fe3f3 re-vndr libnetwork to 6c51292
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-10-10 17:19:58 -07:00
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
d866876d86 Merge pull request #259 from andrewhsu/v
[17.10] bump version to 17.10.0-ce-rc1
2017-10-04 14:11:32 -07:00
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
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
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
4f818dd6f7 Add detach flag for scale tests
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-09-30 13:23:18 -07:00
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
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
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
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
328a5917ad Merge component 'engine' from git@github.com:moby/moby master 2017-09-29 22:30:27 +00:00
09bc512154 Merge component 'cli' from git@github.com:docker/cli master 2017-09-29 22:08:57 +00:00
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
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
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
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
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
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
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
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
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
ae273c63d1 Merge component 'engine' from git@github.com:moby/moby master 2017-09-28 10:34:35 -07:00