Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,975 Commits 11 Branches 241 Tags 240 MiB
Commit Graph

9975 Commits

Author SHA1 Message Date
Sebastiaan van Stijn c8c13bdcac
docs/deprecated: update status for graphdriver-plugins 
Add a mention of the feature being disabled by default, and
the DOCKERD_DEPRECATED_GRAPHDRIVER_PLUGINS env-var.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-21 15:03:53 +02:00
Sebastiaan van Stijn 1f7561ecbb
Dockerfile: update compose to v2.28.0 
release notes: https://github.com/docker/compose/releases/tag/v2.28.0

full diff: https://github.com/docker/compose/compare/v2.27.1...v2.28.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-21 14:52:22 +02:00
Paweł Gronowski 886661427e
Merge pull request #5183 from thaJeztah/bump_docker 
vendor: github.com/docker/docker v27.0.1-rc.1
 2024-06-21 13:44:37 +02:00
Sebastiaan van Stijn 1a04810073
vendor: github.com/docker/docker v27.0.1-rc.1 
no diff;  same commit, but tagged.

full diff: https://github.com/docker/docker/compare/018d93decfb5...v27.0.1-rc.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-20 23:53:47 +02:00
Sebastiaan van Stijn b83cf582cd
Merge pull request #5178 from thaJeztah/buildkit_windows 
build: allow BuildKit to be used on Windows daemons that advertise it
 2024-06-20 18:46:41 +02:00
Paweł Gronowski 0d415ad0e9
Merge pull request #5171 from Benehiko/feat-global-force-exit 
fix: force cli to exit after third sigint/sigterm
 2024-06-20 17:49:07 +02:00
Alano Terblanche faf7647dcf
refactor: remove test 
Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com>
 2024-06-20 17:03:33 +02:00
Paweł Gronowski d8cdcaee23
Merge pull request #3599 from thaJeztah/use_local_ConvertToHostname 
use local ConvertToHostname() implementation
 2024-06-20 16:29:30 +02:00
Sebastiaan van Stijn 623fcd5489
Merge pull request #5180 from vvoland/docker-27.0-rc 
vendor: github.com/docker/docker v27.0-dev (018d93decfb5)
 2024-06-20 15:17:22 +02:00
Paweł Gronowski d1cb7d41c2
cli/command: Don't copy fakeClient 
The embedded `client.Client` has mutexes and it shouldn't be copied.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
 2024-06-20 14:59:38 +02:00
Alano Terblanche 1322f585fe
test: cli force exit signal handler 
Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com>
 2024-06-20 14:32:38 +02:00
Paweł Gronowski 34d42bdf0c
vendor: github.com/docker/docker v27.0-dev (018d93decfb5) 
full diff: 1a1f3cff45...018d93decf

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
 2024-06-20 14:00:27 +02:00
Paweł Gronowski 334421b6b4
Merge pull request #5179 from thaJeztah/update_mailmap_authors 
update mailmap and AUTHORS
 2024-06-20 13:51:31 +02:00
Paweł Gronowski 2fee28cb58
Merge pull request #5170 from thaJeztah/bump_engine2 
vendor: github.com/docker/docker 1a1f3cff45ec (master, v27.0-dev)
 2024-06-20 13:41:55 +02:00
Sebastiaan van Stijn 443617c0f1
update mailmap and AUTHORS 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-20 13:22:11 +02:00
Sebastiaan van Stijn 2088c5963b
vendor: github.com/docker/docker 1a1f3cff45ec (master, v27.0-dev) 
Rewrite local code to use the new container.Ulimit alias to start
transitioning away from direct uses of go-units.Ulimit.

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

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-20 13:04:54 +02:00
Paweł Gronowski aebdf506bc
Merge pull request #3975 from IJMacD/patch-1 
Fix RFC3339 typo in docs
 2024-06-20 12:36:09 +02:00
Iain MacDonald 64c20f3013
Additional typo corrections 
Signed-off-by: Iain MacDonald <ijmacd@gmail.com>
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
 2024-06-20 12:18:43 +02:00
Iain MacDonald a84536eb4a Fix RFC3339 typo in docs 
Signed-off-by: Iain MacDonald <ijmacd@gmail.com>
 2024-06-20 12:18:28 +02:00
Sebastiaan van Stijn 158348412d
Merge pull request #5177 from thaJeztah/pluginmanager_godoc 
cli-plugins/manager: add GoDoc for getPluginDirs, defaultSystemPluginDirs
 2024-06-20 11:30:05 +02:00
Sebastiaan van Stijn ae21e83244
Merge pull request #5175 from thaJeztah/bump_cobra2 
vendor: github.com/spf13/cobra v1.8.1
 2024-06-20 11:29:39 +02:00
Sebastiaan van Stijn 9b47c14430
Merge pull request #5174 from thaJeztah/bump_go_md2man 
update go-md2man to v2.0.4
 2024-06-20 11:29:22 +02:00
Sebastiaan van Stijn 3cc2d27d99
Merge pull request #5173 from thaJeztah/bump_buildx 
Dockerfile: update buildx to v0.15.1
 2024-06-20 11:29:05 +02:00
Sebastiaan van Stijn e5d26a8d40
build: allow BuildKit to be used on Windows daemons that advertise it 
Commit 6fef143dbc switched the CLI to use
BuildKit by default, but as part of that removed the use of the
BuildkitVersion field as returned by Ping.

Some follow-up changes in commits e38e6c51ff and
e7a8748b93 updated the logic for detecting whether
BuildKit should be used or the legacy builder, but hard-coded using the
legacy builder for Windows daemons.

While Windows / WCOW does not yet support BuildKit by default, there is
work in progress to implement it, so we should not hard-code the assumption
that a Windows daemon cannot support BuildKit.

On the daemon-side, [moby@7b153b9] (Docker v23.0) changed the default as
advertised by the daemon to be BuildKit for Linux daemons. That change
still hardcoded BuildKit to be unsupported for Windows daemons (and does
not yet allow overriding the config), but this may change for future
versions of the daemon, or test-builds.

This patch:

- Re-introduces checks for the BuildkitVersion field in the "Ping" response.
- If the Ping response from the daemon advertises that it supports BuildKit,
  the CLI will now use BuildKit as builder.
- If we didn't get a Ping response, or the Ping response did NOT advertise
  that the daemon supported BuildKit, we continue to use the current
  defaults (BuildKit for Linux daemons, and the legacy builder for Windows)
- Handling of the DOCKER_BUILDKIT environment variable is unchanged; for
  CLI.BuildKitEnabled, DOCKER_BUILDKIT always takes precedence, and for
  processBuilder the value is taken into account, but will print a warning
  when BuildKit is disabled and a Linux daemon is used. For Windows daemons,
  no warning is printed.

[moby@7b153b9]: 7b153b9e28

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-20 02:49:22 +02:00
Sebastiaan van Stijn 55a1f6eb73
cli-plugins/manager: add GoDoc for getPluginDirs, defaultSystemPluginDirs 
Add some documentation about their purpose, and document order of preference
when resolving plugins.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-19 14:02:40 +02:00
Sebastiaan van Stijn 4f00eee524
vendor: github.com/spf13/cobra v1.8.1 
- release notes: https://github.com/spf13/cobra/releases/tag/v1.8.1
- full diff: https://github.com/spf13/cobra/compare/v1.8.0...v1.8.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-18 21:52:58 +02:00
Sebastiaan van Stijn 00b0eb7781
update go-md2man to v2.0.4 
full diff: https://github.com/cpuguy83/go-md2man/compare/v2.0.4...v2.0.4

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-18 21:47:47 +02:00
Sebastiaan van Stijn b0793613a6
Dockerfile: update buildx to v0.15.1 
This is the version used in the dev-container, and for testing.

release notes:
https://github.com/docker/buildx/releases/tag/v0.15.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-18 21:33:02 +02:00
Sebastiaan van Stijn 64206aef76
Merge pull request #5172 from thaJeztah/deprecate_graphdriver_plugins 
Deprecate experimental graphdriver plugins
 2024-06-18 17:14:00 +02:00
Sebastiaan van Stijn 0bc092496f
deprecate experimental graphdriver plugins 
[Graphdriver plugins] are an experimental feature that allow extending the
Docker Engine with custom storage drivers for storing images and containers.
This feature was not maintained since its inception, and will no longer be
supported in upcoming releases.

Users of this feature are recommended to instead configure the Docker Engine
to use the [containerd image store], and a custom [snapshotter].

[Graphdriver plugins]: https://github.com/docker/cli/blob/v26.1.4/docs/extend/plugins_graphdriver.md
[containerd image store]: 31a16f1da2/content/storage/containerd.md
[snapshotter]: https://github.com/containerd/containerd/tree/v1.7.18/docs/snapshotters

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-18 16:47:00 +02:00
Sebastiaan van Stijn 1f1b70dfdf
docs: add deprecation warning to experimental grapdriver plugins 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-18 16:18:07 +02:00
Alano Terblanche a4bfd8c744
feat: add a global sigint/sigterm handler as a fallback to ctx cancellation 
Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com>
 2024-06-18 15:42:34 +02:00
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