Merge pull request #5171 from Benehiko/feat-global-force-exit

fix: force cli to exit after third sigint/sigterm
refactor: remove test
2026-11-11 23:33:40 -04:00 · 2024-06-20 17:49:07 +02:00 · 2024-06-20 17:03:33 +02:00 · 2024-06-20 16:29:30 +02:00 · 2024-06-20 15:17:22 +02:00 · 2024-06-20 14:59:38 +02:00
157 changed files with 1338 additions and 1030 deletions
@@ -61,7 +61,7 @@ jobs:
        uses: docker/setup-buildx-action@v3
      -
        name: Build
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v5
        with:
          targets: ${{ matrix.target }}
          set: |
@@ -122,7 +122,7 @@ jobs:
          password: ${{ secrets.DOCKERHUB_CLIBIN_TOKEN }}
      -
        name: Build and push image
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v5
        with:
          files: |
            ./docker-bake.hcl
@@ -168,7 +168,7 @@ jobs:
        uses: docker/setup-buildx-action@v3
      -
        name: Build
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v5
        with:
          targets: plugins-cross
          set: |
@@ -28,6 +28,7 @@ jobs:
          - alpine
          - debian
        engine-version:
+          - 27-rc # testing
          - 26.1  # latest
          - 25.0  # latest - 1
          - 23.0  # mirantis lts
@@ -26,7 +26,7 @@ jobs:
        uses: docker/setup-buildx-action@v3
      -
        name: Test
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v5
        with:
          targets: test-coverage
      -
@@ -31,7 +31,7 @@ jobs:
        uses: actions/checkout@v4
      -
        name: Run
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v5
        with:
          targets: ${{ matrix.target }}

@@ -22,7 +22,10 @@ Akihiro Matsushima <amatsusbit@gmail.com> <amatsus@users.noreply.github.com>
 Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> <suda.akihiro@lab.ntt.co.jp>
 Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> <suda.kyoto@gmail.com>
+Alano Terblanche <alano.terblanche@docker.com>
+Alano Terblanche <alano.terblanche@docker.com> <18033717+Benehiko@users.noreply.github.com>
 Albin Kerouanton <albinker@gmail.com>
+Albin Kerouanton <albinker@gmail.com> <557933+akerouanton@users.noreply.github.com>
 Albin Kerouanton <albinker@gmail.com> <albin@akerouanton.name>
 Aleksa Sarai <asarai@suse.de>
 Aleksa Sarai <asarai@suse.de> <asarai@suse.com>
@@ -88,6 +91,7 @@ Brian Goff <cpuguy83@gmail.com>
 Brian Goff <cpuguy83@gmail.com> <bgoff@cpuguy83-mbp.home>
 Brian Goff <cpuguy83@gmail.com> <bgoff@cpuguy83-mbp.local>
 Brian Tracy <brian.tracy33@gmail.com>
+Calvin Liu <flycalvin@qq.com>
 Carlos de Paula <me@carlosedp.com>
 Chad Faragher <wyckster@hotmail.com>
 Chander Govindarajan <chandergovind@gmail.com>
@@ -254,6 +258,7 @@ Jessica Frazelle <jess@oxide.computer> <jessfraz@google.com>
 Jessica Frazelle <jess@oxide.computer> <jfrazelle@users.noreply.github.com>
 Jessica Frazelle <jess@oxide.computer> <me@jessfraz.com>
 Jessica Frazelle <jess@oxide.computer> <princess@docker.com>
+Jim Chen <njucjc@gmail.com>
 Jim Galasyn <jim.galasyn@docker.com>
 Jiuyue Ma <majiuyue@huawei.com>
 Joey Geiger <jgeiger@gmail.com>
@@ -269,6 +274,8 @@ John Howard <github@lowenna.com> <jhowardmsft@users.noreply.github.com>
 John Howard <github@lowenna.com> <John.Howard@microsoft.com>
 John Howard <github@lowenna.com> <john.howard@microsoft.com>
 John Stephens <johnstep@docker.com> <johnstep@users.noreply.github.com>
+Jonathan A. Sternberg <jonathansternberg@gmail.com>
+Jonathan A. Sternberg <jonathansternberg@gmail.com> <jonathan.sternberg@docker.com>
 Jordan Arentsen <blissdev@gmail.com>
 Jordan Jennings <jjn2009@gmail.com> <jjn2009@users.noreply.github.com>
 Jorit Kleine-Möllhoff <joppich@bricknet.de> <joppich@users.noreply.github.com>
@@ -444,6 +451,7 @@ Roch Feuillade <roch.feuillade@pandobac.com>
 Roch Feuillade <roch.feuillade@pandobac.com> <46478807+rochfeu@users.noreply.github.com>
 Roman Dudin <katrmr@gmail.com> <decadent@users.noreply.github.com>
 Ross Boucher <rboucher@gmail.com>
+Rui JingAn <quiterace@gmail.com>
 Runshen Zhu <runshen.zhu@gmail.com>
 Ryan Stelly <ryan.stelly@live.com>
 Sakeven Jiang <jc5930@sina.cn>
@@ -524,6 +532,8 @@ Tim Bart <tim@fewagainstmany.com>
 Tim Bosse <taim@bosboot.org> <maztaim@users.noreply.github.com>
 Tim Ruffles <oi@truffles.me.uk> <timruffles@googlemail.com>
 Tim Terhorst <mynamewastaken+git@gmail.com>
+Tim Welsh <timothy.welsh@docker.com>
+Tim Welsh <timothy.welsh@docker.com> <84401379+twelsh-aw@users.noreply.github.com>
 Tim Zju <21651152@zju.edu.cn>
 Timothy Hobbs <timothyhobbs@seznam.cz>
 Toli Kuznets <toli@docker.com>
@@ -26,6 +26,7 @@ Akhil Mohan <akhil.mohan@mayadata.io>
 Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 Akim Demaille <akim.demaille@docker.com>
 Alan Thompson <cloojure@gmail.com>
+Alano Terblanche <alano.terblanche@docker.com>
 Albert Callarisa <shark234@gmail.com>
 Alberto Roura <mail@albertoroura.com>
 Albin Kerouanton <albinker@gmail.com>
@@ -65,6 +66,7 @@ Andrew Hsu <andrewhsu@docker.com>
 Andrew Macpherson <hopscotch23@gmail.com>
 Andrew McDonnell <bugs@andrewmcdonnell.net>
 Andrew Po <absourd.noise@gmail.com>
+Andrew-Zipperer <atzipperer@gmail.com>
 Andrey Petrov <andrey.petrov@shazow.net>
 Andrii Berehuliak <berkusandrew@gmail.com>
 André Martins <aanm90@gmail.com>
@@ -124,11 +126,13 @@ Bryan Bess <squarejaw@bsbess.com>
 Bryan Boreham <bjboreham@gmail.com>
 Bryan Murphy <bmurphy1976@gmail.com>
 bryfry <bryon.fryer@gmail.com>
+Calvin Liu <flycalvin@qq.com>
 Cameron Spear <cameronspear@gmail.com>
 Cao Weiwei <cao.weiwei30@zte.com.cn>
 Carlo Mion <mion00@gmail.com>
 Carlos Alexandro Becker <caarlos0@gmail.com>
 Carlos de Paula <me@carlosedp.com>
+Casey Korver <casey@korver.dev>
 Ce Gao <ce.gao@outlook.com>
 Cedric Davies <cedricda@microsoft.com>
 Cezar Sa Espinola <cezarsa@gmail.com>
@@ -160,6 +164,8 @@ Christophe Vidal <kriss@krizalys.com>
 Christopher Biscardi <biscarch@sketcht.com>
 Christopher Crone <christopher.crone@docker.com>
 Christopher Jones <tophj@linux.vnet.ibm.com>
+Christopher Petito <47751006+krissetto@users.noreply.github.com>
+Christopher Petito <chrisjpetito@gmail.com>
 Christopher Svensson <stoffus@stoffus.com>
 Christy Norman <christy@linux.vnet.ibm.com>
 Chun Chen <ramichen@tencent.com>
@@ -212,6 +218,7 @@ David Cramer <davcrame@cisco.com>
 David Dooling <dooling@gmail.com>
 David Gageot <david@gageot.net>
 David Karlsson <david.karlsson@docker.com>
+David le Blanc <systemmonkey42@users.noreply.github.com>
 David Lechner <david@lechnology.com>
 David Scott <dave@recoil.org>
 David Sheets <dsheets@docker.com>
@@ -298,6 +305,7 @@ Gang Qiao <qiaohai8866@gmail.com>
 Gary Schaetz <gary@schaetzkc.com>
 Genki Takiuchi <genki@s21g.com>
 George MacRorie <gmacr31@gmail.com>
+George Margaritis <gmargaritis@protonmail.com>
 George Xie <georgexsh@gmail.com>
 Gianluca Borello <g.borello@gmail.com>
 Gildas Cuisinier <gildas.cuisinier@gcuisinier.net>
@@ -306,6 +314,7 @@ Gleb Stsenov <gleb.stsenov@gmail.com>
 Goksu Toprak <goksu.toprak@docker.com>
 Gou Rao <gou@portworx.com>
 Govind Rai <raigovind93@gmail.com>
+Grace Choi <grace.54109@gmail.com>
 Graeme Wiebe <graeme.wiebe@gmail.com>
 Grant Reaber <grant.reaber@gmail.com>
 Greg Pflaum <gpflaum@users.noreply.github.com>
@@ -386,6 +395,7 @@ Jezeniel Zapanta <jpzapanta22@gmail.com>
 Jian Zhang <zhangjian.fnst@cn.fujitsu.com>
 Jie Luo <luo612@zju.edu.cn>
 Jilles Oldenbeuving <ojilles@gmail.com>
+Jim Chen <njucjc@gmail.com>
 Jim Galasyn <jim.galasyn@docker.com>
 Jim Lin <b04705003@ntu.edu.tw>
 Jimmy Leger <jimmy.leger@gmail.com>
@@ -416,6 +426,7 @@ John Willis <john.willis@docker.com>
 Jon Johnson <jonjohnson@google.com>
 Jon Zeolla <zeolla@gmail.com>
 Jonatas Baldin <jonatas.baldin@gmail.com>
+Jonathan A. Sternberg <jonathansternberg@gmail.com>
 Jonathan Boulle <jonathanboulle@gmail.com>
 Jonathan Lee <jonjohn1232009@gmail.com>
 Jonathan Lomas <jonathan@floatinglomas.ca>
@@ -470,6 +481,7 @@ Kevin Woblick <mail@kovah.de>
 khaled souf <khaled.souf@gmail.com>
 Kim Eik <kim@heldig.org>
 Kir Kolyshkin <kolyshkin@gmail.com>
+Kirill A. Korinsky <kirill@korins.ky>
 Kotaro Yoshimatsu <kotaro.yoshimatsu@gmail.com>
 Krasi Georgiev <krasi@vip-consult.solutions>
 Kris-Mikael Krister <krismikael@protonmail.com>
@@ -530,6 +542,7 @@ Marco Vedovati <mvedovati@suse.com>
 Marcus Martins <marcus@docker.com>
 Marianna Tessel <mtesselh@gmail.com>
 Marius Ileana <marius.ileana@gmail.com>
+Marius Meschter <marius@meschter.me>
 Marius Sturm <marius@graylog.com>
 Mark Oates <fl0yd@me.com>
 Marsh Macy <marsma@microsoft.com>
@@ -538,6 +551,7 @@ Mary Anthony <mary.anthony@docker.com>
 Mason Fish <mason.fish@docker.com>
 Mason Malone <mason.malone@gmail.com>
 Mateusz Major <apkd@users.noreply.github.com>
+Mathias Duedahl <64321057+Lussebullen@users.noreply.github.com>
 Mathieu Champlon <mathieu.champlon@docker.com>
 Mathieu Rollet <matletix@gmail.com>
 Matt Gucci <matt9ucci@gmail.com>
@@ -547,6 +561,7 @@ Matthew Heon <mheon@redhat.com>
 Matthieu Hauglustaine <matt.hauglustaine@gmail.com>
 Mauro Porras P <mauroporrasp@gmail.com>
 Max Shytikov <mshytikov@gmail.com>
+Max-Julian Pogner <max-julian@pogner.at>
 Maxime Petazzoni <max@signalfuse.com>
 Maximillian Fan Xavier <maximillianfx@gmail.com>
 Mei ChunTao <mei.chuntao@zte.com.cn>
@@ -610,6 +625,7 @@ Nathan McCauley <nathan.mccauley@docker.com>
 Neil Peterson <neilpeterson@outlook.com>
 Nick Adcock <nick.adcock@docker.com>
 Nick Santos <nick.santos@docker.com>
+Nick Sieger <nick@nicksieger.com>
 Nico Stapelbroek <nstapelbroek@gmail.com>
 Nicola Kabar <nicolaka@gmail.com>
 Nicolas Borboën <ponsfrilus@gmail.com>
@@ -704,6 +720,7 @@ Rory Hunter <roryhunter2@gmail.com>
 Ross Boucher <rboucher@gmail.com>
 Rubens Figueiredo <r.figueiredo.52@gmail.com>
 Rui Cao <ruicao@alauda.io>
+Rui JingAn <quiterace@gmail.com>
 Ryan Belgrave <rmb1993@gmail.com>
 Ryan Detzel <ryan.detzel@gmail.com>
 Ryan Stelly <ryan.stelly@live.com>
@@ -797,6 +814,7 @@ Tim Hockin <thockin@google.com>
 Tim Sampson <tim@sampson.fi>
 Tim Smith <timbot@google.com>
 Tim Waugh <twaugh@redhat.com>
+Tim Welsh <timothy.welsh@docker.com>
 Tim Wraight <tim.wraight@tangentlabs.co.uk>
 timfeirg <kkcocogogo@gmail.com>
 Timothy Hobbs <timothyhobbs@seznam.cz>
@@ -880,9 +898,11 @@ Zhang Wei <zhangwei555@huawei.com>
 Zhang Wentao <zhangwentao234@huawei.com>
 ZhangHang <stevezhang2014@gmail.com>
 zhenghenghuo <zhenghenghuo@zju.edu.cn>
+Zhiwei Liang <zliang@akamai.com>
 Zhou Hao <zhouhao@cn.fujitsu.com>
 Zhoulin Xie <zhoulin.xie@daocloud.io>
 Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
+Zhuo Zhi <h.dwwwwww@gmail.com>
 Álex González <agonzalezro@gmail.com>
 Álvaro Lázaro <alvaro.lazaro.g@gmail.com>
 Átila Camurça Alves <camurca.home@gmail.com>
@@ -8,7 +8,7 @@ ARG GO_VERSION=1.21.11
 ARG XX_VERSION=1.4.0
 ARG GOVERSIONINFO_VERSION=v1.3.0
 ARG GOTESTSUM_VERSION=v1.10.0
-ARG BUILDX_VERSION=0.14.1
+ARG BUILDX_VERSION=0.15.1
 ARG COMPOSE_VERSION=v2.27.1

 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
@@ -1 +1 @@
-25.0.0-dev
+27.0.1-dev
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package manager

@@ -49,6 +49,16 @@ func IsNotFound(err error) bool {
 	return ok
 }

+// getPluginDirs returns the platform-specific locations to search for plugins
+// in order of preference.
+//
+// Plugin-discovery is performed in the following order of preference:
+//
+// 1. The "cli-plugins" directory inside the CLIs [config.Path] (usually "~/.docker/cli-plugins").
+// 2. Additional plugin directories as configured through [ConfigFile.CLIPluginsExtraDirs].
+// 3. Platform-specific defaultSystemPluginDirs.
+//
+// [ConfigFile.CLIPluginsExtraDirs]: https://pkg.go.dev/github.com/docker/cli@v26.1.4+incompatible/cli/config/configfile#ConfigFile.CLIPluginsExtraDirs
 func getPluginDirs(cfg *configfile.ConfigFile) ([]string, error) {
 	var pluginDirs []string

@@ -2,7 +2,19 @@

 package manager

+// defaultSystemPluginDirs are the platform-specific locations to search
+// for plugins in order of preference.
+//
+// Plugin-discovery is performed in the following order of preference:
+//
+// 1. The "cli-plugins" directory inside the CLIs config-directory (usually "~/.docker/cli-plugins").
+// 2. Additional plugin directories as configured through [ConfigFile.CLIPluginsExtraDirs].
+// 3. Platform-specific defaultSystemPluginDirs (as defined below).
+//
+// [ConfigFile.CLIPluginsExtraDirs]: https://pkg.go.dev/github.com/docker/cli@v26.1.4+incompatible/cli/config/configfile#ConfigFile.CLIPluginsExtraDirs
 var defaultSystemPluginDirs = []string{
-	"/usr/local/lib/docker/cli-plugins", "/usr/local/libexec/docker/cli-plugins",
-	"/usr/lib/docker/cli-plugins", "/usr/libexec/docker/cli-plugins",
+	"/usr/local/lib/docker/cli-plugins",
+	"/usr/local/libexec/docker/cli-plugins",
+	"/usr/lib/docker/cli-plugins",
+	"/usr/libexec/docker/cli-plugins",
 }
@@ -5,6 +5,16 @@ import (
 	"path/filepath"
 )

+// defaultSystemPluginDirs are the platform-specific locations to search
+// for plugins in order of preference.
+//
+// Plugin-discovery is performed in the following order of preference:
+//
+// 1. The "cli-plugins" directory inside the CLIs config-directory (usually "~/.docker/cli-plugins").
+// 2. Additional plugin directories as configured through [ConfigFile.CLIPluginsExtraDirs].
+// 3. Platform-specific defaultSystemPluginDirs (as defined below).
+//
+// [ConfigFile.CLIPluginsExtraDirs]: https://pkg.go.dev/github.com/docker/cli@v26.1.4+incompatible/cli/config/configfile#ConfigFile.CLIPluginsExtraDirs
 var defaultSystemPluginDirs = []string{
 	filepath.Join(os.Getenv("ProgramData"), "Docker", "cli-plugins"),
 	filepath.Join(os.Getenv("ProgramFiles"), "Docker", "cli-plugins"),
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package command

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package config

@@ -162,7 +162,7 @@ func TestRunExec(t *testing.T) {
 	testcases := []struct {
 		doc           string
 		options       ExecOptions
-		client        fakeClient
+		client        *fakeClient
 		expectedError string
 		expectedOut   string
 		expectedErr   string
@@ -172,12 +172,12 @@ func TestRunExec(t *testing.T) {
 			options: withDefaultOpts(ExecOptions{
 				Detach: true,
 			}),
-			client: fakeClient{execCreateFunc: execCreateWithID},
+			client: &fakeClient{execCreateFunc: execCreateWithID},
 		},
 		{
 			doc:     "inspect error",
 			options: NewExecOptions(),
-			client: fakeClient{
+			client: &fakeClient{
 				inspectFunc: func(string) (types.ContainerJSON, error) {
 					return types.ContainerJSON{}, errors.New("failed inspect")
 				},
@@ -188,12 +188,13 @@ func TestRunExec(t *testing.T) {
 			doc:           "missing exec ID",
 			options:       NewExecOptions(),
 			expectedError: "exec ID empty",
+			client:        &fakeClient{},
 		},
 	}

 	for _, testcase := range testcases {
 		t.Run(testcase.doc, func(t *testing.T) {
-			fakeCLI := test.NewFakeCli(&testcase.client)
+			fakeCLI := test.NewFakeCli(testcase.client)

 			err := RunExec(context.TODO(), fakeCLI, "thecontainer", testcase.options)
 			if testcase.expectedError != "" {
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package container

@@ -30,7 +30,7 @@ func TestRunLogs(t *testing.T) {
 	testcases := []struct {
 		doc           string
 		options       *logsOptions
-		client        fakeClient
+		client        *fakeClient
 		expectedError string
 		expectedOut   string
 		expectedErr   string
@@ -39,13 +39,13 @@ func TestRunLogs(t *testing.T) {
 			doc:         "successful logs",
 			expectedOut: "foo",
 			options:     &logsOptions{},
-			client:      fakeClient{logFunc: logFn("foo"), inspectFunc: inspectFn},
+			client:      &fakeClient{logFunc: logFn("foo"), inspectFunc: inspectFn},
 		},
 	}

 	for _, testcase := range testcases {
 		t.Run(testcase.doc, func(t *testing.T) {
-			cli := test.NewFakeCli(&testcase.client)
+			cli := test.NewFakeCli(testcase.client)

 			err := runLogs(context.TODO(), cli, testcase.options)
 			if testcase.expectedError != "" {
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"

-	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/client"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -50,7 +50,7 @@ func (s *stats) isKnownContainer(cid string) (int, bool) {
 	return -1, false
 }

-func collect(ctx context.Context, s *Stats, cli client.APIClient, streamStats bool, waitFirst *sync.WaitGroup) {
+func collect(ctx context.Context, s *Stats, cli client.ContainerAPIClient, streamStats bool, waitFirst *sync.WaitGroup) {
 	logrus.Debugf("collecting stats for %s", s.Container)
 	var (
 		getFirst       bool
@@ -78,7 +78,7 @@ func collect(ctx context.Context, s *Stats, cli client.APIClient, streamStats bo
 	go func() {
 		for {
 			var (
-				v                      *types.StatsJSON
+				v                      *container.StatsResponse
 				memPercent, cpuPercent float64
 				blkRead, blkWrite      uint64 // Only used on Linux
 				mem, memLimit          float64
@@ -163,7 +163,7 @@ func collect(ctx context.Context, s *Stats, cli client.APIClient, streamStats bo
 	}
 }

-func calculateCPUPercentUnix(previousCPU, previousSystem uint64, v *types.StatsJSON) float64 {
+func calculateCPUPercentUnix(previousCPU, previousSystem uint64, v *container.StatsResponse) float64 {
 	var (
 		cpuPercent = 0.0
 		// calculate the change for the cpu usage of the container in between readings
@@ -182,7 +182,7 @@ func calculateCPUPercentUnix(previousCPU, previousSystem uint64, v *types.StatsJ
 	return cpuPercent
 }

-func calculateCPUPercentWindows(v *types.StatsJSON) float64 {
+func calculateCPUPercentWindows(v *container.StatsResponse) float64 {
 	// Max number of 100ns intervals between the previous time read and now
 	possIntervals := uint64(v.Read.Sub(v.PreRead).Nanoseconds()) // Start with number of ns intervals
 	possIntervals /= 100                                         // Convert to number of 100ns intervals
@@ -198,7 +198,7 @@ func calculateCPUPercentWindows(v *types.StatsJSON) float64 {
 	return 0.00
 }

-func calculateBlockIO(blkio types.BlkioStats) (uint64, uint64) {
+func calculateBlockIO(blkio container.BlkioStats) (uint64, uint64) {
 	var blkRead, blkWrite uint64
 	for _, bioEntry := range blkio.IoServiceBytesRecursive {
 		if len(bioEntry.Op) == 0 {
@@ -214,7 +214,7 @@ func calculateBlockIO(blkio types.BlkioStats) (uint64, uint64) {
 	return blkRead, blkWrite
 }

-func calculateNetwork(network map[string]types.NetworkStats) (float64, float64) {
+func calculateNetwork(network map[string]container.NetworkStats) (float64, float64) {
 	var rx, tx float64

 	for _, v := range network {
@@ -236,7 +236,7 @@ func calculateNetwork(network map[string]types.NetworkStats) (float64, float64)
 //
 // On Docker 19.03 and older, the result was `mem.Usage - mem.Stats["cache"]`.
 // See https://github.com/moby/moby/issues/40727 for the background.
-func calculateMemUsageUnixNoCache(mem types.MemoryStats) float64 {
+func calculateMemUsageUnixNoCache(mem container.MemoryStats) float64 {
 	// cgroup v1
 	if v, isCgroup1 := mem.Stats["total_inactive_file"]; isCgroup1 && v < mem.Usage {
 		return float64(mem.Usage - v)
@@ -4,18 +4,12 @@ import (
 	"fmt"
 	"testing"

-	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/container"
 	"gotest.tools/v3/assert"
 )

 func TestCalculateMemUsageUnixNoCache(t *testing.T) {
-	// Given
-	stats := types.MemoryStats{Usage: 500, Stats: map[string]uint64{"total_inactive_file": 400}}
-
-	// When
-	result := calculateMemUsageUnixNoCache(stats)
-
-	// Then
+	result := calculateMemUsageUnixNoCache(container.MemoryStats{Usage: 500, Stats: map[string]uint64{"total_inactive_file": 400}})
 	assert.Assert(t, inDelta(100.0, result, 1e-6))
 }

@@ -36,6 +30,28 @@ func TestCalculateMemPercentUnixNoCache(t *testing.T) {
 	})
 }

+func TestCalculateBlockIO(t *testing.T) {
+	blkRead, blkWrite := calculateBlockIO(container.BlkioStats{
+		IoServiceBytesRecursive: []container.BlkioStatEntry{
+			{Major: 8, Minor: 0, Op: "read", Value: 1234},
+			{Major: 8, Minor: 1, Op: "read", Value: 4567},
+			{Major: 8, Minor: 0, Op: "Read", Value: 6},
+			{Major: 8, Minor: 1, Op: "Read", Value: 8},
+			{Major: 8, Minor: 0, Op: "write", Value: 123},
+			{Major: 8, Minor: 1, Op: "write", Value: 456},
+			{Major: 8, Minor: 0, Op: "Write", Value: 6},
+			{Major: 8, Minor: 1, Op: "Write", Value: 8},
+			{Major: 8, Minor: 1, Op: "", Value: 456},
+		},
+	})
+	if blkRead != 5815 {
+		t.Fatalf("blkRead = %d, want 5815", blkRead)
+	}
+	if blkWrite != 593 {
+		t.Fatalf("blkWrite = %d, want 593", blkWrite)
+	}
+}
+
 func inDelta(x, y, delta float64) func() (bool, string) {
 	return func() (bool, string) {
 		diff := x - y
@@ -1,30 +0,0 @@
-package container
-
-import (
-	"testing"
-
-	"github.com/docker/docker/api/types"
-)
-
-func TestCalculateBlockIO(t *testing.T) {
-	blkio := types.BlkioStats{
-		IoServiceBytesRecursive: []types.BlkioStatEntry{
-			{Major: 8, Minor: 0, Op: "read", Value: 1234},
-			{Major: 8, Minor: 1, Op: "read", Value: 4567},
-			{Major: 8, Minor: 0, Op: "Read", Value: 6},
-			{Major: 8, Minor: 1, Op: "Read", Value: 8},
-			{Major: 8, Minor: 0, Op: "write", Value: 123},
-			{Major: 8, Minor: 1, Op: "write", Value: 456},
-			{Major: 8, Minor: 0, Op: "Write", Value: 6},
-			{Major: 8, Minor: 1, Op: "Write", Value: 8},
-			{Major: 8, Minor: 1, Op: "", Value: 456},
-		},
-	}
-	blkRead, blkWrite := calculateBlockIO(blkio)
-	if blkRead != 5815 {
-		t.Fatalf("blkRead = %d, want 5815", blkRead)
-	}
-	if blkWrite != 593 {
-		t.Fatalf("blkWrite = %d, want 593", blkWrite)
-	}
-}
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package command

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package context

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package context

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package context

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package context

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package command

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package command

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package command

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package formatter

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package formatter

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package formatter

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package formatter

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package formatter

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package formatter

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package formatter

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package formatter

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package idresolver

@@ -29,7 +29,6 @@ import (
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"
-	units "github.com/docker/go-units"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
@@ -81,7 +80,7 @@ func (o buildOptions) contextFromStdin() bool {
 }

 func newBuildOptions() buildOptions {
-	ulimits := make(map[string]*units.Ulimit)
+	ulimits := make(map[string]*container.Ulimit)
 	return buildOptions{
 		tags:       opts.NewListOpts(validateTag),
 		buildArgs:  opts.NewListOpts(opts.ValidateEnv),
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package image

@@ -1,3 +1,6 @@
+// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
+//go:build go1.21
+
 package image

 import (
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package inspect

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package network

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package network

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package node

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package node

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package plugin

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package plugin

@@ -11,6 +11,7 @@ import (

 	"github.com/distribution/reference"
 	"github.com/docker/cli/cli/config/configfile"
+	"github.com/docker/cli/cli/config/credentials"
 	configtypes "github.com/docker/cli/cli/config/types"
 	"github.com/docker/cli/cli/hints"
 	"github.com/docker/cli/cli/streams"
@@ -71,7 +72,7 @@ func ResolveAuthConfig(cfg *configfile.ConfigFile, index *registrytypes.IndexInf
 // If credentials for given serverAddress exists in the credential store, the configuration will be populated with values in it
 func GetDefaultAuthConfig(cfg *configfile.ConfigFile, checkCredStore bool, serverAddress string, isDefaultRegistry bool) (registrytypes.AuthConfig, error) {
 	if !isDefaultRegistry {
-		serverAddress = registry.ConvertToHostname(serverAddress)
+		serverAddress = credentials.ConvertToHostname(serverAddress)
 	}
 	authconfig := configtypes.AuthConfig{}
 	var err error
@@ -29,11 +29,11 @@ type fakeClient struct {
 	client.Client
 }

-func (c fakeClient) Info(context.Context) (system.Info, error) {
+func (c *fakeClient) Info(context.Context) (system.Info, error) {
 	return system.Info{}, nil
 }

-func (c fakeClient) RegistryLogin(_ context.Context, auth registrytypes.AuthConfig) (registrytypes.AuthenticateOKBody, error) {
+func (c *fakeClient) RegistryLogin(_ context.Context, auth registrytypes.AuthConfig) (registrytypes.AuthenticateOKBody, error) {
 	if auth.Password == expiredPassword {
 		return registrytypes.AuthenticateOKBody{}, errors.New("Invalid Username or Password")
 	}
@@ -6,6 +6,7 @@ import (

 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/config/credentials"
 	"github.com/docker/docker/registry"
 	"github.com/spf13/cobra"
 )
@@ -46,7 +47,7 @@ func runLogout(_ context.Context, dockerCli command.Cli, serverAddress string) e
 		hostnameAddress = serverAddress
 	)
 	if !isDefaultRegistry {
-		hostnameAddress = registry.ConvertToHostname(serverAddress)
+		hostnameAddress = credentials.ConvertToHostname(serverAddress)
 		// the tries below are kept for backward compatibility where a user could have
 		// saved the registry in one of the following format.
 		regsToLogout = append(regsToLogout, hostnameAddress, "http://"+hostnameAddress, "https://"+hostnameAddress)
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package secret

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package service

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package service

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package service

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package service

@@ -17,7 +17,6 @@ import (
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/api/types/versions"
 	"github.com/docker/docker/client"
-	units "github.com/docker/go-units"
 	"github.com/moby/swarmkit/v2/api/defaults"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -710,8 +709,8 @@ func updateSysCtls(flags *pflag.FlagSet, field *map[string]string) {
 	}
 }

-func updateUlimits(flags *pflag.FlagSet, ulimits []*units.Ulimit) []*units.Ulimit {
-	newUlimits := make(map[string]*units.Ulimit)
+func updateUlimits(flags *pflag.FlagSet, ulimits []*container.Ulimit) []*container.Ulimit {
+	newUlimits := make(map[string]*container.Ulimit)

 	for _, ulimit := range ulimits {
 		newUlimits[ulimit.Name] = ulimit
@@ -731,7 +730,7 @@ func updateUlimits(flags *pflag.FlagSet, ulimits []*units.Ulimit) []*units.Ulimi
 	if len(newUlimits) == 0 {
 		return nil
 	}
-	limits := make([]*units.Ulimit, 0, len(newUlimits))
+	limits := make([]*container.Ulimit, 0, len(newUlimits))
 	for _, ulimit := range newUlimits {
 		limits = append(limits, ulimit)
 	}
@@ -13,7 +13,6 @@ import (
 	mounttypes "github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/go-units"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
 )
@@ -1600,66 +1599,66 @@ func TestUpdateUlimits(t *testing.T) {

 	tests := []struct {
 		name     string
-		spec     []*units.Ulimit
+		spec     []*container.Ulimit
 		rm       []string
 		add      []string
-		expected []*units.Ulimit
+		expected []*container.Ulimit
 	}{
 		{
 			name: "from scratch",
 			add:  []string{"nofile=512:1024", "core=1024:1024"},
-			expected: []*units.Ulimit{
+			expected: []*container.Ulimit{
 				{Name: "core", Hard: 1024, Soft: 1024},
 				{Name: "nofile", Hard: 1024, Soft: 512},
 			},
 		},
 		{
 			name: "append new",
-			spec: []*units.Ulimit{
+			spec: []*container.Ulimit{
 				{Name: "nofile", Hard: 1024, Soft: 512},
 			},
 			add: []string{"core=1024:1024"},
-			expected: []*units.Ulimit{
+			expected: []*container.Ulimit{
 				{Name: "core", Hard: 1024, Soft: 1024},
 				{Name: "nofile", Hard: 1024, Soft: 512},
 			},
 		},
 		{
 			name: "remove and append new should append",
-			spec: []*units.Ulimit{
+			spec: []*container.Ulimit{
 				{Name: "core", Hard: 1024, Soft: 1024},
 				{Name: "nofile", Hard: 1024, Soft: 512},
 			},
 			rm:  []string{"nofile=512:1024"},
 			add: []string{"nofile=512:1024"},
-			expected: []*units.Ulimit{
+			expected: []*container.Ulimit{
 				{Name: "core", Hard: 1024, Soft: 1024},
 				{Name: "nofile", Hard: 1024, Soft: 512},
 			},
 		},
 		{
 			name: "update existing",
-			spec: []*units.Ulimit{
+			spec: []*container.Ulimit{
 				{Name: "nofile", Hard: 2048, Soft: 1024},
 			},
 			add: []string{"nofile=512:1024"},
-			expected: []*units.Ulimit{
+			expected: []*container.Ulimit{
 				{Name: "nofile", Hard: 1024, Soft: 512},
 			},
 		},
 		{
 			name: "update existing twice",
-			spec: []*units.Ulimit{
+			spec: []*container.Ulimit{
 				{Name: "nofile", Hard: 2048, Soft: 1024},
 			},
 			add: []string{"nofile=256:512", "nofile=512:1024"},
-			expected: []*units.Ulimit{
+			expected: []*container.Ulimit{
 				{Name: "nofile", Hard: 1024, Soft: 512},
 			},
 		},
 		{
 			name: "remove all",
-			spec: []*units.Ulimit{
+			spec: []*container.Ulimit{
 				{Name: "core", Hard: 1024, Soft: 1024},
 				{Name: "nofile", Hard: 1024, Soft: 512},
 			},
@@ -1668,23 +1667,23 @@ func TestUpdateUlimits(t *testing.T) {
 		},
 		{
 			name: "remove by key",
-			spec: []*units.Ulimit{
+			spec: []*container.Ulimit{
 				{Name: "core", Hard: 1024, Soft: 1024},
 				{Name: "nofile", Hard: 1024, Soft: 512},
 			},
 			rm: []string{"core"},
-			expected: []*units.Ulimit{
+			expected: []*container.Ulimit{
 				{Name: "nofile", Hard: 1024, Soft: 512},
 			},
 		},
 		{
 			name: "remove by key and different value",
-			spec: []*units.Ulimit{
+			spec: []*container.Ulimit{
 				{Name: "core", Hard: 1024, Soft: 1024},
 				{Name: "nofile", Hard: 1024, Soft: 512},
 			},
 			rm: []string{"core=1234:5678"},
-			expected: []*units.Ulimit{
+			expected: []*container.Ulimit{
 				{Name: "nofile", Hard: 1024, Soft: 512},
 			},
 		},
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package loader

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package system

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package system

@@ -1,5 +1,5 @@
 // FIXME(jsternberg): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package command

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package trust

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package command

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package volume

@@ -14,7 +14,6 @@ import (
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/api/types/versions"
 	"github.com/docker/docker/client"
-	"github.com/docker/go-units"
 	"github.com/pkg/errors"
 )

@@ -693,24 +692,24 @@ func convertCredentialSpec(namespace Namespace, spec composetypes.CredentialSpec
 	return &swarmCredSpec, nil
 }

-func convertUlimits(origUlimits map[string]*composetypes.UlimitsConfig) []*units.Ulimit {
-	newUlimits := make(map[string]*units.Ulimit)
+func convertUlimits(origUlimits map[string]*composetypes.UlimitsConfig) []*container.Ulimit {
+	newUlimits := make(map[string]*container.Ulimit)
 	for name, u := range origUlimits {
 		if u.Single != 0 {
-			newUlimits[name] = &units.Ulimit{
+			newUlimits[name] = &container.Ulimit{
 				Name: name,
 				Soft: int64(u.Single),
 				Hard: int64(u.Single),
 			}
 		} else {
-			newUlimits[name] = &units.Ulimit{
+			newUlimits[name] = &container.Ulimit{
 				Name: name,
 				Soft: int64(u.Soft),
 				Hard: int64(u.Hard),
 			}
 		}
 	}
-	ulimits := make([]*units.Ulimit, 0, len(newUlimits))
+	ulimits := make([]*container.Ulimit, 0, len(newUlimits))
 	for _, ulimit := range newUlimits {
 		ulimits = append(ulimits, ulimit)
 	}
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package interpolation

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package interpolation

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package loader

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package loader

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package loader

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package loader

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package loader

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package loader

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package schema

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package schema

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package template

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package template

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package types

@@ -1,6 +1,7 @@
 package credentials

 import (
+	"net/url"
 	"strings"

 	"github.com/docker/cli/cli/config/types"
@@ -68,14 +69,14 @@ func (c *fileStore) IsFileStore() bool {
 // ConvertToHostname converts a registry url which has http|https prepended
 // to just an hostname.
 // Copied from github.com/docker/docker/registry.ConvertToHostname to reduce dependencies.
-func ConvertToHostname(url string) string {
-	stripped := url
-	if strings.HasPrefix(url, "http://") {
-		stripped = strings.TrimPrefix(url, "http://")
-	} else if strings.HasPrefix(url, "https://") {
-		stripped = strings.TrimPrefix(url, "https://")
+func ConvertToHostname(maybeURL string) string {
+	stripped := maybeURL
+	if strings.Contains(stripped, "://") {
+		u, err := url.Parse(stripped)
+		if err == nil && u.Hostname() != "" {
+			return u.Hostname()
+		}
 	}
-
 	hostName, _, _ := strings.Cut(stripped, "/")
 	return hostName
 }
@@ -134,3 +134,45 @@ func TestFileStoreErase(t *testing.T) {
 		t.Fatalf("expected empty email, got %s", a.Email)
 	}
 }
+
+func TestConvertToHostname(t *testing.T) {
+	tests := []struct{ input, expected string }{
+		{
+			input:    "example.com",
+			expected: "example.com",
+		},
+		{
+			input:    "http://example.com",
+			expected: "example.com",
+		},
+		{
+			input:    "https://example.com",
+			expected: "example.com",
+		},
+		{
+			input:    "https://example.com/",
+			expected: "example.com",
+		},
+		{
+			input:    "https://example.com/v2/",
+			expected: "example.com",
+		},
+		{
+			// FIXME(thaJeztah): should ConvertToHostname correctly handle this / fail on this?
+			input:    "unix:///var/run/docker.sock",
+			expected: "unix:",
+		},
+		{
+			// FIXME(thaJeztah): should ConvertToHostname correctly handle this?
+			input:    "ftp://example.com",
+			expected: "example.com",
+		},
+	}
+	for _, tc := range tests {
+		tc := tc
+		t.Run(tc.input, func(t *testing.T) {
+			actual := ConvertToHostname(tc.input)
+			assert.Equal(t, actual, tc.expected)
+		})
+	}
+}
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package store

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package store

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package store

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package store

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package store

@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package store

@@ -101,23 +101,23 @@ func (c *client) MountBlob(ctx context.Context, sourceRef reference.Canonical, t
 func (c *client) PutManifest(ctx context.Context, ref reference.Named, manifest distribution.Manifest) (digest.Digest, error) {
 	repoEndpoint, err := newDefaultRepositoryEndpoint(ref, c.insecureRegistry)
 	if err != nil {
-		return digest.Digest(""), err
+		return "", err
 	}

 	repoEndpoint.actions = trust.ActionsPushAndPull
 	repo, err := c.getRepositoryForReference(ctx, ref, repoEndpoint)
 	if err != nil {
-		return digest.Digest(""), err
+		return "", err
 	}

 	manifestService, err := repo.Manifests(ctx)
 	if err != nil {
-		return digest.Digest(""), err
+		return "", err
 	}

 	_, opts, err := getManifestOptionsFromReference(ref)
 	if err != nil {
-		return digest.Digest(""), err
+		return "", err
 	}

 	dgst, err := manifestService.Put(ctx, manifest, opts...)
@@ -270,7 +270,7 @@ func (c *client) iterateEndpoints(ctx context.Context, namedRef reference.Named,
 	return newNotFoundError(namedRef.String())
 }

-// allEndpoints returns a list of endpoints ordered by priority (v2, https, v1).
+// allEndpoints returns a list of endpoints ordered by priority (v2, http).
 func allEndpoints(namedRef reference.Named, insecure bool) ([]registry.APIEndpoint, error) {
 	repoInfo, err := registry.ParseRepositoryInfo(namedRef)
 	if err != nil {
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.19
+//go:build go1.21

 package main

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"fmt"
+	"io"
 	"os"
 	"os/exec"
 	"os/signal"
@@ -325,6 +326,25 @@ func tryPluginRun(ctx context.Context, dockerCli command.Cli, cmd *cobra.Command
 	return nil
 }

+// forceExitAfter3TerminationSignals waits for the first termination signal
+// to be caught and the context to be marked as done, then registers a new
+// signal handler for subsequent signals. It forces the process to exit
+// after 3 SIGTERM/SIGINT signals.
+func forceExitAfter3TerminationSignals(ctx context.Context, w io.Writer) {
+	// wait for the first signal to be caught and the context to be marked as done
+	<-ctx.Done()
+	// register a new signal handler for subsequent signals
+	sig := make(chan os.Signal, 2)
+	signal.Notify(sig, platformsignals.TerminationSignals...)
+
+	// once we have received a total of 3 signals we force exit the cli
+	for i := 0; i < 2; i++ {
+		<-sig
+	}
+	_, _ = fmt.Fprint(w, "\ngot 3 SIGTERM/SIGINTs, forcefully exiting\n")
+	os.Exit(1)
+}
+
 //nolint:gocyclo
 func runDocker(ctx context.Context, dockerCli *command.DockerCli) error {
 	tcmd := newDockerCommand(dockerCli)
@@ -384,6 +404,10 @@ func runDocker(ctx context.Context, dockerCli *command.DockerCli) error {
 		}
 	}

+	// This is a fallback for the case where the command does not exit
+	// based on context cancellation.
+	go forceExitAfter3TerminationSignals(ctx, dockerCli.Err())
+
 	// We've parsed global args already, so reset args to those
 	// which remain.
 	cmd.SetArgs(args)
@@ -3,7 +3,7 @@
 ARG GO_VERSION=1.21.11
 ARG ALPINE_VERSION=3.20

-ARG BUILDX_VERSION=0.12.1
+ARG BUILDX_VERSION=0.15.1
 FROM docker/buildx-bin:${BUILDX_VERSION} AS buildx

 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golang
@@ -52,6 +52,7 @@ The table below provides an overview of the current status of deprecated feature
 |------------|------------------------------------------------------------------------------------------------------------------------------------|------------|--------|
 | Deprecated | [Non-standard fields in image inspect](#non-standard-fields-in-image-inspect)                                                      | v27.0      | v28.0  |
 | Deprecated | [API CORS headers](#api-cors-headers)                                                                                              | v27.0      | v28.0  |
+| Deprecated | [Graphdriver plugins (experimental)](#graphdriver-plugins-experimental)                                                            | v27.0      | v28.0  |
 | Deprecated | [Unauthenticated TCP connections](#unauthenticated-tcp-connections)                                                                | v26.0      | v28.0  |
 | Deprecated | [`Container` and `ContainerConfig` fields in Image inspect](#container-and-containerconfig-fields-in-image-inspect)                | v25.0      | v26.0  |
 | Deprecated | [Deprecate legacy API versions](#deprecate-legacy-api-versions)                                                                    | v25.0      | v26.0  |
@@ -148,6 +149,21 @@ part of the underlying image's Config, and deprecated:
 [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

+### Graphdriver plugins (experimental)
+
+**Deprecated in Release: v27.0**
+**Target For Removal In Release: v28.0**
+
+[Graphdriver plugins](https://github.com/docker/cli/blob/v26.1.4/docs/extend/plugins_graphdriver.md)
+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](https://docs.docker.com/storage/containerd/),
+and a custom [snapshotter](https://github.com/containerd/containerd/tree/v1.7.18/docs/snapshotters)
+
 ### API CORS headers

 **Deprecated in Release: v27.0**
@@ -2,6 +2,8 @@
 title: Docker Engine managed plugin system
 description: Develop and use a plugin with the managed plugin system
 keywords: "API, Usage, plugins, documentation, developer"
+aliases:
+  - "/engine/extend/plugins_graphdriver/"
 ---

 - [Installing and using a plugin](index.md#installing-and-using-a-plugin)
@@ -1,401 +0,0 @@
---
-description: "How to manage image and container filesystems with external plugins"
-keywords: "Examples, Usage, storage, image, docker, data, graph, plugin, api"
-advisory: experimental
---
-
-<!-- This file is maintained within the docker/cli GitHub
-     repository at https://github.com/docker/cli/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
-->
-
-# Graphdriver plugins
-
-## Changelog
-
-### 1.13.0
-
- Support v2 plugins
-
-# Docker graph driver plugins
-
-Docker graph driver plugins enable admins to use an external/out-of-process
-graph driver for use with Docker engine. This is an alternative to using the
-built-in storage drivers, such as overlay2.
-
-You need to install and enable the plugin and then restart the Docker daemon
-before using the plugin. See the following example for the correct ordering
-of steps.
-
-```console
-$ docker plugin install cpuguy83/docker-overlay2-graphdriver-plugin # this command also enables the driver
-<output suppressed>
-$ pkill dockerd
-$ dockerd --experimental -s cpuguy83/docker-overlay2-graphdriver-plugin
-```
-
-# Write a graph driver plugin
-
-See the [plugin documentation](https://docs.docker.com/engine/extend/) for detailed information
-on the underlying plugin protocol.
-
-
-## Graph Driver plugin protocol
-
-If a plugin registers itself as a `GraphDriver` when activated, then it is
-expected to provide the rootfs for containers as well as image layer storage.
-
-### /GraphDriver.Init
-
-**Request**:
-```json
-{
-  "Home": "/graph/home/path",
-  "Opts": [],
-  "UIDMaps": [],
-  "GIDMaps": []
-}
-```
-
-Initialize the graph driver plugin with a home directory and array of options.
-These are passed through from the user, but the plugin is not required to parse
-or honor them.
-
-The request also includes a list of UID and GID mappings, structed as follows:
-```json
-{
-  "ContainerID": 0,
-  "HostID": 0,
-  "Size": 0
-}
-```
-
-**Response**:
-```json
-{
-  "Err": ""
-}
-```
-
-Respond with a non-empty string error if an error occurred.
-
-
-### /GraphDriver.Capabilities
-
-**Request**:
-```json
-{}
-```
-
-Get behavioral characteristics of the graph driver. If a plugin does not handle
-this request, the engine will use default values for all capabilities.
-
-**Response**:
-```json
-{
-  "ReproducesExactDiffs": false,
-}
-```
-
-Respond with values of capabilities:
-
-* **ReproducesExactDiffs** Defaults to false. Flags that this driver is capable
-of reproducing exactly equivalent diffs for read-only filesystem layers.
-
-
-### /GraphDriver.Create
-
-**Request**:
-```json
-{
-  "ID": "46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187",
-  "Parent": "2cd9c322cb78a55e8212aa3ea8425a4180236d7106938ec921d0935a4b8ca142",
-  "MountLabel": "",
-  "StorageOpt": {}
-}
-```
-
-Create a new, empty, read-only filesystem layer with the specified
-`ID`, `Parent` and `MountLabel`. If `Parent` is an empty string, there is no
-parent layer. `StorageOpt` is map of strings which indicate storage options.
-
-**Response**:
-```json
-{
-  "Err": ""
-}
-```
-
-Respond with a non-empty string error if an error occurred.
-
-### /GraphDriver.CreateReadWrite
-
-**Request**:
-```json
-{
-  "ID": "46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187",
-  "Parent": "2cd9c322cb78a55e8212aa3ea8425a4180236d7106938ec921d0935a4b8ca142",
-  "MountLabel": "",
-  "StorageOpt": {}
-}
-```
-
-Similar to `/GraphDriver.Create` but creates a read-write filesystem layer.
-
-### /GraphDriver.Remove
-
-**Request**:
-```json
-{
-  "ID": "46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187"
-}
-```
-
-Remove the filesystem layer with this given `ID`.
-
-**Response**:
-```json
-{
-  "Err": ""
-}
-```
-
-Respond with a non-empty string error if an error occurred.
-
-### /GraphDriver.Get
-
-**Request**:
-```json
-{
-  "ID": "46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187",
-  "MountLabel": ""
-}
-```
-
-Get the mountpoint for the layered filesystem referred to by the given `ID`.
-
-**Response**:
-```json
-{
-  "Dir": "/var/mygraph/46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187",
-  "Err": ""
-}
-```
-
-Respond with the absolute path to the mounted layered filesystem.
-Respond with a non-empty string error if an error occurred.
-
-### /GraphDriver.Put
-
-**Request**:
-```json
-{
-  "ID": "46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187"
-}
-```
-
-Release the system resources for the specified `ID`, such as unmounting the
-filesystem layer.
-
-**Response**:
-```json
-{
-  "Err": ""
-}
-```
-
-Respond with a non-empty string error if an error occurred.
-
-### /GraphDriver.Exists
-
-**Request**:
-```json
-{
-  "ID": "46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187"
-}
-```
-
-Determine if a filesystem layer with the specified `ID` exists.
-
-**Response**:
-```json
-{
-  "Exists": true
-}
-```
-
-Respond with a boolean for whether or not the filesystem layer with the specified
-`ID` exists.
-
-### /GraphDriver.Status
-
-**Request**:
-```json
-{}
-```
-
-Get low-level diagnostic information about the graph driver.
-
-**Response**:
-```json
-{
-  "Status": [[]]
-}
-```
-
-Respond with a 2-D array with key/value pairs for the underlying status
-information.
-
-
-### /GraphDriver.GetMetadata
-
-**Request**:
-```json
-{
-  "ID": "46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187"
-}
-```
-
-Get low-level diagnostic information about the layered filesystem with the
-with the specified `ID`
-
-**Response**:
-```json
-{
-  "Metadata": {},
-  "Err": ""
-}
-```
-
-Respond with a set of key/value pairs containing the low-level diagnostic
-information about the layered filesystem.
-Respond with a non-empty string error if an error occurred.
-
-### /GraphDriver.Cleanup
-
-**Request**:
-```json
-{}
-```
-
-Perform necessary tasks to release resources help by the plugin, such as
-unmounting all the layered file systems.
-
-**Response**:
-```json
-{
-  "Err": ""
-}
-```
-
-Respond with a non-empty string error if an error occurred.
-
-
-### /GraphDriver.Diff
-
-**Request**:
-```json
-{
-  "ID": "46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187",
-  "Parent": "2cd9c322cb78a55e8212aa3ea8425a4180236d7106938ec921d0935a4b8ca142"
-}
-```
-
-Get an archive of the changes between the filesystem layers specified by the `ID`
-and `Parent`. `Parent` may be an empty string, in which case there is no parent.
-
-**Response**:
-
-```
-{{ TAR STREAM }}
-```
-
-### /GraphDriver.Changes
-
-**Request**:
-```json
-{
-  "ID": "46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187",
-  "Parent": "2cd9c322cb78a55e8212aa3ea8425a4180236d7106938ec921d0935a4b8ca142"
-}
-```
-
-Get a list of changes between the filesystem layers specified by the `ID` and
-`Parent`. If `Parent` is an empty string, there is no parent.
-
-**Response**:
-```json
-{
-  "Changes": [{}],
-  "Err": ""
-}
-```
-
-Respond with a list of changes. The structure of a change is:
-```json
-  "Path": "/some/path",
-  "Kind": 0,
-```
-
-Where the `Path` is the filesystem path within the layered filesystem that is
-changed and `Kind` is an integer specifying the type of change that occurred:
-
- 0 - Modified
- 1 - Added
- 2 - Deleted
-
-Respond with a non-empty string error if an error occurred.
-
-### /GraphDriver.ApplyDiff
-
-**Request**:
-
-```
-{{ TAR STREAM }}
-```
-
-Extract the changeset from the given diff into the layer with the specified `ID`
-and `Parent`
-
-**Query Parameters**:
-
- id (required)- the `ID` of the new filesystem layer to extract the diff to
- parent (required)- the `Parent` of the given `ID`
-
-**Response**:
-```json
-{
-  "Size": 512366,
-  "Err": ""
-}
-```
-
-Respond with the size of the new layer in bytes.
-Respond with a non-empty string error if an error occurred.
-
-### /GraphDriver.DiffSize
-
-**Request**:
-```json
-{
-  "ID": "46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187",
-  "Parent": "2cd9c322cb78a55e8212aa3ea8425a4180236d7106938ec921d0935a4b8ca142"
-}
-```
-
-Calculate the changes between the specified `ID`
-
-**Response**:
-```json
-{
-  "Size": 512366,
-  "Err": ""
-}
-```
-
-Respond with the size changes between the specified `ID` and `Parent`
-Respond with a non-empty string error if an error occurred.
@@ -47,7 +47,7 @@ The `--since` option shows only the container logs generated after
 a given date. You can specify the date as an RFC 3339 date, a UNIX
 timestamp, or a Go duration string (e.g. `1m30s`, `3h`). Besides RFC3339 date
 format you may also use RFC3339Nano, `2006-01-02T15:04:05`,
-`2006-01-02T15:04:05.999999999`, `2006-01-02Z07:00`, and `2006-01-02`. The local
+`2006-01-02T15:04:05.999999999`, `2006-01-02T07:00`, and `2006-01-02`. The local
 timezone on the client will be used if you do not provide either a `Z` or a
 `+-00:00` timezone offset at the end of the timestamp. When providing Unix
 timestamps enter seconds[.nanoseconds], where seconds is the number of seconds
@@ -46,7 +46,7 @@ The `until` filter can be Unix timestamps, date formatted
 timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed
 relative to the daemon machine’s time. Supported formats for date
 formatted time stamps include RFC3339Nano, RFC3339, `2006-01-02T15:04:05`,
-`2006-01-02T15:04:05.999999999`, `2006-01-02Z07:00`, and `2006-01-02`. The local
+`2006-01-02T15:04:05.999999999`, `2006-01-02T07:00`, and `2006-01-02`. The local
 timezone on the daemon will be used if you do not provide either a `Z` or a
 `+-00:00` timezone offset at the end of the timestamp. When providing Unix
 timestamps enter seconds[.nanoseconds], where seconds is the number of seconds
@@ -69,7 +69,7 @@ The `until` filter can be Unix timestamps, date formatted
 timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed
 relative to the daemon machine’s time. Supported formats for date
 formatted time stamps include RFC3339Nano, RFC3339, `2006-01-02T15:04:05`,
-`2006-01-02T15:04:05.999999999`, `2006-01-02Z07:00`, and `2006-01-02`. The local
+`2006-01-02T15:04:05.999999999`, `2006-01-02T07:00`, and `2006-01-02`. The local
 timezone on the daemon will be used if you do not provide either a `Z` or a
 `+-00:00` timezone offset at the end of the timestamp.  When providing Unix
 timestamps enter seconds[.nanoseconds], where seconds is the number of seconds
@@ -44,7 +44,7 @@ The `until` filter can be Unix timestamps, date formatted
 timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed
 relative to the daemon machine’s time. Supported formats for date
 formatted time stamps include RFC3339Nano, RFC3339, `2006-01-02T15:04:05`,
-`2006-01-02T15:04:05.999999999`, `2006-01-02Z07:00`, and `2006-01-02`. The local
+`2006-01-02T15:04:05.999999999`, `2006-01-02T07:00`, and `2006-01-02`. The local
 timezone on the daemon will be used if you do not provide either a `Z` or a
 `+-00:00` timezone offset at the end of the timestamp.  When providing Unix
 timestamps enter seconds[.nanoseconds], where seconds is the number of seconds
@@ -63,7 +63,7 @@ The `--since` option shows only the service logs generated after
 a given date. You can specify the date as an RFC 3339 date, a UNIX
 timestamp, or a Go duration string (e.g. `1m30s`, `3h`). Besides RFC3339 date
 format you may also use RFC3339Nano, `2006-01-02T15:04:05`,
-`2006-01-02T15:04:05.999999999`, `2006-01-02Z07:00`, and `2006-01-02`. The local
+`2006-01-02T15:04:05.999999999`, `2006-01-02T07:00`, and `2006-01-02`. The local
 timezone on the client will be used if you do not provide either a `Z` or a
 `+-00:00` timezone offset at the end of the timestamp. When providing Unix
 timestamps enter seconds[.nanoseconds], where seconds is the number of seconds
@@ -148,7 +148,7 @@ timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed
 relative to the client machine’s time. If you do not provide the `--since` option,
 the command returns only new and/or live events. Supported formats for date
 formatted time stamps include RFC3339Nano, RFC3339, `2006-01-02T15:04:05`,
-`2006-01-02T15:04:05.999999999`, `2006-01-02Z07:00`, and `2006-01-02`. The local
+`2006-01-02T15:04:05.999999999`, `2006-01-02T07:00`, and `2006-01-02`. The local
 timezone on the client will be used if you do not provide either a `Z` or a
 `+-00:00` timezone offset at the end of the timestamp. When providing Unix
 timestamps enter seconds[.nanoseconds], where seconds is the number of seconds
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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: https://github.com/docker/docker/compare/1a1f3cff45ec...018d93decfb5 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	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]: https://github.com/docker/docs/blob/31a16f1da2f4a4c94b5a82713aa012f052fb7e6d/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: https://github.com/moby/swarmkit/compare/c1c857e2dca1...ea1a7cec35cb 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: https://github.com/docker/docker/compare/ec4bac431c88...caf502a0bc44 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: https://github.com/docker/docker/compare/ba69bd9c1e48...ec4bac431c88 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