From 383f2afba70d56c018df562fc7e6f74ef2288527 Mon Sep 17 00:00:00 2001 From: Richard M Date: Fri, 14 Jul 2023 20:43:13 +0100 Subject: [PATCH 1/6] Add docker v24 and associated dependencies. --- go.mod | 6 ++++-- go.sum | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index f318c6d6..62c316e6 100644 --- a/go.mod +++ b/go.mod @@ -7,9 +7,9 @@ require ( github.com/AlecAivazis/survey/v2 v2.3.7 github.com/Autonomic-Cooperative/godotenv v1.3.1-0.20210731094149-b031ea1211e7 github.com/Gurpartap/logrus-stack v0.0.0-20170710170904-89c00d8a28f4 - github.com/docker/cli v20.10.25+incompatible + github.com/docker/cli v24.0.4+incompatible github.com/docker/distribution v2.8.2+incompatible - github.com/docker/docker v20.10.25+incompatible + github.com/docker/docker v24.0.4+incompatible github.com/docker/go-units v0.5.0 github.com/go-git/go-git/v5 v5.7.0 github.com/hetznercloud/hcloud-go v1.47.0 @@ -38,7 +38,9 @@ require ( github.com/klauspost/pgzip v1.2.6 github.com/libdns/gandi v1.0.2 github.com/libdns/libdns v0.2.1 + github.com/moby/patternmatcher v0.5.0 // indirect github.com/moby/sys/mount v0.2.0 // indirect + github.com/moby/sys/sequential v0.5.0 // indirect github.com/opencontainers/image-spec v1.0.3-0.20211202193544-a5463b7f9c84 // indirect github.com/sergi/go-diff v1.2.0 // indirect github.com/spf13/cobra v1.3.0 // indirect diff --git a/go.sum b/go.sum index 60322b47..bb144d8c 100644 --- a/go.sum +++ b/go.sum @@ -343,6 +343,8 @@ github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyG github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v20.10.25+incompatible h1:ZdAJcooG2FK5PojbK8ALV6pf8Tut+1hgv39AxnAq9lo= github.com/docker/cli v20.10.25+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v24.0.4+incompatible h1:Y3bYF9ekNTm2VFz5U/0BlMdJy73D+Y1iAAZ8l63Ydzw= +github.com/docker/cli v24.0.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= @@ -351,6 +353,8 @@ github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4Kfc github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.25+incompatible h1:URiHXOEOlhi6FS5U+YUE8YnsnZjIV3R+TFezL2ngdW0= github.com/docker/docker v20.10.25+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v24.0.4+incompatible h1:s/LVDftw9hjblvqIeTiGYXBCD95nOEEl7qRsRrIOuQI= +github.com/docker/docker v24.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/docker-credential-helpers v0.6.4 h1:axCks+yV+2MR3/kZhAmy07yC56WZ2Pwu/fKWtKuZB0o= github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c= @@ -763,12 +767,16 @@ github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= github.com/mmcloughlin/avo v0.5.0/go.mod h1:ChHFdoV7ql95Wi7vuq2YT1bwCJqiWdZrQ1im3VujLYM= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= +github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo= +github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= github.com/moby/sys/mount v0.2.0 h1:WhCW5B355jtxndN5ovugJlMFJawbUODuW8fSnEH6SSM= github.com/moby/sys/mount v0.2.0/go.mod h1:aAivFE2LB3W4bACsUXChRHQ0qKWsetY4Y9V7sxOougM= github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/mountinfo v0.5.0 h1:2Ks8/r6lopsxWi9m58nlwjaeSzUX9iiL1vj5qB/9ObI= github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= +github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc= +github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo= github.com/moby/sys/signal v0.7.0 h1:25RW3d5TnQEoKvRbEKUGay6DCQ46IxAVTT9CUMgmsSI= github.com/moby/sys/signal v0.7.0/go.mod h1:GQ6ObYZfqacOwTtlXvcmh9A26dVRul/hbOZn88Kg8Tg= github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ= @@ -1252,6 +1260,7 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -- 2.47.2 From a340a65630f2cce3a0e5733d539e18723b4c5d3f Mon Sep 17 00:00:00 2001 From: Richard M Date: Fri, 14 Jul 2023 20:44:25 +0100 Subject: [PATCH 2/6] Replace types.volume with new volume type --- pkg/client/volumes.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/client/volumes.go b/pkg/client/volumes.go index f0802b05..90bbd493 100644 --- a/pkg/client/volumes.go +++ b/pkg/client/volumes.go @@ -3,13 +3,14 @@ package client import ( "context" - "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/volume" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/client" ) -func GetVolumes(cl *client.Client, ctx context.Context, server string, fs filters.Args) ([]*types.Volume, error) { - volumeListOKBody, err := cl.VolumeList(ctx, fs) +func GetVolumes(cl *client.Client, ctx context.Context, server string, fs filters.Args) ([]*volume.Volume, error) { + volumeListOptions := volume.ListOptions{fs} + volumeListOKBody, err := cl.VolumeList(ctx, volumeListOptions) volumeList := volumeListOKBody.Volumes if err != nil { return volumeList, err @@ -18,7 +19,7 @@ func GetVolumes(cl *client.Client, ctx context.Context, server string, fs filter return volumeList, nil } -func GetVolumeNames(volumes []*types.Volume) []string { +func GetVolumeNames(volumes []*volume.Volume) []string { var volumeNames []string for _, vol := range volumes { -- 2.47.2 From f4bdb8390ae2ec09ac2571a7c1a24102a88c6850 Mon Sep 17 00:00:00 2001 From: Richard M Date: Fri, 14 Jul 2023 20:47:11 +0100 Subject: [PATCH 3/6] Change CommonOptions (deprecated) to ClientOptions and remove unneeded parameters. --- pkg/context/context.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkg/context/context.go b/pkg/context/context.go index 75417aee..9842f23c 100644 --- a/pkg/context/context.go +++ b/pkg/context/context.go @@ -8,22 +8,19 @@ import ( "github.com/docker/cli/cli/context" contextStore "github.com/docker/cli/cli/context/store" cliflags "github.com/docker/cli/cli/flags" - "github.com/moby/term" ) func NewDefaultDockerContextStore() *command.ContextStoreWithDefault { - _, _, stderr := term.StdStreams() - dockerConfig := dConfig.LoadDefaultConfigFile(stderr) contextDir := dConfig.ContextStoreDir() storeConfig := command.DefaultContextStoreConfig() store := newContextStore(contextDir, storeConfig) - opts := &cliflags.CommonOptions{Context: "default"} + opts := &cliflags.ClientOptions{Context: "default"} dockerContextStore := &command.ContextStoreWithDefault{ Store: store, Resolver: func() (*command.DefaultContext, error) { - return command.ResolveDefaultContext(opts, dockerConfig, storeConfig, stderr) + return command.ResolveDefaultContext(opts, storeConfig) }, } -- 2.47.2 From bab8f410701fbbc45d45aaa3b8f7bd2a179d9ad2 Mon Sep 17 00:00:00 2001 From: Richard M Date: Fri, 14 Jul 2023 20:47:50 +0100 Subject: [PATCH 4/6] Update volume list options. --- cli/app/remove.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cli/app/remove.go b/cli/app/remove.go index ace1a609..186b8e43 100644 --- a/cli/app/remove.go +++ b/cli/app/remove.go @@ -11,6 +11,7 @@ import ( stack "coopcloud.tech/abra/pkg/upstream/stack" "github.com/AlecAivazis/survey/v2" "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/volume" "github.com/sirupsen/logrus" "github.com/urfave/cli" ) @@ -108,7 +109,8 @@ flag. logrus.Fatal(err) } - volumeListOKBody, err := cl.VolumeList(context.Background(), fs) + volumeListOptions := volume.ListOptions{fs} + volumeListOKBody, err := cl.VolumeList(context.Background(), volumeListOptions) volumeList := volumeListOKBody.Volumes if err != nil { logrus.Fatal(err) -- 2.47.2 From e362926771d374b9585646227066c1d703ce5325 Mon Sep 17 00:00:00 2001 From: Richard M Date: Fri, 14 Jul 2023 20:49:20 +0100 Subject: [PATCH 5/6] Replace deprecated system.TempFileSequential with os.CreateTemp --- cli/app/backup.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cli/app/backup.go b/cli/app/backup.go index 8bc1a7ba..9b2a4be7 100644 --- a/cli/app/backup.go +++ b/cli/app/backup.go @@ -23,7 +23,6 @@ import ( "github.com/docker/docker/api/types/filters" dockerClient "github.com/docker/docker/client" "github.com/docker/docker/pkg/archive" - "github.com/docker/docker/pkg/system" "github.com/klauspost/pgzip" "github.com/sirupsen/logrus" "github.com/urfave/cli" @@ -262,7 +261,7 @@ func runBackup(cl *dockerClient.Client, app config.App, serviceName string, bkCo } func copyToFile(outfile string, r io.Reader) error { - tmpFile, err := system.TempFileSequential(filepath.Dir(outfile), ".tar_temp") + tmpFile, err := os.CreateTemp(filepath.Dir(outfile), ".tar_temp") if err != nil { return err } -- 2.47.2 From 7668fcba57c9f61dc9c4956560351aaf49d26eff Mon Sep 17 00:00:00 2001 From: Richard M Date: Fri, 14 Jul 2023 21:11:43 +0100 Subject: [PATCH 6/6] Fix formatting. --- pkg/client/volumes.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/client/volumes.go b/pkg/client/volumes.go index 90bbd493..4afd60c2 100644 --- a/pkg/client/volumes.go +++ b/pkg/client/volumes.go @@ -3,8 +3,8 @@ package client import ( "context" - "github.com/docker/docker/api/types/volume" "github.com/docker/docker/api/types/filters" + "github.com/docker/docker/api/types/volume" "github.com/docker/docker/client" ) -- 2.47.2