98fdcd769b
Merge pull request #4287 from thaJeztah/24.0_update_engine2
...
build / prepare (push) Waiting to run
build / build (push) Blocked by required conditions
build / prepare-plugins (push) Waiting to run
build / plugins (push) Blocked by required conditions
e2e / e2e (19.03-dind, non-experimental) (push) Waiting to run
e2e / e2e (alpine, stable-dind, connhelper-ssh) (push) Waiting to run
e2e / e2e (alpine, stable-dind, experimental) (push) Waiting to run
e2e / e2e (alpine, stable-dind, non-experimental) (push) Waiting to run
e2e / e2e (bullseye, stable-dind, connhelper-ssh) (push) Waiting to run
e2e / e2e (bullseye, stable-dind, experimental) (push) Waiting to run
e2e / e2e (bullseye, stable-dind, non-experimental) (push) Waiting to run
test / ctn (push) Waiting to run
test / host (macos-11) (push) Waiting to run
validate / validate (lint) (push) Waiting to run
validate / validate (shellcheck) (push) Waiting to run
validate / validate (update-authors) (push) Waiting to run
validate / validate (validate-vendor) (push) Waiting to run
validate / validate-md (push) Waiting to run
validate / validate-make (manpages) (push) Waiting to run
validate / validate-make (yamldocs) (push) Waiting to run
[24.0] vendor: github.com/docker/docker v24.0.0-rc.3
v24.0.0
v24.0.0-rc.4
2023-05-12 15:10:05 +01:00
fb6ae356c7
vendor: github.com/docker/docker v24.0.0-rc.3
...
no changes in vendored files
full diff: https://github.com/docker/docker/compare/v24.0.0-rc.2...v24.0.0-rc.3
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-05-12 00:03:10 +02:00
1d7dd91593
Merge pull request #4286 from thaJeztah/24.0_backport_vendor_distribution_v2.8.2
...
build / prepare (push) Waiting to run
build / build (push) Blocked by required conditions
build / prepare-plugins (push) Waiting to run
build / plugins (push) Blocked by required conditions
e2e / e2e (19.03-dind, non-experimental) (push) Waiting to run
e2e / e2e (alpine, stable-dind, connhelper-ssh) (push) Waiting to run
e2e / e2e (alpine, stable-dind, experimental) (push) Waiting to run
e2e / e2e (alpine, stable-dind, non-experimental) (push) Waiting to run
e2e / e2e (bullseye, stable-dind, connhelper-ssh) (push) Waiting to run
e2e / e2e (bullseye, stable-dind, experimental) (push) Waiting to run
e2e / e2e (bullseye, stable-dind, non-experimental) (push) Waiting to run
test / ctn (push) Waiting to run
test / host (macos-11) (push) Waiting to run
validate / validate (lint) (push) Waiting to run
validate / validate (shellcheck) (push) Waiting to run
validate / validate (update-authors) (push) Waiting to run
validate / validate (validate-vendor) (push) Waiting to run
validate / validate-md (push) Waiting to run
validate / validate-make (manpages) (push) Waiting to run
validate / validate-make (yamldocs) (push) Waiting to run
[24.0 backport] vendor: github.com/docker/distribution v2.8.2
v24.0.0-rc.3
2023-05-11 19:49:59 +02:00
de93c9b260
vendor: github.com/docker/distribution v2.8.2
...
CI
- Dockerfile: fix filenames of artifacts
Bugfixes
- Fix panic in inmemory driver
- Add code to handle pagination of parts. Fixes max layer size of 10GB bug
- Parse http forbidden as denied
- Revert "registry/client: set Accept: identity header when getting layers
Runtime
- Update to go1.19.9
- Dockerfile: update xx to v1.2.1 ([#3907 ](https://github.com/distribution/distribution/pull/3907 ))
Security
- Fix [CVE-2022-28391](https://www.cve.org/CVERecord?id=CVE-2022-28391 ) by bumping alpine from 3.14 to 3.16
- Fix [CVE-2023-2253](https://www.cve.org/CVERecord?id=CVE-2023-2253 ) runaway allocation on /v2/_catalog [`521ea3d9`](521ea3d973 )
full diff: https://github.com/docker/distribution/compare/v2.8.1...v2.8.2-beta.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 353e0a942d )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-05-11 19:16:03 +02:00
75f2669d56
Merge pull request #4277 from thaJeztah/24.0_backport_fix_cli_plugins_metadata_experimental_deprecation
...
[24.0 backport] cli-plugins/manager: fix deprecation comment of Metadata.Experimental
2023-05-11 16:42:02 +02:00
46615e8724
Merge pull request #4275 from thaJeztah/24.0_backport_update_tag_documentation
...
[24.0 backport] Update tag docs to clarify name
2023-05-10 21:14:31 +02:00
cafdcf283e
cli-plugins/manager: fix deprecation comment of Metadata.Experimental
...
This field was marked deprecated in 977d3ae046 ,
which is part of v20.10 and up, but the comment was missing a newline before
the deprecation message, which may be picked up by IDEs, but is not matching
the correct format, so may not be picked up by linters.
This patch fixes the format, to make sure linters pick up that the field is
deprecated.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 72e3813ab9 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-05-09 22:23:10 +02:00
3768143c2e
Update tag docs to clarify name
...
Signed-off-by: Craig Osterhout <craig.osterhout@docker.com >
(cherry picked from commit 4119d268e7 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-05-09 22:08:47 +02:00
59e9fbd497
Merge pull request #4271 from dvdksn/24.0_backport_docs/host-flag
...
[24.0 Backport] docs: add description and examples for docker -H
2023-05-08 15:33:22 +02:00
52ac1a974c
docs: update description for docker -H flag
...
Signed-off-by: David Karlsson <david.karlsson@docker.com >
(cherry picked from commit 759fa585cf )
Signed-off-by: David Karlsson <david.karlsson@docker.com >
2023-05-08 15:16:07 +02:00
f25ae85b8e
Merge pull request #4264 from thaJeztah/24.0_backport_vendor_docker_24.0.0-rc.2
...
[24.0 backport] vendor: github.com/docker/docker v24.0.0-rc.2
2023-05-08 08:56:26 +02:00
58f37f630c
vendor: github.com/docker/docker v24.0.0-rc.2
...
no diff, because it's the same as the previous commit, but now tagged;
8d9a40a820 ...v24.0.0-rc.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 1d8e2b6525 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-05-06 13:55:17 +02:00
8fc956ce77
Merge pull request #4244 from thaJeztah/update_engine_next
...
build / prepare (push) Waiting to run
build / build (push) Blocked by required conditions
build / prepare-plugins (push) Waiting to run
build / plugins (push) Blocked by required conditions
e2e / e2e (19.03-dind, non-experimental) (push) Waiting to run
e2e / e2e (alpine, stable-dind, connhelper-ssh) (push) Waiting to run
e2e / e2e (alpine, stable-dind, experimental) (push) Waiting to run
e2e / e2e (alpine, stable-dind, non-experimental) (push) Waiting to run
e2e / e2e (bullseye, stable-dind, connhelper-ssh) (push) Waiting to run
e2e / e2e (bullseye, stable-dind, experimental) (push) Waiting to run
e2e / e2e (bullseye, stable-dind, non-experimental) (push) Waiting to run
test / ctn (push) Waiting to run
test / host (macos-11) (push) Waiting to run
validate / validate (lint) (push) Waiting to run
validate / validate (shellcheck) (push) Waiting to run
validate / validate (update-authors) (push) Waiting to run
validate / validate (validate-vendor) (push) Waiting to run
validate / validate-md (push) Waiting to run
validate / validate-make (manpages) (push) Waiting to run
validate / validate-make (yamldocs) (push) Waiting to run
vendor: github.com/docker/docker github.com/docker/docker v24.0.0-rc.1.0.20230505222407-8d9a40a82034 (v24.0.0-rc.2)
v24.0.0-rc.2
2023-05-06 01:32:38 +02:00
f4201b9302
Merge pull request #4073 from panekj/feat/ssh-socket-path
...
connhelper: Allow socket path when using SSH
2023-05-05 15:50:18 -07:00
9f15ba0d13
Merge pull request #4156 from AkihiroSuda/docker-run-annotation
...
cli/command/container: implement `docker run --annotation`
2023-05-06 00:49:15 +02:00
4f97f55999
vendor: github.com/docker/docker v24.0.0-rc.1.0.20230505222407-8d9a40a82034
...
This will be v24.0.0-rc.2
full diff: https://github.com/docker/docker/compare/v24.0.0-rc.1...8d9a40a820349860405e142249c55215aa4da8e3
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-05-06 00:34:34 +02:00
0428418d6b
vendor: github.com/containerd/containerd v1.6.21
...
no changes in vendored files
full diff: https://github.com/containerd/containerd/compare/v1.6.20...v1.6.21
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-05-06 00:30:50 +02:00
05bf6fff2e
vendor: github.com/opencontainers/runc v1.1.7
...
full diff: https://github.com/opencontainers/runc/compare/v1.1.6...v1.1.7
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-05-06 00:27:51 +02:00
b403a49207
Merge pull request #4251 from thaJeztah/update_runewidth
...
vendor: github.com/mattn/go-runewidth v0.0.14
2023-05-05 10:25:04 +02:00
44fce07069
vendor: github.com/mattn/go-runewidth v0.0.14
...
Contains various performance optimisations.
full diff: https://github.com/mattn/go-runewidth/compare/v0.0.13...v0.0.14
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-05-05 02:37:12 +02:00
f7600fb539
Merge pull request #4253 from thaJeztah/update_go1.20.4
...
update go to go1.20.4
2023-05-04 12:51:12 +02:00
fd0621d0fe
update go to go1.20.4
...
go1.20.4 (released 2023-05-02) includes three security fixes to the html/template
package, as well as bug fixes to the compiler, the runtime, and the crypto/subtle,
crypto/tls, net/http, and syscall packages. See the Go 1.20.4 milestone on our
issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.20.4+label%3ACherryPickApproved
release notes: https://go.dev/doc/devel/release#go1.20.4
full diff: https://github.com/golang/go/compare/go1.20.3...go1.20.4
from the announcement:
> These minor releases include 3 security fixes following the security policy:
>
> - html/template: improper sanitization of CSS values
>
> Angle brackets (`<>`) were not considered dangerous characters when inserted
> into CSS contexts. Templates containing multiple actions separated by a '/'
> character could result in unexpectedly closing the CSS context and allowing
> for injection of unexpected HMTL, if executed with untrusted input.
>
> Thanks to Juho Nurminen of Mattermost for reporting this issue.
>
> This is CVE-2023-24539 and Go issue https://go.dev/issue/59720 .
>
> - html/template: improper handling of JavaScript whitespace
>
> Not all valid JavaScript whitespace characters were considered to be
> whitespace. Templates containing whitespace characters outside of the character
> set "\t\n\f\r\u0020\u2028\u2029" in JavaScript contexts that also contain
> actions may not be properly sanitized during execution.
>
> Thanks to Juho Nurminen of Mattermost for reporting this issue.
>
> This is CVE-2023-24540 and Go issue https://go.dev/issue/59721 .
>
> - html/template: improper handling of empty HTML attributes
>
> Templates containing actions in unquoted HTML attributes (e.g. "attr={{.}}")
> executed with empty input could result in output that would have unexpected
> results when parsed due to HTML normalization rules. This may allow injection
> of arbitrary attributes into tags.
>
> Thanks to Juho Nurminen of Mattermost for reporting this issue.
>
> This is CVE-2023-29400 and Go issue https://go.dev/issue/59722 .
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-05-03 20:59:02 +02:00
054343be38
Merge pull request #4181 from thaJeztah/pass_streams_not_cli
...
cli/command/system: add utilities for printing, don't pass CLI if not needed
2023-05-03 16:43:21 +02:00
7d72214202
Merge pull request #4248 from thaJeztah/update_moby_term
...
vendor: github.com/moby/term v0.5.0
2023-05-03 16:13:52 +02:00
155f7d9e2b
cli/command/system: add utilities for printing
...
Adding some utilities to print the output, to keep the linters happier
without having to either suppress errors, or ignore them.
Perhaps we should consider adding utilities for this on the "command.Streams"
outputs.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-05-02 16:55:12 +02:00
1e89037d72
cli/command/system: prettyInfo: accept Streams
...
No need to pass whole of DockerCLI, as all it needs is the outputs.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-05-02 16:54:05 +02:00
8cfefc6ea2
cli/command/system: prettyPrintServerInfo: accept Streams
...
No need to pass whole of DockerCLI, as all it needs is the outputs.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-05-02 16:51:32 +02:00
ba7a200f0a
cli/command/system: prettyPrintClientInfo: accept Streams
...
No need to pass whole of DockerCLI, as all it needs is the outputs.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-05-02 16:50:54 +02:00
73938cd618
cli/command/system: printSwarmInfo(): accept io.Writer
...
Don't require whole of DockerCLI to be passed, as all we need is a writer.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-05-02 16:50:29 +02:00
2d0ea86b0a
cli/command/system: use io.Writer for printing warnings
...
Don't require whole of DockerCLI to be passed, as all we need is a writer.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-05-02 16:17:00 +02:00
be6f4cd56c
cli/command/system: prettyPrintServerInfo: refactor printing "runtimes"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-05-02 16:05:52 +02:00
1d70f7cdb4
cli/command/system: prettyPrintServerInfo: rename var that collided with import
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-05-02 16:01:46 +02:00
416e55bedb
github.com/docker/cli/cli/command/system: add BenchmarkPrettyPrintInfo
...
goos: linux
goarch: arm64
pkg: github.com/docker/cli/cli/command/system
BenchmarkPrettyPrintInfo
BenchmarkPrettyPrintInfo-5 189028 6156 ns/op 1776 B/op 88 allocs/op
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-05-02 15:49:16 +02:00
f233becf91
vendor: github.com/moby/term v0.5.0
...
- split exported functions from implementation
- windows: IsConsole(): fix deprecation comment
- deprecate Termios in favor of unix.Termios
- windows: keyToString(): fix string conversion
- gha: update actions, add macOS, and add Go1.20
- gha: add windows
full diff: https://github.com/moby/term/compare/c43b287e0e0f...v0.5.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-05-02 14:22:36 +02:00
afd320c5ab
Merge pull request #4236 from thaJeztah/update_engine
...
vendor: github.com/docker/docker v24.0.0-rc.1
2023-05-02 11:06:54 +02:00
bd2c26328f
vendor: github.com/docker/docker v24.0.0-rc.1
...
full diff: https://github.com/docker/docker/compare/v24.0.0-beta.2...v24.0.0-rc.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-04-28 17:56:17 +02:00
69181952e1
Merge pull request #4242 from thaJeztah/dont_use_deprecated_virtualsize
...
remove uses of deprecated VirtualSize field
2023-04-28 15:51:49 +02:00
f02301ab5d
remove uses of deprecated VirtualSize field
...
The VirtualSize field is deprecated and the upcoming API version v1.44
will no longer propagate the field. See:
1261fe69a3 ,
Given that in docker 1.10 and up (API v1.22), the VirtualSize and Size
fields contain the same value, and the "df" endpoint was not supported
until API v1.25, we can "safely" use Size instead; see:
- 4ae7176ffb
- 4352da7803
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-04-28 14:58:53 +02:00
59b07b7253
Merge pull request #4045 from vvoland/test-e2e-arm64-fixes
...
test/e2e: Fix running `test-e2e` on non-amd64 platforms
2023-04-27 11:41:43 +02:00
eeaaf5d016
e2e: Update alpine to 3.17.2
...
Previous one was linux/amd64 only.
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2023-04-27 10:58:02 +02:00
4569378ca6
e2e: Match notary server version with the main Dockerfile
...
notary server version 0.5.0 is linux/amd64 only.
Also, e2e stage from top level Dockerfile uses 0.6.1 notary version -
change the Dockerfiles in e2e/testdata to have the same version.
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2023-04-27 10:57:59 +02:00
ec5504a83f
test/e2e: Use "frozen" tag to reference test images
...
This makes it possible to update the image loaded for e2e tests without
modifying all tests that use them.
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2023-04-27 10:57:57 +02:00
41b6ec07ce
e2e: Skip tests with platform-specific digests on other platforms
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2023-04-27 10:57:56 +02:00
b9e84d6817
Merge pull request #4235 from thaJeztah/update_engine_deps
...
update docker dependencies in preparation of v24.0.0-rc.1
2023-04-27 10:57:36 +02:00
962e22c311
vendor: github.com/moby/swarmkit/v2 v2.0.0-20230406225228-75e92ce14ff7
...
full diff: e28e8ba9bc...75e92ce14f
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-04-27 02:22:45 +02:00
72192c75c2
vendor: github.com/moby/buildkit v0.11.6
...
no changes in vendored files
full diff: https://github.com/moby/buildkit/compare/v0.11.5...v0.11.6
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-04-27 02:21:59 +02:00
c177e2060d
vendor: github.com/creack/pty v1.1.18
...
full diff: https://github.com/creack/pty/compare/v1.1.11...v1.1.18
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-04-27 02:20:43 +02:00
eabb927811
Merge pull request #4144 from ChrisChinchilla/chrisward/cmd-run-refresh
...
build / prepare (push) Waiting to run
build / build (push) Blocked by required conditions
build / prepare-plugins (push) Waiting to run
build / plugins (push) Blocked by required conditions
e2e / e2e (19.03-dind, non-experimental) (push) Waiting to run
e2e / e2e (alpine, stable-dind, connhelper-ssh) (push) Waiting to run
e2e / e2e (alpine, stable-dind, experimental) (push) Waiting to run
e2e / e2e (alpine, stable-dind, non-experimental) (push) Waiting to run
e2e / e2e (bullseye, stable-dind, connhelper-ssh) (push) Waiting to run
e2e / e2e (bullseye, stable-dind, experimental) (push) Waiting to run
e2e / e2e (bullseye, stable-dind, non-experimental) (push) Waiting to run
test / ctn (push) Waiting to run
test / host (macos-11) (push) Waiting to run
validate / validate (lint) (push) Waiting to run
validate / validate (shellcheck) (push) Waiting to run
validate / validate (update-authors) (push) Waiting to run
validate / validate (validate-vendor) (push) Waiting to run
validate / validate-md (push) Waiting to run
validate / validate-make (manpages) (push) Waiting to run
validate / validate-make (yamldocs) (push) Waiting to run
Docs freshness updates to Docker run command docs
v24.0.0-rc.1
2023-04-26 16:20:45 +02:00
e693e7f3b4
Docs freshness updates
...
Signed-off-by: Chris Chinchilla <chris.ward@docker.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-04-26 15:37:12 +02:00
6d58b07ac6
Merge pull request #4219 from thaJeztah/update_graphderiver_deprecation
...
docs: update deprecation status of "overlay" and "AuFS"
2023-04-26 15:22:41 +02:00