Commit Graph

6439 Commits

Author SHA1 Message Date
Ian Campbell 59defcb34d add a 10s timeout to the client object.
This partially mitigates #1739 ("Docker commands take 1 minute to timeout if
context endpoint is unreachable") and is a simpler alternative to #1747 (which
completely defers the client connection until an actual call is attempted).

Note that the previous 60s delay was the culmination of two separate 30s
timeouts since the ping is tried twice. This with this patch the overall
timeout is 20s. https://github.com/moby/moby/pull/39206 will remove the second
ping and once that propagates to this tree the timeout will be 10s.

Signed-off-by: Ian Campbell <ijc@docker.com>
2019-05-13 13:53:03 +01:00
Tibor Vass 53fc257292
Merge pull request #1864 from tao12345666333/bump-golang-1.12.5
Bump golang 1.12.5
2019-05-10 17:45:58 -07:00
Sebastiaan van Stijn 6f6dd1579d
Merge pull request #1870 from thaJeztah/bump_version
Bump version to 19.09.0-dev
2019-05-10 17:39:57 -07:00
Sebastiaan van Stijn e6f73bc50a
Bump version to 19.09.0-dev
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-05-10 17:30:44 -07:00
Sebastiaan van Stijn b032208710
Merge pull request #1861 from thaJeztah/upload_junit
CircleCI: store junit.xml as artifact
2019-05-10 17:23:05 -07:00
Sebastiaan van Stijn 589b35b180
Merge pull request #1868 from albers/completion-context-create--from
Add bash completion for `context create --from`
2019-05-10 15:16:42 -07:00
Tibor Vass 3e660c2221
Merge pull request #1869 from albers/completion-events--filter-node
Add bash completion for `events --filter node`
2019-05-10 14:58:34 -07:00
Sebastiaan van Stijn 0ad0c7f6dd
Merge pull request #1860 from trapier/bash_completion_node_type_filter
bash completion: add node type filter
2019-05-10 14:56:44 -07:00
Harald Albers c1639e1e42 Add bash completion for `events --filter node`
Signed-off-by: Harald Albers <github@albersweb.de>
2019-05-10 22:14:39 +02:00
Harald Albers b55992afc6 Add bash completion for `context create --from`
Signed-off-by: Harald Albers <github@albersweb.de>
2019-05-10 21:48:27 +02:00
Sebastiaan van Stijn dea0aa9d71
Merge pull request #1866 from tiborvass/fix-buildkit-bug
vendor buildkit to 646fc0a (v0.5.1)
2019-05-09 16:51:35 -07:00
Sebastiaan van Stijn 0b0c45dd11
Merge pull request #1863 from tiborvass/buildx-backports
buildx backports: BUILDKIT_PROGRESS env + build --platform local
2019-05-09 15:23:13 -07:00
Tibor Vass 7f45a0e52c vendor buildkit to 646fc0af6d283397b9e47cd0a18779e9d0376e0e (v0.5.1)
Signed-off-by: Tibor Vass <tibor@docker.com>
2019-05-09 22:18:28 +00:00
Jintao Zhang c32d1de57c Bump golang 1.12.5
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2019-05-08 08:43:22 +08:00
Tibor Vass daca70d820 build: add --platform local
Signed-off-by: Tibor Vass <tibor@docker.com>
2019-05-07 22:25:40 +00:00
Tibor Vass 8adcedd658 build: honor BUILDKIT_PROGRESS env config
Signed-off-by: Tibor Vass <tibor@docker.com>
2019-05-07 22:16:01 +00:00
Sebastiaan van Stijn dcc414be3e
CircleCI: store junit.xml as artifact
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-05-07 14:02:16 -07:00
Trapier Marshall 50a45babac bash completion: add node type filter
Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
2019-05-07 14:26:20 -04:00
Brian Goff d88565df0c
Merge pull request #1498 from Zanadar/34394-run-pull-flag
Adds flag modifying pull behavior for running and creating containers
2019-05-06 14:35:05 -07:00
Zander Mackie 483c53ad9d Use single table for all ContainerImagePullPolicy tests
- Cleans up assertions
 - Centralizes and simplifies handler functions

Signed-off-by: Zander Mackie <zmackie@gmail.com>
2019-05-06 14:16:26 -07:00
Zander Mackie ffba7659cc Improve testing of never pull and always pull scenarios
Signed-off-by: Zander Mackie <zmackie@gmail.com>
2019-05-06 14:16:26 -07:00
Zander Mackie ec56136d61 Use closure for common pulling and tagging bevior in container creation
Signed-off-by: Zander Mackie <zmackie@gmail.com>
2019-05-06 14:16:26 -07:00
Zander Mackie 965664d89b Improve flow pull behavior before container creation.
- Also improve test coverage

Signed-off-by: Zander Mackie <zmackie@gmail.com>
2019-05-06 14:16:26 -07:00
Ravi Shekhar Jethani a06b5db594 Update cli/command/container/create.go
Co-Authored-By: Zanadar <zmackie@gmail.com>
Signed-off-by: Zander Mackie <zmackie@gmail.com>
2019-05-06 14:16:26 -07:00
Zander Mackie 22cd418967 Adds flag modifying pull behavior for running and creating containers
- Follows the proposal on issue [#34394](https://github.com/moby/moby/issues/34394)
 - Maintains current behavior as default (Pull image if missing)
 - Adds tristate flag allowing modification (PullMissing, PullAlways, PullNever)

Signed-off-by: Zander Mackie <zmackie@gmail.com>
2019-05-06 14:16:26 -07:00
Brian Goff 15130e3043 Support GOARM and windows .exe in binary target
This just makes it easier to build a targeted binary for the
goos/goach/goarm version.

This of course will not work for all cases but is nice to get things
going.
Specifically cross-compiling pkcs for yubikey support requires some
extra work whichis not tackled here.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-06 10:43:18 -07:00
Ian Campbell af200f14ed cli-plugins: fix when plugin does not use PersistentPreRun* hooks
This regressed in 3af168c7df ("Ensure plugins can use `PersistentPreRunE`
again.") but this wasn't noticed because the helloworld test plugin has it's
own `PersistentPreRunE` which has the effect of deferring the resolution of the
global variable. In the case where the hook isn't used the variable is resolved
during `newPluginCommand` which is before the global variable was set.

Initialize the plugin command with a stub function wrapping the call to the
(global) hook, this defers resolving the variable until after it has been set,
otherwise the initial value (`nil`) is used in the struct.

Signed-off-by: Ian Campbell <ijc@docker.com>
2019-04-30 10:45:29 +01:00
Vincent Demeester 3273c2e235
Merge pull request #1851 from thaJeztah/update_authors2
Update AUTHORS and mailmap
2019-04-29 07:31:59 +02:00
Sebastiaan van Stijn ffc168ed51
Update AUTHORS and mailmap
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-27 17:39:39 -07:00
Sebastiaan van Stijn 55879706ce
Merge pull request #1848 from albers/completion-storage-driver-overlay
Remove deprecated storage drivers from bash completion
2019-04-26 10:38:32 -07:00
Ian Campbell 7d0645c5fe Use command.Cli instead of command.DockerCli
The linter is complaining:

    cmd/docker/docker.go:72:23⚠️ dockerCli can be github.com/docker/cli/cli/command.Cli (interfacer)

Unclear precisely which change in the preceeding commits caused it to notice
this possibility.

Signed-off-by: Ian Campbell <ijc@docker.com>
2019-04-26 15:43:03 +01:00
Ian Campbell 40a6cf7c47 Include CLI plugins in help output on unknown flag.
Previously `docker --badopt` output would not include CLI plugins.

Fixes #1813

Signed-off-by: Ian Campbell <ijc@docker.com>
2019-04-26 15:21:20 +01:00
Ian Campbell 79a75da0fd Hide experimental builtin commands in help output on unknown flag.
Previously `docker --badopt` would always include experimental commands even if
experimental was not enabled.

Signed-off-by: Ian Campbell <ijc@docker.com>
2019-04-26 15:09:09 +01:00
Ian Campbell d57175aa2e Move subtests of TestGlobalHelp into actual subtests
Signed-off-by: Ian Campbell <ijc@docker.com>
2019-04-26 10:43:03 +01:00
Vincent Demeester 301c638d83
Merge pull request #1849 from albers/completion-systempaths-unconfined
Add bash completion for `--security-opt systempaths=unconfined`
2019-04-26 09:05:29 +02:00
Harald Albers 1648d6c4a4 Add bash completion for `--security-opt systempaths=unconfined`
Signed-off-by: Harald Albers <github@albersweb.de>
2019-04-25 23:49:30 +02:00
Harald Albers bfa43d2989 Remove deprecated storage drivers from bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2019-04-25 23:06:39 +02:00
Silvin Lubecki f28d9cc929
Merge pull request #1846 from andrewhsu/v
update vndr docker/docker ac48309 and related packages
2019-04-24 21:43:12 +02:00
Andrew Hsu eb2bfeccf7 update vndr coreos/etcd d57e8b8
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2019-04-24 18:29:33 +00:00
Andrew Hsu c1a4fb4922 update vndr moby/buildkit 8818c67
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2019-04-24 18:26:58 +00:00
Andrew Hsu e243174b30 update vndr Microsoft/go-winio 84b4ab4
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2019-04-24 18:24:26 +00:00
Andrew Hsu af053bc278 update vndr Microsoft/hcsshim 672e52e
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2019-04-24 18:14:51 +00:00
Andrew Hsu 30cc5d96b3 update vndr docker/docker to ac48309
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2019-04-24 18:10:45 +00:00
Tõnis Tiigi 70f48f2231
Merge pull request #1840 from tiborvass/cli-plugin-aliases
cli-plugins: alias an existing allowed command (only builder for now)
2019-04-23 19:13:51 -07:00
Silvin Lubecki 9a0b171192
Merge pull request #1844 from thaJeztah/bump_go_units
bump docker/go-units v0.4.0
2019-04-23 17:14:49 +02:00
Sebastiaan van Stijn c94308fa99
bump docker/go-units v0.4.0
relevant changes:

- docker/go-units#33 Fix handling of unlimited (-1) ulimit values
- docker/go-units#34 Revert 46 minute threshold

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-23 17:01:07 +02:00
Tibor Vass 1ed02c40fe cli-plugins: alias an existing allowed command (only builder for now)
With this patch it is possible to alias an existing allowed command.
At the moment only builder allows an alias.

This also properly puts the build command under builder, instead of image
where it was for historical reasons.

Signed-off-by: Tibor Vass <tibor@docker.com>
2019-04-19 01:26:45 +00:00
Sebastiaan van Stijn 8ca1f0bb7d
Merge pull request #1715 from AkihiroSuda/fix-bastion
commandconn: set SysProcAttr.Setsid (Fix DOCKER_HOST=ssh://host-behind-bastion)
2019-04-18 19:55:53 +02:00
Sebastiaan van Stijn 59952a0146
Merge pull request #1839 from thaJeztah/bump_engine3
bump docker/docker 92a6266c9d4f1bacbfb68d1c6b9c94f673d6cfde
2019-04-18 19:32:32 +02:00
Sebastiaan van Stijn ba8388f052
bump github.com/davecgh/go-spew v1.1.1
full diff: https://github.com/davecgh/go-spew/compare/v1.1.0...v1.1.1

- davecgh/go-spew#79 simpler, more robust bypass

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-18 19:20:31 +02:00