Commit Graph

9843 Commits

Author SHA1 Message Date
Sebastiaan van Stijn 468a76779d
Merge pull request #5169 from thaJeztah/bump_swarmkit
vendor: github.com/moby/swarmkit/v2 v2.0.0-20240611172349-ea1a7cec35cb
2024-06-18 15:04:39 +02:00
Sebastiaan van Stijn f52570645c
Merge pull request #5165 from thaJeztah/gha_test_27
gha: e2e: test against v27.0 release candidates
2024-06-18 14:59:58 +02:00
Sebastiaan van Stijn 32031fb5ab
Merge pull request #5167 from thaJeztah/bump_engine
vendor: github.com/docker/docker v27.0.0-rc.2
2024-06-18 14:59:38 +02:00
Sebastiaan van Stijn eae63069e6
vendor: github.com/moby/swarmkit/v2 v2.0.0-20240611172349-ea1a7cec35cb
Update the version to match what's used in docker/docker.

Full diff: c1c857e2dc...ea1a7cec35

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-18 14:32:49 +02:00
Sebastiaan van Stijn 3d017f30d6
vendor: github.com/docker/docker v27.0.0-rc.2
No diff as it's the same commit, but tagged. Just for transparency to
allow seeing differences between rc's.

full diff: https://github.com/docker/docker/compare/caf502a0bc44...v27.0.0-rc.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-18 14:03:41 +02:00
Sebastiaan van Stijn 20cba0a2ee
Merge pull request #5164 from thaJeztah/bump_version
bump version to v27.0.1-dev
2024-06-18 13:59:34 +02:00
Sebastiaan van Stijn e0972e94b8
gha: e2e: test against v27.0 release candidates
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-18 13:32:40 +02:00
Sebastiaan van Stijn 43210216ff
bump version to v27.0.1-dev
This file is only used as default if no version is specified. We
should probably get rid of this, but let's update it to better
reflect the version that developer builds are building.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-18 13:29:00 +02:00
Sebastiaan van Stijn 70b53a0c15
Merge pull request #5163 from thaJeztah/bump_gobuild_tags
Update go:build comments to go1.21
2024-06-18 13:23:59 +02:00
Sebastiaan van Stijn c07cee05e2
Update go:build comments to go1.21
Match the minimum version that's specified on our vendor.mod.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-18 12:17:13 +02:00
Sebastiaan van Stijn 860a139930
Merge pull request #5162 from thaJeztah/fix_goversion
cli/command/image: add go:build tag to prevent downgrading go version
2024-06-18 12:15:24 +02:00
Sebastiaan van Stijn 1fd8e2434b
cli/command/image: add go:build tag to prevent downgrading go version
Before this:

    make shell
    make -C ./internal/gocompat/
    ...

    GO111MODULE=on go test -v
    # github.com/docker/cli/cli/command/image
    ../../cli/command/image/push.go:177:62: predeclared any requires go1.18 or later (-lang was set to go1.16; check go.mod)
    FAIL	gocompat [build failed]
    make: *** [Makefile:3: verify] Error 1
    make: Leaving directory '/go/src/github.com/docker/cli/internal/gocompat'

After this patch:

    make shell
    make -C ./internal/gocompat/
    ...

    GO111MODULE=on go test -v
    === RUN   TestModuleCompatibllity
        main_test.go:133: all packages have the correct go version specified through //go:build
    --- PASS: TestModuleCompatibllity (0.00s)
    PASS
    ok  	gocompat	0.007s
    make: Leaving directory '/go/src/github.com/docker/cli/internal/gocompat'

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-18 11:59:39 +02:00
Sebastiaan van Stijn 69041853a8
Merge pull request #5161 from docker/dependabot/github_actions/docker/bake-action-5
build(deps): bump docker/bake-action from 4 to 5
2024-06-18 10:48:02 +02:00
dependabot[bot] c8f5d4cc6d
build(deps): bump docker/bake-action from 4 to 5
Bumps [docker/bake-action](https://github.com/docker/bake-action) from 4 to 5.
- [Release notes](https://github.com/docker/bake-action/releases)
- [Commits](https://github.com/docker/bake-action/compare/v4...v5)

---
updated-dependencies:
- dependency-name: docker/bake-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-18 08:07:28 +00:00
Sebastiaan van Stijn e06bee6999
Merge pull request #5160 from vvoland/docker-27.0-rc
vendor: github.com/docker/docker caf502a0bc44 (v27.0.0-dev)
2024-06-17 17:41:59 +02:00
Paweł Gronowski 3b0d297aab
vendor: github.com/docker/docker caf502a0bc44 (v27.0.0-dev)
full diff: ec4bac431c...caf502a0bc

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-06-17 17:08:30 +02:00
Paweł Gronowski bc291f0c98
Merge pull request #5158 from vvoland/docker-27.0-rc
vendor: github.com/docker/docker ec4bac431c88 (v27.0.0-dev)
2024-06-17 10:29:38 +02:00
Paweł Gronowski 11a3d8728b
vendor: github.com/docker/docker ec4bac431c88 (v27.0.0-dev)
full diff: ba69bd9c1e...ec4bac431c

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-06-17 10:18:07 +02:00
Sebastiaan van Stijn d69d501f69
Merge pull request #5155 from vvoland/docker-27.0-rc
vendor: github.com/docker/docker ba69bd9c1e48 (v27.0.0-rc.2-dev)
2024-06-14 22:36:48 +02:00
Paweł Gronowski 1bfec63b9f
vendor: github.com/docker/docker ba69bd9c1e48 (v27.0.0-rc.2-dev)
full diff: https://github.com/docker/docker/compare/v27.0.0-rc.1...ba69bd9c1e48

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-06-14 21:42:52 +02:00
Sebastiaan van Stijn 8376b3e428
use local ConvertToHostname() implementation
Commit 27b2797f7d added a local implementation
of this function, so let's use the local variant to (slightly) reduce the
dependency on moby's registry package.

Also made some minor cleanups.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-14 00:25:21 +02:00
Sebastiaan van Stijn 925e7d6870
Merge pull request #5153 from thaJeztah/bump_x_deps
vendor: golang.org/x/sys v0.19.0, golang.org/x/term v0.19.0, golang.org/x/crypto v0.22.0, golang.org/x/net v0.24.0
2024-06-13 23:41:10 +02:00
Sebastiaan van Stijn 4ea91a73ee
vendor: golang.org/x/net v0.24.0
no changes in vendored code

full diff: https://github.com/golang/net/compare/v0.23.0...v0.24.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-13 18:19:48 +02:00
Sebastiaan van Stijn 91b63ac450
vendor: golang.org/x/crypto v0.22.0
no changes in vendored code

full diff: https://github.com/golang/crypto/compare/v0.21.0...v0.22.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-13 18:18:36 +02:00
Sebastiaan van Stijn a2ccd3eb00
vendor: golang.org/x/term v0.19.0
no changes in vendored code

full diff: https://github.com/golang/term/compare/v0.18.0...v0.19.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-13 18:17:46 +02:00
Sebastiaan van Stijn 634b19f5ed
vendor: golang.org/x/sys v0.19.0
full diff: https://github.com/golang/sys/compare/v0.18.0...v0.19.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-13 18:14:41 +02:00
Paweł Gronowski 8bcd7f3ee1
Merge pull request #5152 from thaJeztah/bump_engine_27.0.0-rc.1
vendor: github.com/docker/docker v27.0.0-rc.1
2024-06-13 11:02:51 +02:00
Sebastiaan van Stijn 872935f1c0
vendor: github.com/docker/docker v27.0.0-rc.1
no changes in vendored code

full diff: https://github.com/docker/docker/compare/bcd280a3ed2d...v27.0.0-rc.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-12 23:46:01 +02:00
Sebastiaan van Stijn 9dabf16f76
Merge pull request #5146 from laurazard/close-plugin-server
plugins: cleanup sockets when done
2024-06-12 15:00:55 +02:00
Paweł Gronowski 504162642f
Merge pull request #5151 from vvoland/docker-27.0-rc
vendor: github.com/docker/docker v27.0.0-dev (bcd280a3ed2d)
2024-06-12 14:52:00 +02:00
Paweł Gronowski 1fc73b470b
vendor: github.com/docker/docker v27.0.0-dev (bcd280a3ed2d)
full diff: 9d9488468f...bcd280a3ed

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-06-12 13:59:03 +02:00
Sebastiaan van Stijn 540b28e7bb
Merge pull request #5150 from thaJeztah/extend_non_tls_api_deprecation
docs: extend deprecation target for non-TLS API
2024-06-12 13:58:10 +02:00
Sebastiaan van Stijn 1671ee8b49
Merge pull request #5142 from thaJeztah/deprecate_image_config_fields
Deprecate non-standard (config) fields in image inspect output
2024-06-12 13:53:39 +02:00
Sebastiaan van Stijn e9c0fc330c
docs: extend deprecation target for non-TLS API
No work has started yet on the deprecation, so extending the time-
window.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-12 13:40:43 +02:00
Sebastiaan van Stijn 70118aebef
Merge pull request #5148 from thaJeztah/remove_deprecated_eventhandler
cli/command: remove deprecated EventHandler, InitEventHandler
2024-06-12 12:55:51 +02:00
Laura Brehm 3dcc653533
plugins: cleanup sockets when done
Since 509123f935, we've been leaking sockets
in the filesystem on platforms where abstract sockets aren't supported.

That change relied on Go to cleanup our sockets for us, which Go will happily
do as long as we make sure to close the listener, which we weren't previously
doing unless to signal the plugin to terminate.

This change adds a deferred call to `PluginServer.Close()`, which makes sure we
close the plugin server at the end of the plugin execution, so that we never exit
without cleaning up.

Signed-off-by: Laura Brehm <laurabrehm@hey.com>
2024-06-12 11:16:10 +01:00
Paweł Gronowski 7fbadef49b
Merge pull request #5147 from thaJeztah/bump_platforms
vendor: github.com/containerd/platforms v0.2.1
2024-06-12 09:48:00 +02:00
Sebastiaan van Stijn 8c6e43fd07
Merge pull request #5143 from vvoland/cli-err-wrapstream
cli: Wrap Err stream
2024-06-12 02:24:48 +02:00
Sebastiaan van Stijn b23bc8cacd
Merge pull request #5144 from onestay/onestay/fix-link
cli/command/registry: fix link to credential stores
2024-06-12 02:15:12 +02:00
Sebastiaan van Stijn f80d7182ca
cli/command: remove deprecated EventHandler, InitEventHandler
These were deprecated in 46afd26c45
in v26.0, and have no known users.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-12 01:21:51 +02:00
Sebastiaan van Stijn ad62b68693
vendor: github.com/containerd/platforms v0.2.1
- Remove hcsshim import from repo
    - un-exports GetOsVersion
- Update windows matcher to not compare empty os version

full diff: https://github.com/containerd/platforms/compare/v0.2.0...v0.2.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-12 00:57:47 +02:00
Sebastiaan van Stijn ed2d365653
Merge pull request #5141 from thaJeztah/carry_5040
Removed all mentions of "please" from docs and messages
2024-06-11 22:01:50 +02:00
Marius Meschter 6e7266a72a
cli/command/registry: fix link to credential stores
Signed-off-by: Marius Meschter <marius@meschter.me>
2024-06-11 18:31:25 +02:00
Paweł Gronowski 6b93cf221a
cli: Wrap Err stream
This wraps the cli stderr stream the same way as stdin and stdout, which
extends the stream with TTY-related methods.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-06-11 17:59:48 +02:00
Sebastiaan van Stijn 52eddcf4e4
Merge pull request #4984 from vvoland/c8d-multiplatform-push
cli/push: Add `platform` switch
2024-06-11 17:23:27 +02:00
Sebastiaan van Stijn b79d684653
Deprecate non-standard (config) fields in image inspect output
The `Config` field returned by this endpoint (used for "image inspect") returns
additional fields that are not part of the image's configuration and not part of
the [Docker Image Spec] and the [OCI Image Spec].

These additional fields are included in the response, due to an
implementation detail, where the [api/types.ImageInspec] type used
for the response is using the [container.Config] type.

The [container.Config] type is a superset of the image config, and while the
image's Config is used as a _template_ for containers created from the image,
the additional fields are set at runtime (from options passed when creating
the container) and not taken from the image Config.

These fields are never set (and always return the default value for the type),
but are not omitted in the response when left empty. As these fields were not
intended to be part of the image configuration response, they are deprecated,
and will be removed from the API.

The following fields are currently included in the API response, but
are not part of the underlying image's Config, and deprecated:

- `Hostname`
- `Domainname`
- `AttachStdin`
- `AttachStdout`
- `AttachStderr`
- `Tty`
- `OpenStdin`
- `StdinOnce`
- `Image`
- `NetworkDisabled` (already omitted unless set)
- `MacAddress` (already omitted unless set)
- `StopTimeout` (already omitted unless set)

[Docker image spec]: https://github.com/moby/docker-image-spec/blob/v1.3.1/specs-go/v1/image.go#L19-L32
[OCI Image Spec]: https://github.com/opencontainers/image-spec/blob/v1.1.0/specs-go/v1/config.go#L24-L62
[api/types.ImageInspec]: https://github.com/moby/moby/blob/v26.1.4/api/types/types.go#L87-L104
[container.Config]: https://github.com/moby/moby/blob/v26.1.4/api/types/container/config.go#L47-L82

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-11 17:08:20 +02:00
Grace Choi e06ef800fc
Removed all mentions of "please" from docs and messages
Signed-off-by: Grace Choi <gracechoi@utexas.edu>
Signed-off-by: Pranjal Rai <pranjalrai@utexas.edu>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-11 16:53:40 +02:00
Paweł Gronowski 32ac7a08f8
cli/push: Print aux notes
Print note when the multi-platform image was reduced to a single
manifest.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-06-11 16:39:49 +02:00
Paweł Gronowski 966fa7c475
cli/push: Add `platform` switch
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-06-11 16:39:48 +02:00
Paweł Gronowski 892784deed
vendor: github.com/docker/docker v27.0.0-dev (9d9488468fe2)
full diff: a736d0701c...9d9488468f

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-06-11 16:39:45 +02:00