Skip to content
This repository was archived by the owner on Dec 17, 2024. It is now read-only.

Commit 0d65225

Browse files
vania-poohvania-pooh
authored
Merge pull request #352 from vania-pooh/master
Support Docker API 1.45 (related to aerokube/selenoid#1420)
2 parents 243f47c + 3839c9a commit 0d65225

25 files changed

+251
-223
lines changed

‎.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Setup Golang
1515
uses: actions/setup-go@v3
1616
with:
17-
go-version: ~1.21.6
17+
go-version: ~1.22.3
1818

1919
- uses: actions/cache@v3
2020
with:

‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Setup Golang
1414
uses: actions/setup-go@v3
1515
with:
16-
go-version: ~1.21.6
16+
go-version: ~1.22.3
1717

1818
- uses: actions/cache@v3
1919
with:

‎.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Setup Golang
1313
uses: actions/setup-go@v3
1414
with:
15-
go-version: ~1.21.6
15+
go-version: ~1.22.3
1616

1717
- uses: actions/cache@v3
1818
with:

‎cmd/selenoid.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ package cmd
22

33
import (
44
"fmt"
5-
"github.com/aerokube/cm/selenoid"
6-
"github.com/spf13/cobra"
75
"os"
86
"runtime"
97
"time"
8+
9+
"github.com/aerokube/cm/selenoid"
10+
"github.com/spf13/cobra"
1011
)
1112

1213
var (
@@ -89,7 +90,7 @@ func initFlags() {
8990
selenoidStatusCmd,
9091
} {
9192
c.Flags().StringVarP(&configDir, "config-dir", "c", selenoid.GetSelenoidConfigDir(), "directory to save files")
92-
c.Flags().Uint16VarP(&port, "port", "p", selenoid.SelenoidDefaultPort, "override listen port")
93+
c.Flags().Uint16VarP(&port, "port", "p", selenoid.DefaultPort, "override listen port")
9394
}
9495
for _, c := range []*cobra.Command{
9596
selenoidDownloadUICmd,
@@ -101,7 +102,7 @@ func initFlags() {
101102
selenoidUIStatusCmd,
102103
} {
103104
c.Flags().StringVarP(&uiConfigDir, "config-dir", "c", selenoid.GetSelenoidUIConfigDir(), "directory to save files")
104-
c.Flags().Uint16VarP(&uiPort, "port", "p", selenoid.SelenoidUIDefaultPort, "override listen port")
105+
c.Flags().Uint16VarP(&uiPort, "port", "p", selenoid.UIDefaultPort, "override listen port")
105106
}
106107

107108
for _, c := range []*cobra.Command{
@@ -219,5 +220,5 @@ var selenoidCmd = &cobra.Command{
219220
}
220221

221222
func stderr(format string, a ...interface{}) {
222-
fmt.Fprintf(os.Stderr, format, a)
223+
_, _ = fmt.Fprintf(os.Stderr, format, a)
223224
}

‎cmd/selenoid_args.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package cmd
22

33
import (
4+
"os"
5+
46
"github.com/aerokube/cm/selenoid"
57
"github.com/spf13/cobra"
6-
"os"
78
)
89

910
var selenoidArgsCmd = &cobra.Command{

‎cmd/selenoid_cleanup.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package cmd
22

33
import (
4+
"os"
5+
46
"github.com/aerokube/cm/selenoid"
57
"github.com/spf13/cobra"
6-
"os"
78
)
89

910
var selenoidCleanupCmd = &cobra.Command{

‎cmd/selenoid_configure.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package cmd
22

33
import (
4-
"github.com/spf13/cobra"
54
"os"
5+
6+
"github.com/spf13/cobra"
67
)
78

89
var selenoidConfigureCmd = &cobra.Command{

‎cmd/selenoid_download.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package cmd
22

33
import (
4+
"os"
5+
46
"github.com/aerokube/cm/selenoid"
57
"github.com/spf13/cobra"
6-
"os"
78
)
89

910
var selenoidDownloadCmd = &cobra.Command{

‎cmd/selenoid_start.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package cmd
22

33
import (
4+
"os"
5+
46
"github.com/aerokube/cm/selenoid"
57
"github.com/spf13/cobra"
6-
"os"
78
)
89

910
var selenoidStartCmd = &cobra.Command{

‎cmd/selenoid_status.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package cmd
22

33
import (
4-
"github.com/spf13/cobra"
54
"os"
5+
6+
"github.com/spf13/cobra"
67
)
78

89
var selenoidStatusCmd = &cobra.Command{

‎cmd/selenoid_stop.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package cmd
22

33
import (
4+
"os"
5+
46
"github.com/aerokube/cm/selenoid"
57
"github.com/spf13/cobra"
6-
"os"
78
)
89

910
var selenoidStopCmd = &cobra.Command{

‎cmd/selenoid_ui_status.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package cmd
22

33
import (
4-
"github.com/spf13/cobra"
54
"os"
5+
6+
"github.com/spf13/cobra"
67
)
78

89
var selenoidUIStatusCmd = &cobra.Command{

‎cmd/version.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ package cmd
22

33
import (
44
"fmt"
5-
"github.com/spf13/cobra"
65
"os"
6+
7+
"github.com/spf13/cobra"
78
)
89

910
var (

‎go.mod

+34-32
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,63 @@
11
module github.com/aerokube/cm
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/Masterminds/semver/v3 v3.2.1
7-
github.com/aerokube/selenoid v0.0.0-20240109083731-079fe2dfad4f
8-
github.com/docker/cli v23.0.1+incompatible
9-
github.com/docker/docker v25.0.5+incompatible
7+
github.com/aerokube/selenoid v0.0.0-20240520175821-773c202b01e3
8+
github.com/docker/cli v26.1.3+incompatible
9+
github.com/docker/docker v26.1.3+incompatible
1010
github.com/docker/go-connections v0.5.0
1111
github.com/docker/go-units v0.5.0
12-
github.com/fatih/color v1.14.1
13-
github.com/fvbommel/sortorder v1.0.2
12+
github.com/fatih/color v1.17.0
13+
github.com/fvbommel/sortorder v1.1.0
1414
github.com/google/go-github v17.0.0+incompatible
1515
github.com/heroku/docker-registry-client v0.0.0-20211012143308-9463674c8930
1616
github.com/mattn/go-colorable v0.1.13
1717
github.com/mitchellh/go-ps v1.0.0
1818
github.com/spf13/cobra v1.8.0
19-
github.com/stretchr/testify v1.8.4
19+
github.com/stretchr/testify v1.9.0
2020
gopkg.in/cheggaaa/pb.v1 v1.0.28
2121
)
2222

2323
require (
24-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
25-
github.com/Microsoft/go-winio v0.6.1 // indirect
26-
github.com/containerd/log v0.1.0 // indirect
24+
github.com/Microsoft/go-winio v0.6.2 // indirect
25+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
2726
github.com/davecgh/go-spew v1.1.1 // indirect
28-
github.com/distribution/reference v0.5.0 // indirect
29-
github.com/docker/distribution v2.8.2+incompatible // indirect
30-
github.com/docker/docker-credential-helpers v0.6.0 // indirect
27+
github.com/distribution/reference v0.6.0 // indirect
28+
github.com/docker/distribution v2.8.3+incompatible // indirect
29+
github.com/docker/docker-credential-helpers v0.8.2 // indirect
3130
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
3231
github.com/felixge/httpsnoop v1.0.4 // indirect
33-
github.com/go-logr/logr v1.4.1 // indirect
32+
github.com/go-logr/logr v1.4.2 // indirect
3433
github.com/go-logr/stdr v1.2.2 // indirect
3534
github.com/gogo/protobuf v1.3.2 // indirect
36-
github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 // indirect
37-
github.com/imdario/mergo v0.3.13 // indirect
35+
github.com/google/go-querystring v1.1.0 // indirect
36+
github.com/imdario/mergo v0.3.15 // indirect
3837
github.com/inconshreveable/mousetrap v1.1.0 // indirect
39-
github.com/mattn/go-isatty v0.0.17 // indirect
40-
github.com/mattn/go-runewidth v0.0.2 // indirect
41-
github.com/moby/term v0.5.0 // indirect
42-
github.com/morikuni/aec v1.0.0 // indirect
38+
github.com/kr/pretty v0.3.1 // indirect
39+
github.com/mattn/go-isatty v0.0.20 // indirect
40+
github.com/mattn/go-runewidth v0.0.15 // indirect
41+
github.com/moby/docker-image-spec v1.3.1 // indirect
4342
github.com/opencontainers/go-digest v1.0.0 // indirect
44-
github.com/opencontainers/image-spec v1.0.2 // indirect
43+
github.com/opencontainers/image-spec v1.1.0 // indirect
4544
github.com/pkg/errors v0.9.1 // indirect
4645
github.com/pmezard/go-difflib v1.0.0 // indirect
46+
github.com/rivo/uniseg v0.4.7 // indirect
47+
github.com/rogpeppe/go-internal v1.12.0 // indirect
4748
github.com/sirupsen/logrus v1.9.3 // indirect
4849
github.com/spf13/pflag v1.0.5 // indirect
49-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
50-
go.opentelemetry.io/otel v1.22.0 // indirect
51-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect
52-
go.opentelemetry.io/otel/metric v1.22.0 // indirect
53-
go.opentelemetry.io/otel/sdk v1.22.0 // indirect
54-
go.opentelemetry.io/otel/trace v1.22.0 // indirect
55-
golang.org/x/mod v0.10.0 // indirect
56-
golang.org/x/sys v0.16.0 // indirect
57-
golang.org/x/time v0.3.0 // indirect
58-
golang.org/x/tools v0.9.1 // indirect
50+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
51+
go.opentelemetry.io/otel v1.27.0 // indirect
52+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect
53+
go.opentelemetry.io/otel/metric v1.27.0 // indirect
54+
go.opentelemetry.io/otel/trace v1.27.0 // indirect
55+
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
56+
golang.org/x/sys v0.20.0 // indirect
57+
golang.org/x/text v0.15.0 // indirect
58+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240521202816-d264139d666e // indirect
59+
google.golang.org/grpc v1.64.0 // indirect
60+
google.golang.org/protobuf v1.34.1 // indirect
61+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
5962
gopkg.in/yaml.v3 v3.0.1 // indirect
60-
gotest.tools/v3 v3.4.0 // indirect
6163
)

0 commit comments

Comments
 (0)