Commit Graph

6998 Commits

Author SHA1 Message Date
Brian Goff 8c986d3ff2 Bump docker/docker vendor
This brings in client support to set the platform on container create.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2020-05-27 11:31:33 -07:00
Sebastiaan van Stijn 98a3d6a48a
docs: fix broken link in dockerd.md
The Engine API docs are not available in this GitHub repository,
so linking to the docs.docker.com website instead.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-25 11:07:10 +02:00
Daniil Nikolenko cb010db830 Fix bug with panic when DOCKER_CLI_EXPERIMENTAL environment variable is incorrect
Signed-off-by: Daniil Nikolenko <qoo2p5@gmail.com>
2020-05-24 23:21:20 +03:00
Tibor Vass 590f3271ef
Merge pull request #2537 from silvin-lubecki/fix-version-old-engine-master
Fix version old engine master
2020-05-20 09:49:26 -07:00
Silvin Lubecki 74919d0569 Run e2e tests with different engine version on Jenkins
Rewrite Jenkinsfile to new declarative syntax without parallel as the e2e framework is not tailored for than (container name clash, port clash,...)

Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2020-05-20 18:24:10 +02:00
Silvin Lubecki 15d6565e49 Add a new Makefile variable to override DockerInDocker engine version we use to run e2e tests
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2020-05-20 16:10:51 +02:00
Silvin Lubecki 54f766d240 Partially revert cf663b526a as it breaks the version negotiation with an older docker engine.
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2020-05-20 16:10:43 +02:00
Sebastiaan van Stijn f729837d44
Merge pull request #2534 from silvin-lubecki/clean-plugin-doc
Removing CLI plugins API documentation
2020-05-19 12:07:39 +02:00
Silvin Lubecki 459c6082f8 Removing CLI plugins API documentation from official documentation as it is now deprecated.
Adding depreciation notice.

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2020-05-19 10:37:35 +02:00
Silvin Lubecki 8726f7dc95
Merge pull request #2531 from thaJeztah/bump_golang_1.13.11
Bump Golang 1.13.11
2020-05-18 17:50:36 +02:00
Sebastiaan van Stijn 1ecca982ed
Bump Golang 1.13.11
full diff: https://github.com/golang/go/compare/go1.13.10...go1.13.11

go1.13.11 (released 2020/05/14) includes fixes to the compiler. See the Go 1.13.11
milestone on the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.13.11+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-18 15:58:42 +02:00
Silvin Lubecki 5bf109154f
Merge pull request #2507 from XiaodongLoong/master
-buildmode=pie is not supported for the mips arch
2020-05-13 11:59:53 +02:00
Silvin Lubecki 950b1020ab
Merge pull request #2521 from thaJeztah/bump_mapstructure
vendor: mitchellh/mapstructure v1.0.0
2020-05-12 16:17:15 +02:00
Silvin Lubecki fa0e2038b6
Merge pull request #2522 from thaJeztah/bump_perks
vendor: beorn7/perks v1.0.1
2020-05-12 16:16:47 +02:00
Xiaodong Liu eeafa40154 -buildmode=pie is not supported for the mips arch
reference: 4c99c81326

Signed-off-by: Xiaodong Liu <liuxiaodong@loongson.cn>
2020-05-12 09:14:36 +08:00
Sebastiaan van Stijn 66dd9f29fa
vendor: beorn7/perks v1.0.1
full diff: e7f67b54ab...v1.0.1

adds go module support

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-11 19:37:29 +02:00
Sebastiaan van Stijn cf543e1308
vendor: mitchellh/mapstructure v1.0.0
we were only one commit behind v1.0.0, so updating to that
version; we can do a follow-up to update to the latest minor
release (v1.3.0)

full diff: f15292f7a6...v1.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-11 19:32:19 +02:00
Silvin Lubecki 13ee065e95
Merge pull request #2519 from thaJeztah/markup_touch_ups
docs: more Markdown touch-ups
2020-05-11 17:49:19 +02:00
Sebastiaan van Stijn 4d948e468b
docs: more Markdown touch-ups
- replace the "none" code-hint with "console"
- some changes in the "experimental" instructions
- reformat some notes
- reformat / re-indent JSON output to use 2 spaces (for consistency)
- split JSON outputs to separate code-block so that it can be highlighted

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-11 17:32:52 +02:00
Silvin Lubecki ce2a9faf1b
Merge pull request #2517 from thaJeztah/compose_file_build_extra_hosts
compose: add build.extra_hosts to v3.9 schema
2020-05-11 17:18:48 +02:00
Silvin Lubecki f327b97d37
Merge pull request #2511 from thaJeztah/bump_term
vendor: moby/term 73f35e472e8f0a3f91347164138ce6bd73b756a9 (and dependencies)
2020-05-11 14:38:38 +02:00
Silvin Lubecki ae97466ae1
Merge pull request #2512 from thaJeztah/bump_pkg_errors
vendor: pkg/errors v0.9.1
2020-05-11 14:35:34 +02:00
Silvin Lubecki 65e139ee4a
Merge pull request #2510 from thaJeztah/bump_hcsshim
vendor: Microsoft/hcsshim v0.8.9
2020-05-11 14:31:58 +02:00
Silvin Lubecki 73df7bb16a
Merge pull request #2515 from thaJeztah/bump_klog
vendor: k8s.io/klog v1.0.0-2-g4ad0115
2020-05-11 14:27:54 +02:00
Sebastiaan van Stijn 0c5f97ed72
compose: add build.extra_hosts to v3.9 schema
This is not currently used by the CLI, but can be used by
docker compose to bring parity on this feature with the
compose v2.4 schema.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-10 20:01:03 +02:00
Sebastiaan van Stijn bb7ef2cb3a
Update some uses of errors.Cause() to errors.Is()
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-10 19:56:35 +02:00
Sebastiaan van Stijn 466c50f939
vendor: k8s.io/klog v1.0.0-2-g4ad0115
Temporarily vendoring tip of the release-1.x branch, to address
docker context inspect being slow on Windows because this package
performs user lookup through `os.Current()` during `init()`.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-10 14:17:45 +02:00
Sebastiaan van Stijn 082a8bd892
vendor: pkg/errors v0.9.1
full diff: https://github.com/pkg/errors/compare/v0.8.1...v0.9.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 21:25:30 +02:00
Sebastiaan van Stijn 84c0a04097
vendor: Microsoft/hcsshim v0.8.9
full diff: https://github.com/microsoft/hcsshim/compare/v0.8.7...v0.8.9

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 19:01:45 +02:00
Sebastiaan van Stijn f6541cfd80
vendor: moby/term 73f35e472e8f0a3f91347164138ce6bd73b756a9
full diff: 063f2cd0b4...73f35e472e

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 17:28:17 +02:00
Sebastiaan van Stijn d10e2b9a6d
vendor: golang.org/x/sys 85ca7c5b95cdf1e557abb38a283d1e61a5959c31
full diff: d5e6a3e2c0...85ca7c5b95

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 17:26:23 +02:00
Brian Goff f7185d27e1
Merge pull request #2161 from thaJeztah/config_dont_init
config: don't call homedir on init()
2020-05-07 11:20:40 -07:00
Silvin Lubecki 3080921cd1
Merge pull request #2501 from thaJeztah/fix_context_reference
docs: fix, and touch-up "docker context" docs
2020-05-07 16:12:54 +02:00
Silvin Lubecki 7cd6e893a1
Merge pull request #2500 from thaJeztah/version_context
Add "context" to "docker version" and "docker info"
2020-05-07 16:10:16 +02:00
Silvin Lubecki 3017de7d62
Merge pull request #2502 from thaJeztah/cobra_deprecated_function
Replace deprecated Cobra command.SetOutput() with command.SetOut()
2020-05-07 14:41:24 +02:00
Sebastiaan van Stijn 719169db63
Replace deprecated Cobra command.SetOutput() with command.SetOut()
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-07 14:25:59 +02:00
Sebastiaan van Stijn bc938e4dea
docker info: add "context" to output
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-07 14:07:22 +02:00
Sebastiaan van Stijn 181e60499f
docker version: add "context" to output
This adds the currently selected "docker context" to the output
of "docker version", which allows users to see which context
is selected to produce the version output, and can be used (for
example), to set the prompt to the currently selected context:

(in `~/.bashrc`):

```bash
function docker_context_prompt() {
        PS1="context: $(docker version --format='{{.Client.Context}}')> "
}

PROMPT_COMMAND=docker_context_prompt
```

After reloading the `~/.bashrc`, the prompt now shows the currently selected
`docker context`:

```bash
$ source ~/.bashrc
context: default> docker context create --docker host=unix:///var/run/docker.sock my-context
my-context
Successfully created context "my-context"
context: default> docker context use my-context
my-context
Current context is now "my-context"
context: my-context> docker context use default
default
Current context is now "default"
context: default>
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-07 14:07:15 +02:00
Sebastiaan van Stijn 803b9071e7
docs: fix, and touch-up "docker context" docs
Using `/var/run/docker.sock` as docker host is invalid, and causes
an error, so adding `unix://` to it.

In addition, we document the name of the context to go after the
options, so change the order in the examples.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-07 13:53:25 +02:00
Sebastiaan van Stijn 4f058143c7
Merge pull request #2262 from dperny/swarm-jobs
Add jobs support to CLI
2020-05-06 17:00:01 +02:00
Silvin Lubecki c80f2306e5
Merge pull request #2488 from thaJeztah/bump_cobra
vendor: spf13/cobra v1.0.0, go-md2man v2.0.0, blackfriday v2.0.1
2020-05-04 20:41:39 +02:00
Sebastiaan van Stijn df5cedfc81
vendor: spf13/cobra v1.0.0, go-md2man v2.0.0, blackfriday v2.0.1
full diff: https://github.com/spf13/cobra/compare/v0.0.3...v1.0.0

Notable Changes

- Fish completion (including support for Go custom completion)
- API (urgent): Rename BashCompDirectives to ShellCompDirectives
- Remove/replace SetOutput on Command - deprecated
- Custom completions coded in Go (instead of Bash)
- Partial Revert of 922
- Correct documentation for InOrStdin
- Apply formatting to templates
- Revert change so help is printed on stdout again
- Update md2man to v2.0.0
- update viper to v1.4.0
- Update cmd/root.go example in README.md

vendor: update cpuguy83/go-md2man v2.0.0

full diff: https://github.com/cpuguy83/go-md2man/compare/v1.0.8...v2.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-04 17:00:46 +02:00
Sebastiaan van Stijn 71d760f1b4
Merge pull request #2487 from thaJeztah/unfork_spf13flags
Implement IPNetSliceValue  locally, and un-fork spf13/pflag
2020-05-04 16:56:54 +02:00
Sebastiaan van Stijn 5202e7aefc
Merge pull request #2492 from thaJeztah/update_dockerd_usage_master
docs: update usage output for dockerd (master)
2020-05-04 16:41:59 +02:00
Sebastiaan van Stijn d07f44fb31
vendor: switch back to upstream spf13/pflag v1.0.5
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-04 16:31:52 +02:00
Sebastiaan van Stijn 80a2256478
Swarm init: use local IPNetSliceValue
This flag type was not yet merged upstream, so instead of
using a fork of spf13/pflag, define the type locally, so that
we can vendor the upstream package again.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-04 16:30:50 +02:00
Silvin Lubecki cd7fb33f3f
Merge pull request #2477 from thaJeztah/update_terminal_sequences
vendor konsorten/go-windows-terminal-sequences v1.0.3
2020-05-04 16:28:12 +02:00
Silvin Lubecki c567dee1a6
Merge pull request #2490 from thaJeztah/remove_unused_dependencies
vendor: remove unused dependencies from vendor.conf
2020-05-04 16:27:54 +02:00
Silvin Lubecki 9be57cfcbc
Merge pull request #2486 from thaJeztah/bump_logrus
vendor: sirupsen/logrus v1.6.0
2020-05-04 16:26:26 +02:00
Sebastiaan van Stijn e23a1fca92
docs: update dockerd usage
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-04 16:22:24 +02:00