Silvin Lubecki and GitHub
03cd0689c4
Merge pull request #2612 from thaJeztah/bump_gojsonschema
...
vendor: xeipuuv/gojsonschema v1.2.0
2020-07-06 10:41:30 +02:00
Silvin Lubecki and GitHub
00f38a7447
Merge pull request #2616 from thaJeztah/refactor_opts_tests
...
refactor opts tests
2020-07-02 14:40:03 +02:00
Silvin Lubecki and GitHub
ade9fd2caf
Merge pull request #2617 from thaJeztah/builder_comment_info
...
docs/builder: add note about handling of leading whitespace
2020-07-02 14:36:05 +02:00
Sebastiaan van Stijn
6776f7cdcd
docs/builder: add note about handling of leading whitespace
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-07-01 15:35:59 +02:00
Sebastiaan van Stijn
cce2f7fd9c
refactor opts tests
...
- TestParseRunAttach: use subtests to reduce cyclomatic complexity
- TestParseRunWithInvalidArgs: use subtests, and check if the expected
error is returned.
- Removed parseMustError() as it was mostly redundant
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-07-01 14:45:47 +02:00
Sebastiaan van Stijn
af62a0529b
vendor: xeipuuv/gojsonschema v1.2.0
...
full diff: https://github.com/xeipuuv/gojsonschema/compare/v1.1.0...v1.2.0
- Fix a race condition when registering new formats.
- Improve the performance of uniqueItems.
- Fix an issue where integers would be shown as a fraction
- Require format to be of type string and formats can now be registered after a schema is parsed.
- Improve the handling of true and false schema.
- Fix an issue where an invalid schema would cause a panic.
- Properly handle file URIs that contain spaces.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-06-30 16:20:03 +02:00
Silvin Lubecki and GitHub
1c6dd42dab
Merge pull request #2602 from BrianWieder/1681-docker-exec-env-file
...
Added env-file flag to docker exec
2020-06-30 11:29:25 +02:00
Brian Wieder
a6cfbd2351
Added env-file flag to docker exec
...
Signed-off-by: Brian Wieder <brian@4wieders.com >
2020-06-29 18:32:44 -04:00
Silvin Lubecki and GitHub
44ff366562
Merge pull request #2603 from thaJeztah/dont_modify_envs
...
ReadKVEnvStrings/ReadKVStrings return nil if empty, and add tests
2020-06-26 16:34:20 +02:00
Sebastiaan van Stijn
973713bc05
ReadKVEnvStrings/ReadKVStrings return nil if empty, and add tests
...
If no env-vars were loaded from "files", and "overrides" was nil,
the code returned an empty slice instead of a `nil` value.
Also add a test for this function, as no unit test was present yet.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-06-26 16:07:13 +02:00
Silvin Lubecki and GitHub
e0654a584b
Merge pull request #2604 from thaJeztah/skip_on_mac
...
command/container: skip some tests on macOS
2020-06-26 16:05:58 +02:00
Sebastiaan van Stijn
1c31e193c0
command/container: skip some tests on macOS
...
These tests failed when running natively on macOS;
unknown server OS: darwin
Skipping them, like we do on Windows
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-06-26 15:37:44 +02:00
Sebastiaan van Stijn and GitHub
36c33202f7
Merge pull request #2600 from AkihiroSuda/fix-doc-cgroupdriver
...
docs: update for cgroup v2 and rootless
2020-06-25 19:26:07 +02:00
Silvin Lubecki and GitHub
691d3b7a7f
Merge pull request #2568 from thaJeztah/bump_mux
...
vendor: gorilla/mux v1.7.4
2020-06-25 15:31:35 +02:00
Silvin Lubecki and GitHub
a03c2c65a1
Merge pull request #2581 from thaJeztah/config_simplify
...
config: remove redundant os.Stat()
2020-06-25 15:29:52 +02:00
Silvin Lubecki and GitHub
7365ad15d1
Merge pull request #2571 from thaJeztah/forward_port_ready_filtering
...
[master forward-port] list state `ready` for filtering in stack_ps.md
2020-06-25 15:23:48 +02:00
Silvin Lubecki and GitHub
9c8818aeea
Merge pull request #2556 from thaJeztah/fix_plugin_api_link
...
docs/extend: fix broken link and some markdown touch-ups
2020-06-25 15:22:08 +02:00
Silvin Lubecki and GitHub
1d3249f823
Merge pull request #2593 from thaJeztah/fix_plugin_examples
...
docs: fix example output for docker plugin ls
2020-06-25 15:21:20 +02:00
Akihiro Suda
beb23c9963
docs: update for cgroup v2 and rootless
...
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp >
2020-06-24 19:24:54 +09:00
Silvin Lubecki and GitHub
87db43814b
Merge pull request #2503 from thaJeztah/pidslimit
...
Add support for --limit-pids on service create / update and stacks (swarm)
2020-06-22 15:08:59 +02:00
Sebastiaan van Stijn
851eeb9639
Add support for pids limit in stacks (swarm)
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-06-18 21:25:08 +02:00
Sebastiaan van Stijn
395a6d560d
Add support for --limit-pids on service create / update (swarm)
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-06-18 21:25:02 +02:00
Sebastiaan van Stijn
c253918eaf
docs: fix example output for docker plugin ls
...
The output format was changed to combine tag and name in a single
column, but this change was never reflected in the docs.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-06-18 16:37:36 +02:00
Sebastiaan van Stijn and GitHub
ba2a712ff0
Merge pull request #2583 from simonferquel/logout-config-out-of-sync2
...
Don't filter out registries to logout from with config file contents
2020-06-17 17:31:36 +02:00
Silvin Lubecki and GitHub
a03873828b
Merge pull request #2574 from thaJeztah/carry_environment_variables
...
Environment variable changes (carry #806 )
2020-06-17 16:29:57 +02:00
Silvin Lubecki and GitHub
e4deb305fe
Merge pull request #2588 from thaJeztah/bump_x_text
...
vendor: golang.org/x/text v0.3.3 (CVE-2020-14040)
2020-06-17 16:12:32 +02:00
Sebastiaan van Stijn
668aea3f13
vendor: golang.org/x/text v0.3.3
...
full diff: https://github.com/golang/text/compare/v0.3.2...v0.3.3
includes a fix for [CVE-2020-14040][1]
[1]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-14040
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-06-17 13:22:37 +02:00
Sebastiaan van Stijn and GitHub
82ffedbde3
Merge pull request #2561 from dito/patch-1
...
docs: fix broken link
2020-06-16 12:18:39 +02:00
dito
0f7260d1c7
Fix broken link
...
Signed-off-by: Daisuke Ito <itodaisuke00@gmail.com >
2020-06-16 10:19:16 +09:00
Sebastiaan van Stijn and GitHub
a8df5e974e
Merge pull request #2580 from dominikbraun/2565-remove-image-images-alias
...
Remove 'images' alias from 'image ls' command
2020-06-16 00:09:41 +02:00
Sebastiaan van Stijn and GitHub
077af8151f
Merge pull request #2578 from cpuguy83/anotate_os_version
...
Added support for setting OS version in docker manifest annotate.
2020-06-15 19:31:17 +02:00
Dominik Braun
1570025f00
Remove 'images' alias from 'image ls' command
...
Signed-off-by: Dominik Braun <Dominik.Braun@nbsp.de >
Remove assertion for 'images' alias of 'image ls'
Signed-off-by: Dominik Braun <Dominik.Braun@nbsp.de >
2020-06-15 17:48:43 +02:00
Simon Ferquel
6248f2fb6f
Don't filter out registries to logout from with config file contents
...
Previously, if a registry AuthInfo was not present in the CLI config file, docker logout could not be used
to ask the credential helper to forget about it. It causes problem for people working with
multiple alternative config files, and it causes problems for cases like Docker Desktop w/ WSL 2, as
it uses the same win32 credential helper as the Windows CLI, but a different config file, leading to
bugs where I cannot logout from a registry from wsl2 if I logged in from Windows and vice-versa.
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com >
2020-06-15 14:29:37 +02:00
Silvin Lubecki and GitHub
d21c5bd4ad
Merge pull request #2582 from thaJeztah/bump_docker
...
vendor: update docker, containerd
2020-06-15 13:54:26 +02:00
Sebastiaan van Stijn
458c2336c9
vendor: containerd c80284d4b5291a351bb471bcdabb5c1d95e7a583
...
full diff: https://github.com/containerd/containerd/compare/4d242818bf55542e5d7876ca276fea83029e803c...c80284d4b5291a351bb471bcdabb5c1d95e7a583
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-06-15 13:33:00 +02:00
Sebastiaan van Stijn
0d57a400b3
vendor: docker/docker aaf470eca7b588aa19e6681bff8bf08d17be1bf2
...
full diff: https://github.com/moby/moby/compare/41ac6bef8d449b3064ad1378a28d95c79c4b9350...aaf470eca7b588aa19e6681bff8bf08d17be1bf2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-06-15 13:32:53 +02:00
Sebastiaan van Stijn
89089fb419
config: remove redundant os.Stat()
...
There's no need to perform an `os.Stat()` first, because
`os.Open()` also returns the same errors if the file does
not exist, or couldn't be opened for other reasons.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-06-15 11:08:56 +02:00
Silvin Lubecki and GitHub
c5c6fb1cd4
Merge pull request #2579 from thaJeztah/fix_cfgfile_error
...
config: fix error message using incorrect filename
2020-06-15 10:35:57 +02:00
Sebastiaan van Stijn
494f30a1a5
config: fix error message using incorrect filename
...
Before:
echo 'invalid-json' > ~/.dockercfg
docker pull hello-world
WARNING: Error loading config file: /root/.docker/config.json: Invalid Auth config file
After:
echo 'invalid-json' > ~/.dockercfg
docker pull hello-world
WARNING: Error loading config file: /root/.dockercfg: Invalid Auth config file
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-06-12 22:30:10 +02:00
Saswat Bhattacharya and Brian Goff
bc5f102244
Added support for setting OS version in docker manifest annotate.
...
Signed-off-by: Saswat Bhattacharya <sas.saswat@gmail.com >
2020-06-12 12:04:03 -07:00
Sebastiaan van Stijn and GitHub
af2c31c4a7
Merge pull request #2572 from simonferquel/context-dont-loose-additional-fields
...
Don't loose additional metadata fields when read/writing contexts metadata
2020-06-12 10:59:23 +02:00
Tibor Vass and GitHub
31822ff745
Merge pull request #2551 from cpuguy83/platform_on_create
...
Platform on create
2020-06-11 11:35:32 -07:00
Silvin Lubecki and GitHub
4f63781890
Merge pull request #2563 from thaJeztah/bump_circleci_docker
...
CircleCI: update docker versions used in CI
2020-06-11 15:21:47 +02:00
Silvin Lubecki and GitHub
0b3754d351
Merge pull request #2547 from thaJeztah/fix_dockerd_api_link
...
docs: fix broken link in dockerd.md
2020-06-11 15:20:16 +02:00
Silvin Lubecki and GitHub
6c4db3bbb1
Merge pull request #2562 from thaJeztah/bump_golang_1.13.12
...
Bump Golang 1.13.12
2020-06-11 15:11:17 +02:00
Sargun Dhillon and Sebastiaan van Stijn
e1148e2c70
Add MOBY_DISABLE_PIGZ to dockerd environment variable docs
...
This reflects a Moby change to add documentation around
disabling a new feature -- to use pgzip to decompress
layers, rather than the built-in go gzip.
Signed-off-by: Sargun Dhillon <sargun@sargun.me >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-06-11 13:57:23 +02:00
Sargun Dhillon and Sebastiaan van Stijn
ad301e7410
Split up environment variable documentation between cli and dockerd
...
This creates a new section of environment variables in the CLI docs
which documents environment variables that can both be used on dockerd
and on docker cli.
In addition, it moves some of the environment variable documentation
from the docker cli documentation to the dockerd documentation, as
these environment variables are dockerd-specific.
Signed-off-by: Sargun Dhillon <sargun@sargun.me >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-06-11 13:54:39 +02:00
Justin Cormack and GitHub
c27f55e3c3
Merge pull request #2448 from thaJeztah/deprecate_classic
...
Deprecate classic Swarm and overlay networks using external k/v stores
2020-06-11 11:50:31 +01:00
Simon Ferquel
2ab4b4d536
Don't loose additional metadata fields
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com >
2020-06-10 15:07:23 +02:00
Simon Heimberg and Sebastiaan van Stijn
4840a8dfbe
list state ready for filtering in stack_ps.md
...
Signed-off-by: SimonHeimberg <simon.heimberg@heimberg-ea.ch >
(cherry picked from commit 6a20e87ae8 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-06-10 12:31:25 +02:00