Merge pull request #352 from vania-pooh/master

Support Docker API 1.45 (related to aerokube/selenoid#1420)

.github/workflows/build.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v3
         with:
-          go-version: ~1.21.6
+          go-version: ~1.22.3
 
       - uses: actions/cache@v3
         with:

.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v3
         with:
-          go-version: ~1.21.6
+          go-version: ~1.22.3
 
       - uses: actions/cache@v3
         with:

.github/workflows/test.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v3
         with:
-          go-version: ~1.21.6
+          go-version: ~1.22.3
 
       - uses: actions/cache@v3
         with:

cmd/selenoid.go

@@ -2,11 +2,12 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/aerokube/cm/selenoid"
-	"github.com/spf13/cobra"
 	"os"
 	"runtime"
 	"time"
+
+	"github.com/aerokube/cm/selenoid"
+	"github.com/spf13/cobra"
 )
 
 var (
@@ -89,7 +90,7 @@ func initFlags() {
 		selenoidStatusCmd,
 	} {
 		c.Flags().StringVarP(&configDir, "config-dir", "c", selenoid.GetSelenoidConfigDir(), "directory to save files")
-		c.Flags().Uint16VarP(&port, "port", "p", selenoid.SelenoidDefaultPort, "override listen port")
+		c.Flags().Uint16VarP(&port, "port", "p", selenoid.DefaultPort, "override listen port")
 	}
 	for _, c := range []*cobra.Command{
 		selenoidDownloadUICmd,
@@ -101,7 +102,7 @@ func initFlags() {
 		selenoidUIStatusCmd,
 	} {
 		c.Flags().StringVarP(&uiConfigDir, "config-dir", "c", selenoid.GetSelenoidUIConfigDir(), "directory to save files")
-		c.Flags().Uint16VarP(&uiPort, "port", "p", selenoid.SelenoidUIDefaultPort, "override listen port")
+		c.Flags().Uint16VarP(&uiPort, "port", "p", selenoid.UIDefaultPort, "override listen port")
 	}
 
 	for _, c := range []*cobra.Command{
@@ -219,5 +220,5 @@ var selenoidCmd = &cobra.Command{
 }
 
 func stderr(format string, a ...interface{}) {
-	fmt.Fprintf(os.Stderr, format, a)
+	_, _ = fmt.Fprintf(os.Stderr, format, a)
 }

cmd/selenoid_args.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"os"
+
 	"github.com/aerokube/cm/selenoid"
 	"github.com/spf13/cobra"
-	"os"
 )
 
 var selenoidArgsCmd = &cobra.Command{

cmd/selenoid_cleanup.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"os"
+
 	"github.com/aerokube/cm/selenoid"
 	"github.com/spf13/cobra"
-	"os"
 )
 
 var selenoidCleanupCmd = &cobra.Command{

cmd/selenoid_configure.go

@@ -1,8 +1,9 @@
 package cmd
 
 import (
-	"github.com/spf13/cobra"
 	"os"
+
+	"github.com/spf13/cobra"
 )
 
 var selenoidConfigureCmd = &cobra.Command{

cmd/selenoid_download.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"os"
+
 	"github.com/aerokube/cm/selenoid"
 	"github.com/spf13/cobra"
-	"os"
 )
 
 var selenoidDownloadCmd = &cobra.Command{

cmd/selenoid_start.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"os"
+
 	"github.com/aerokube/cm/selenoid"
 	"github.com/spf13/cobra"
-	"os"
 )
 
 var selenoidStartCmd = &cobra.Command{

cmd/selenoid_status.go

@@ -1,8 +1,9 @@
 package cmd
 
 import (
-	"github.com/spf13/cobra"
 	"os"
+
+	"github.com/spf13/cobra"
 )
 
 var selenoidStatusCmd = &cobra.Command{

cmd/selenoid_stop.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"os"
+
 	"github.com/aerokube/cm/selenoid"
 	"github.com/spf13/cobra"
-	"os"
 )
 
 var selenoidStopCmd = &cobra.Command{

cmd/selenoid_ui_status.go

@@ -1,8 +1,9 @@
 package cmd
 
 import (
-	"github.com/spf13/cobra"
 	"os"
+
+	"github.com/spf13/cobra"
 )
 
 var selenoidUIStatusCmd = &cobra.Command{

cmd/version.go

@@ -2,8 +2,9 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/spf13/cobra"
 	"os"
+
+	"github.com/spf13/cobra"
 )
 
 var (

go.mod

@@ -1,61 +1,63 @@
 module github.com/aerokube/cm
 
-go 1.21
+go 1.22
 
 require (
 	github.com/Masterminds/semver/v3 v3.2.1
-	github.com/aerokube/selenoid v0.0.0-20240109083731-079fe2dfad4f
-	github.com/docker/cli v23.0.1+incompatible
-	github.com/docker/docker v25.0.5+incompatible
+	github.com/aerokube/selenoid v0.0.0-20240520175821-773c202b01e3
+	github.com/docker/cli v26.1.3+incompatible
+	github.com/docker/docker v26.1.3+incompatible
 	github.com/docker/go-connections v0.5.0
 	github.com/docker/go-units v0.5.0
-	github.com/fatih/color v1.14.1
-	github.com/fvbommel/sortorder v1.0.2
+	github.com/fatih/color v1.17.0
+	github.com/fvbommel/sortorder v1.1.0
 	github.com/google/go-github v17.0.0+incompatible
 	github.com/heroku/docker-registry-client v0.0.0-20211012143308-9463674c8930
 	github.com/mattn/go-colorable v0.1.13
 	github.com/mitchellh/go-ps v1.0.0
 	github.com/spf13/cobra v1.8.0
-	github.com/stretchr/testify v1.8.4
+	github.com/stretchr/testify v1.9.0
 	gopkg.in/cheggaaa/pb.v1 v1.0.28
 )
 
 require (
-	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
-	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/containerd/log v0.1.0 // indirect
+	github.com/Microsoft/go-winio v0.6.2 // indirect
+	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/distribution/reference v0.5.0 // indirect
-	github.com/docker/distribution v2.8.2+incompatible // indirect
-	github.com/docker/docker-credential-helpers v0.6.0 // indirect
+	github.com/distribution/reference v0.6.0 // indirect
+	github.com/docker/distribution v2.8.3+incompatible // indirect
+	github.com/docker/docker-credential-helpers v0.8.2 // indirect
 	github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 // indirect
-	github.com/imdario/mergo v0.3.13 // indirect
+	github.com/google/go-querystring v1.1.0 // indirect
+	github.com/imdario/mergo v0.3.15 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/mattn/go-isatty v0.0.17 // indirect
-	github.com/mattn/go-runewidth v0.0.2 // indirect
-	github.com/moby/term v0.5.0 // indirect
-	github.com/morikuni/aec v1.0.0 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.0.2 // indirect
+	github.com/opencontainers/image-spec v1.1.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
-	go.opentelemetry.io/otel v1.22.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect
-	go.opentelemetry.io/otel/metric v1.22.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.22.0 // indirect
-	go.opentelemetry.io/otel/trace v1.22.0 // indirect
-	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/sys v0.16.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.9.1 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
+	go.opentelemetry.io/otel v1.27.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect
+	go.opentelemetry.io/otel/metric v1.27.0 // indirect
+	go.opentelemetry.io/otel/trace v1.27.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.2.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240521202816-d264139d666e // indirect
+	google.golang.org/grpc v1.64.0 // indirect
+	google.golang.org/protobuf v1.34.1 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	gotest.tools/v3 v3.4.0 // indirect
 )