Commit Graph

6961 Commits

Author SHA1 Message Date
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
Silvin Lubecki 9387b99c36
Merge pull request #2376 from davidwtf/master
try http for docker manifest --insecure
2020-05-04 16:19:38 +02:00
Silvin Lubecki 563d666328
Merge pull request #2491 from thaJeztah/update_dockerd_usage
docs: update usage output for dockerd (19.03)
2020-05-04 16:17:48 +02:00
Sebastiaan van Stijn d096339f41
docs: update usage output for dockerd (19.03)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-04 12:59:18 +02:00
Sebastiaan van Stijn 9a58504d33
docs: fix order of flags in usage, and fix missing quote
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-04 12:35:25 +02:00
Sebastiaan van Stijn dbd2fa5c3c
vendor: remove unused dependencies from vendor.conf
```
2020/05/03 21:45:38 WARNING: package github.com/containerd/ttrpc is unused, consider removing it from vendor.conf
2020/05/03 21:45:38 WARNING: package github.com/opencontainers/runtime-spec is unused, consider removing it from vendor.conf
2020/05/03 21:45:38 WARNING: package github.com/syndtr/gocapability is unused, consider removing it from vendor.conf
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-04 00:02:17 +02:00
Sebastiaan van Stijn 24ade3c13a
vendor: sirupsen/logrus v1.6.0
full diff: https://github.com/sirupsen/logrus/compare/v1.5.0...v1.6.0

- Add flag to disable quotes in TextFormatter
- Revert "fix race conditions on entry"
    - fixes Deadlock during Entry.Infof after upgrade to v1.5.0
    - fixes Deadlock when using WithField inside of hook
    - fixes Overly-aggressive mutex locks

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-03 19:44:54 +02:00
Sebastiaan van Stijn 80adee0b13
Merge pull request #2192 from mdkalish/patch-1
Update dead link and add missing info on COPY
2020-05-01 18:37:02 +02:00
Maciej Kalisz ef414633d6
Update dead link and add missing info on COPY
1. Fix dead URL to [Dockerfile best practices](https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#leverage-build-cache).
2. Add missing information about cache invalidation by `COPY`. It works in the same way as in the case of `ADD`. Informing only about the `ADD`s behavior is misleading as one can infer that these two directives differ in this regard.
3. Add missing info on RUN cache invalidation by COPY

Signed-off-by: Maciej Kalisz <maciej.d.kalisz@gmail.com>
2020-05-01 18:23:17 +02:00
Tibor Vass 452c25cfec
Merge pull request #2483 from thaJeztah/fix_builder_link
builder: fix broken link
2020-04-30 14:58:27 -07:00
Sebastiaan van Stijn bc58d655c0
builder: fix broken link
This link was broken when generating the documentation (due to
a bug in Jekyll not converting wrapped internal links)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-30 21:46:11 +02:00
Sebastiaan van Stijn 310930d1a2
Merge pull request #2480 from thaJeztah/fix_run_reference_links
docs: fix links, and minor markdown touch-ups
2020-04-30 01:09:45 +02:00
Sebastiaan van Stijn d5be359a4f
Merge pull request #2479 from AkihiroSuda/add-cgroup-version
info: print Cgroup Version
2020-04-30 00:24:35 +02:00
Sebastiaan van Stijn 116c9a1f59
docs: fix links, and minor markdown touch-ups
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-30 00:17:28 +02:00
Akihiro Suda dbc61787a7 info: print Cgroup Version
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-04-30 06:48:12 +09:00
Silvin Lubecki 904e4f4db9
Merge pull request #2478 from thaJeztah/bump_logrus
vendor: sirupsen/logrus v1.5.0
2020-04-29 14:39:29 +02:00
Silvin Lubecki 6c14b272fd
Merge pull request #2472 from thaJeztah/bump_kubernetes_1.16.9
vendor: update kubernetes and dependencies v1.16.9
2020-04-29 14:38:54 +02:00
Sebastiaan van Stijn 0a5468dba9
Merge pull request #2474 from tonistiigi/runplugin
plugin: make runplugin public
2020-04-29 13:14:25 +02:00
Sebastiaan van Stijn 3dfe2ffc1f
vendor: update kubernetes and dependencies v1.16.9
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-29 12:33:06 +02:00
Sebastiaan van Stijn 8b32a3f9d7
vendor: sirupsen/logrus v1.5.0
full diff: https://github.com/sirupsen/logrus/compare/v1.4.2...v1.5.0

- Ability to DisableHTMLEscape when using the JSON formatter
- Support/fixes for go 1.14
- Many many bugfixes

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-29 12:29:57 +02:00
Silvin Lubecki 62291edf9d
Merge pull request #2476 from thaJeztah/bump_gotest_tools_v3.0.2
vendor: update gotest.tools v3.0.2
2020-04-29 12:14:15 +02:00
Sebastiaan van Stijn 4f65b65e81
vendor konsorten/go-windows-terminal-sequences v1.0.3
full diff: https://github.com/konsorten/go-windows-terminal-sequences/compare/v1.0.2...v1.0.3

Fixes a panic when using logrus on Go 1.14

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-29 11:46:05 +02:00
Sebastiaan van Stijn 2e83f56856
vendor: update gotest.tools v3.0.2
full diff: https://github.com/gotestyourself/gotest.tools/compare/v3.0.1...v3.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-29 11:42:32 +02:00
Tonis Tiigi d2632cea78 plugin: make runplugin public
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-04-28 15:48:13 -07:00
Sebastiaan van Stijn 92dc906059
Merge pull request #1918 from tcoupin/patch-1
completion with container names on restart
2020-04-28 15:57:16 +02:00
Silvin Lubecki 5f35b309e7
Merge pull request #2466 from thaJeztah/fix_service_create_example
service update: fix service create example
2020-04-28 11:42:11 +02:00
Silvin Lubecki f8696535e9
Merge pull request #2447 from thaJeztah/replace_term
update docker/docker to current master
2020-04-28 10:55:47 +02:00
Drew Erny 9375644e34 Add jobs support to CLI
* Added two new modes accepted by the `--mode` flag
  * `replicated-job` creates a replicated job
  * `global-job` creates a global job.
* When using `replicated-job` mode, the `replicas` flag sets the
  `TotalCompletions` parameter of the job. This is the total number of
  tasks that will run
* Added a new flag, `max-concurrent`, for use with `replicated-job`
  mode. This flag sets the `MaxConcurrent` parameter of the job, which
  is the maximum number of replicas the job will run simultaneously.
* When using `replicated-job` or `global-job` mode, using any of the
  update parameter flags will result in an error, as jobs cannot be
  updated in the traditional sense.
* Updated the `docker service ls` UI to include the completion status
  (completed vs total tasks) if the service is a job.
* Updated the progress bars UI for service creation and update to
  support jobs. For jobs, there is displayed a bar covering the overall
  progress of the job (the number of tasks completed over the total
  number of tasks to complete).
* Added documentation explaining the use of the new flags, and of jobs
  in general.

Signed-off-by: Drew Erny <derny@mirantis.com>
2020-04-24 11:22:10 -05:00
Sebastiaan van Stijn 0cd7c6aa02
service update: fix service create example
Service create expects the name to be passed using the
`--name` flag, not as a positional parameter

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-24 13:42:04 +02:00
Sebastiaan van Stijn 2c3797015f
Merge pull request #2465 from dominikbraun/2092-iface-prefix-docs
Add container_iface_prefix option to documentation
2020-04-24 12:54:17 +02:00
Dominik Braun 84a07a9977 Add container_iface_prefix option to documentation
Signed-off-by: dominikbraun <braun@sternentstehung.de>
2020-04-24 12:39:24 +02:00
Sebastiaan van Stijn 6a17919d32
vendor: github.com/docker/swarmkit ebe39a32e3ed4c3a3783a02c11cccf388818694c
full diff: 49e35619b1...ebe39a32e3

no local changes

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-22 17:19:15 +02:00
Sebastiaan van Stijn 5adc9d2361
vendor: github.com/containerd/ttrpc v1.0.0
full diff: 92c8520ef9...v1.0.0

no local changes

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-22 17:19:13 +02:00
Sebastiaan van Stijn 2cb9d26c2f
vendor: github.com/containerd/console v1.0.0
full diff: 0650fd9eeb...v1.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-22 17:19:11 +02:00
Sebastiaan van Stijn c085577685
vendor: github.com/containerd/cgroups 44306b6a1d46985d916b48b4199f93a378af314f
full diff: 5fbad35c2a...44306b6a1d

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-22 17:19:09 +02:00
Sebastiaan van Stijn 9c21f28aca
vendor: github.com/containerd/containerd 4d242818bf55542e5d7876ca276fea83029e803c
full diff: acdcf13d5e...4d242818bf

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-22 17:19:07 +02:00
Sebastiaan van Stijn 2b910b69b3
vendor: github.com/tonistiigi/fsutil c2c7d7b0e1441705cd802e5699c0a10b1dfe39fd
full diff: 0f039a052c...c2c7d7b0e1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-22 17:19:05 +02:00
Sebastiaan van Stijn edf70dc308
vendor: golang.org/x/oauth2 bf48bf16ab8d622ce64ec6ce98d2c98f916b6303
full diff: ef147856a6...bf48bf16ab

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-22 17:19:04 +02:00