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
d21c5bd4ad
Merge pull request #2582 from thaJeztah/bump_docker
...
vendor: update docker, containerd
2020-06-15 13:54:26 +02:00
458c2336c9
vendor: containerd c80284d4b5291a351bb471bcdabb5c1d95e7a583
...
full diff: 4d242818bf...c80284d4b5
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-06-15 13:33:00 +02:00
0d57a400b3
vendor: docker/docker aaf470eca7b588aa19e6681bff8bf08d17be1bf2
...
full diff: 41ac6bef8d...aaf470eca7
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-06-15 13:32:53 +02:00
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
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
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
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
31822ff745
Merge pull request #2551 from cpuguy83/platform_on_create
...
Platform on create
2020-06-11 11:35:32 -07:00
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
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
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
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
2ab4b4d536
Don't loose additional metadata fields
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com >
2020-06-10 15:07:23 +02:00
b350e14b1f
Merge pull request #2569 from thaJeztah/hardcode_name_in_errors
...
Use consistent name for errors
2020-06-09 16:58:40 +02:00
a3af1f47da
Use consistent name for errors
...
This prevents inconsistent errors when using a symlink, or when renaming
the binary;
Before this change;
ln -s $(which docker) toto
./toto rune
docker: 'rune' is not a docker command.
./toto run daslkjadslkjdaslkj
Unable to find image 'adslkjadslakdsj:latest' locally
./toto: Error response from daemon: pull access denied for adslkjadslakdsj, repository does not exist or may require 'docker login': denied: requested access to the resource is denied.
After this change:
ln -s $(which docker) toto
./toto rune
docker: 'rune' is not a docker command.
./toto run daslkjadslkjdaslkj
Unable to find image 'adslkjadslakdsj:latest' locally
docker: Error response from daemon: pull access denied for adslkjadslakdsj, repository does not exist or may require 'docker login': denied: requested access to the resource is den>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-06-09 16:24:35 +02:00
8f14db8df2
Merge pull request #2555 from devisions/timestam_with_z_doc_upd
...
Explicit Z on logs timestamp examples
2020-06-04 17:53:52 +02:00
41255a4315
CircleCI: update docker versions used in CI
...
CircleCI now has 19.03; https://circleci.com/docs/2.0/building-docker-images/#docker-version
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-06-03 14:21:20 +02:00
1cd69c41e6
Bump Golang 1.13.12
...
go1.13.12 (released 2020/06/01) includes fixes to the runtime, and the go/types
and math/big packages. See the Go 1.13.12 milestone on the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.13.12+label%3ACherryPickApproved
full diff: https://github.com/golang/go/compare/go1.13.11...go1.13.12
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-06-03 12:25:39 +02:00
a91880a3a3
Deprecate classic Swarm and overlay networks using external k/v stores
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-05-29 10:56:05 +02:00
82de74a5e3
Merge pull request #2559 from tiborvass/sshfix
...
ssh: avoid setting flags through hostname
2020-05-28 13:27:55 -07:00
d30970e3b1
ssh: avoid setting flags through hostname
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2020-05-28 20:08:35 +00:00
263bb539f6
Merge pull request #2544 from qoo2p5/master
...
Fixes #2543 : bug with panic when DOCKER_CLI_EXPERIMENTAL is incorrect
2020-05-28 12:18:00 -07:00
1183a3e6e7
Explicit Z on logs timestamp examples
...
Signed-off-by: devisions <marius.ileana@gmail.com >
2020-05-28 15:24:07 +03:00
ccd9d633bb
Set platform on container create API.
...
Previously we only set the platform when performing a pull, which is
only initiated if pull always is set, or if the image reference does not
exist in the daemon.
The daemon now supports specifying which platform you wanted on
container create so it can validate the image reference is the platform
you thought you were getting.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2020-05-27 17:16:56 -07:00
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
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
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
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
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
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
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
f729837d44
Merge pull request #2534 from silvin-lubecki/clean-plugin-doc
...
Removing CLI plugins API documentation
2020-05-19 12:07:39 +02:00
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
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
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
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
950b1020ab
Merge pull request #2521 from thaJeztah/bump_mapstructure
...
vendor: mitchellh/mapstructure v1.0.0
2020-05-12 16:17:15 +02:00
fa0e2038b6
Merge pull request #2522 from thaJeztah/bump_perks
...
vendor: beorn7/perks v1.0.1
2020-05-12 16:16:47 +02:00
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
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
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
13ee065e95
Merge pull request #2519 from thaJeztah/markup_touch_ups
...
docs: more Markdown touch-ups
2020-05-11 17:49:19 +02:00
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
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
f327b97d37
Merge pull request #2511 from thaJeztah/bump_term
...
vendor: moby/term 73f35e472e8f0a3f91347164138ce6bd73b756a9 (and dependencies)
2020-05-11 14:38:38 +02:00
ae97466ae1
Merge pull request #2512 from thaJeztah/bump_pkg_errors
...
vendor: pkg/errors v0.9.1
2020-05-11 14:35:34 +02:00
65e139ee4a
Merge pull request #2510 from thaJeztah/bump_hcsshim
...
vendor: Microsoft/hcsshim v0.8.9
2020-05-11 14:31:58 +02:00
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
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