Skip to content

Commit 19ba952

Browse files
committed
use latest depends and make docker great again
1 parent 62ac3b7 commit 19ba952

File tree

3 files changed

+265
-80
lines changed

3 files changed

+265
-80
lines changed

engine/docker/container.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,11 +300,11 @@ func (e *Engine) VirtualizationStart(ctx context.Context, ID string) error {
300300

301301
// VirtualizationStop stop virtualization
302302
func (e *Engine) VirtualizationStop(ctx context.Context, ID string, gracefulTimeout time.Duration) error {
303-
timeout := &gracefulTimeout
304-
if gracefulTimeout <= 0 {
305-
timeout = nil
303+
var timeout *int
304+
if t := int(gracefulTimeout.Seconds()); t > 0 {
305+
timeout = &t
306306
}
307-
return e.client.ContainerStop(ctx, ID, timeout)
307+
return e.client.ContainerStop(ctx, ID, dockercontainer.StopOptions{Timeout: timeout})
308308
}
309309

310310
// VirtualizationRemove remove virtualization

go.mod

Lines changed: 82 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -4,148 +4,154 @@ go 1.19
44

55
require (
66
github.com/CMGS/statsd v0.0.0-20160223095033-48c421b3c1ab
7-
github.com/alicebob/miniredis/v2 v2.14.3
7+
github.com/alicebob/miniredis/v2 v2.30.0
88
github.com/alphadose/haxmap v1.2.0
99
github.com/cenkalti/backoff/v4 v4.2.0
10-
github.com/cockroachdb/errors v1.9.0
11-
github.com/docker/distribution v2.8.0+incompatible
12-
github.com/docker/docker v20.10.22+incompatible
10+
github.com/cockroachdb/errors v1.9.1
11+
github.com/docker/distribution v2.8.1+incompatible
12+
github.com/docker/docker v23.0.0+incompatible
1313
github.com/docker/go-connections v0.4.0
1414
github.com/docker/go-units v0.5.0
15-
github.com/getsentry/sentry-go v0.16.0
16-
github.com/go-git/go-git/v5 v5.5.1
15+
github.com/getsentry/sentry-go v0.17.0
16+
github.com/go-git/go-git/v5 v5.5.2
1717
github.com/go-ping/ping v1.1.0
18-
github.com/go-redis/redis/v8 v8.8.2
18+
github.com/go-redis/redis/v8 v8.11.5
1919
github.com/google/uuid v1.3.0
2020
github.com/jinzhu/configor v1.2.1
2121
github.com/mitchellh/mapstructure v1.5.0
2222
github.com/muroq/redislock v0.0.0-20210327061935-5425e33e6f9f
23-
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799
24-
github.com/panjf2000/ants/v2 v2.7.0
23+
github.com/opencontainers/image-spec v1.1.0-rc2
24+
github.com/panjf2000/ants/v2 v2.7.1
2525
github.com/patrickmn/go-cache v2.1.0+incompatible
2626
github.com/projecteru2/libyavirt v0.0.0-20220621042712-95cdc6363b1c
27-
github.com/prometheus/client_golang v1.11.1
28-
github.com/rs/zerolog v1.28.0
27+
github.com/prometheus/client_golang v1.14.0
28+
github.com/rs/zerolog v1.29.0
2929
github.com/sanity-io/litter v1.5.5
3030
github.com/stretchr/testify v1.8.1
31-
github.com/urfave/cli/v2 v2.23.7
32-
go.etcd.io/bbolt v1.3.6
33-
go.etcd.io/etcd/api/v3 v3.5.6
34-
go.etcd.io/etcd/client/pkg/v3 v3.5.6
35-
go.etcd.io/etcd/client/v3 v3.5.6
36-
go.etcd.io/etcd/tests/v3 v3.5.6
31+
github.com/urfave/cli/v2 v2.24.3
32+
go.etcd.io/bbolt v1.3.7
33+
go.etcd.io/etcd/api/v3 v3.5.7
34+
go.etcd.io/etcd/client/pkg/v3 v3.5.7
35+
go.etcd.io/etcd/client/v3 v3.5.7
36+
go.etcd.io/etcd/tests/v3 v3.5.7
3737
go.uber.org/automaxprocs v1.5.1
3838
go.uber.org/zap v1.24.0
39-
golang.org/x/crypto v0.3.0
40-
golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15
41-
golang.org/x/net v0.2.0
42-
google.golang.org/grpc v1.47.0
39+
golang.org/x/crypto v0.5.0
40+
golang.org/x/exp v0.0.0-20230203172020-98cc5a0785f9
41+
golang.org/x/net v0.5.0
42+
google.golang.org/grpc v1.52.3
4343
google.golang.org/protobuf v1.28.1
4444
)
4545

4646
require (
47-
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
47+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
4848
github.com/BurntSushi/toml v1.2.1 // indirect
49-
github.com/Microsoft/go-winio v0.5.2 // indirect
49+
github.com/Microsoft/go-winio v0.6.0 // indirect
5050
github.com/Microsoft/hcsshim v0.9.6 // indirect
51-
github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect
51+
github.com/ProtonMail/go-crypto v0.0.0-20230201104953-d1d05f4e2bfb // indirect
5252
github.com/acomagu/bufpipe v1.0.3 // indirect
5353
github.com/alexcesaro/statsd v2.0.0+incompatible // indirect
5454
github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
55-
github.com/benbjohnson/clock v1.1.0 // indirect
55+
github.com/benbjohnson/clock v1.3.0 // indirect
5656
github.com/beorn7/perks v1.0.1 // indirect
57-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
58-
github.com/cloudflare/circl v1.1.0 // indirect
59-
github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect
57+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
58+
github.com/cloudflare/circl v1.3.2 // indirect
59+
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
6060
github.com/cockroachdb/redact v1.1.3 // indirect
61-
github.com/containerd/cgroups v1.0.3 // indirect
62-
github.com/containerd/containerd v1.6.13 // indirect
63-
github.com/coreos/go-semver v0.3.0 // indirect
64-
github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534 // indirect
61+
github.com/containerd/cgroups v1.1.0 // indirect
62+
github.com/containerd/containerd v1.6.16 // indirect
63+
github.com/coreos/go-semver v0.3.1 // indirect
64+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
6565
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
6666
github.com/davecgh/go-spew v1.1.1 // indirect
6767
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
6868
github.com/docker/go-metrics v0.0.1 // indirect
6969
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
70-
github.com/dustin/go-humanize v1.0.0 // indirect
70+
github.com/dustin/go-humanize v1.0.1 // indirect
7171
github.com/emirpasic/gods v1.18.1 // indirect
7272
github.com/go-git/gcfg v1.5.0 // indirect
73-
github.com/go-git/go-billy/v5 v5.3.1 // indirect
74-
github.com/go-logr/logr v1.2.2 // indirect
73+
github.com/go-git/go-billy/v5 v5.4.1 // indirect
74+
github.com/go-logr/logr v1.2.3 // indirect
7575
github.com/go-logr/stdr v1.2.2 // indirect
7676
github.com/gogo/protobuf v1.3.2 // indirect
77-
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
77+
github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
7878
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7979
github.com/golang/protobuf v1.5.2 // indirect
80-
github.com/google/btree v1.0.1 // indirect
81-
github.com/gorilla/mux v1.7.4 // indirect
82-
github.com/gorilla/websocket v1.4.2 // indirect
80+
github.com/google/btree v1.1.2 // indirect
81+
github.com/gorilla/mux v1.8.0 // indirect
82+
github.com/gorilla/websocket v1.5.0 // indirect
8383
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
8484
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
8585
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
86+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 // indirect
8687
github.com/imdario/mergo v0.3.13 // indirect
8788
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
88-
github.com/jonboulle/clockwork v0.2.2 // indirect
89+
github.com/jonboulle/clockwork v0.3.0 // indirect
8990
github.com/json-iterator/go v1.1.12 // indirect
90-
github.com/juju/errors v0.0.0-20220331221717-b38fca44723b // indirect
91+
github.com/juju/errors v1.0.0 // indirect
9192
github.com/kevinburke/ssh_config v1.2.0 // indirect
92-
github.com/kr/pretty v0.3.0 // indirect
93+
github.com/klauspost/compress v1.15.15 // indirect
94+
github.com/kr/pretty v0.3.1 // indirect
9395
github.com/kr/text v0.2.0 // indirect
9496
github.com/mattn/go-colorable v0.1.13 // indirect
95-
github.com/mattn/go-isatty v0.0.16 // indirect
97+
github.com/mattn/go-isatty v0.0.17 // indirect
9698
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
97-
github.com/moby/sys/mount v0.2.0 // indirect
98-
github.com/moby/sys/mountinfo v0.5.0 // indirect
99-
github.com/moby/term v0.0.0-20201110203204-bea5bbe245bf // indirect
99+
github.com/moby/patternmatcher v0.5.0 // indirect
100+
github.com/moby/sys/mount v0.3.3 // indirect
101+
github.com/moby/sys/mountinfo v0.6.2 // indirect
102+
github.com/moby/sys/sequential v0.5.0 // indirect
103+
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
100104
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
101105
github.com/modern-go/reflect2 v1.0.2 // indirect
102106
github.com/morikuni/aec v1.0.0 // indirect
103107
github.com/opencontainers/go-digest v1.0.0 // indirect
104-
github.com/opencontainers/runc v1.1.2 // indirect
108+
github.com/opencontainers/runc v1.1.4 // indirect
105109
github.com/pjbgf/sha1cd v0.2.3 // indirect
106110
github.com/pkg/errors v0.9.1 // indirect
107111
github.com/pmezard/go-difflib v1.0.0 // indirect
108-
github.com/prometheus/client_model v0.2.0 // indirect
109-
github.com/prometheus/common v0.30.0 // indirect
110-
github.com/prometheus/procfs v0.7.3 // indirect
111-
github.com/rogpeppe/go-internal v1.8.1 // indirect
112+
github.com/prometheus/client_model v0.3.0 // indirect
113+
github.com/prometheus/common v0.39.0 // indirect
114+
github.com/prometheus/procfs v0.9.0 // indirect
115+
github.com/rogpeppe/go-internal v1.9.0 // indirect
112116
github.com/russross/blackfriday/v2 v2.1.0 // indirect
113-
github.com/sergi/go-diff v1.1.0 // indirect
117+
github.com/sergi/go-diff v1.3.1 // indirect
114118
github.com/sirupsen/logrus v1.9.0 // indirect
115119
github.com/skeema/knownhosts v1.1.0 // indirect
116120
github.com/soheilhy/cmux v0.1.5 // indirect
117121
github.com/spf13/pflag v1.0.5 // indirect
118122
github.com/stretchr/objx v0.5.0 // indirect
119-
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
123+
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect
120124
github.com/xanzy/ssh-agent v0.3.3 // indirect
121-
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
125+
github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect
122126
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
123-
github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da // indirect
124-
go.etcd.io/etcd/client/v2 v2.305.6 // indirect
125-
go.etcd.io/etcd/pkg/v3 v3.5.6 // indirect
126-
go.etcd.io/etcd/raft/v3 v3.5.6 // indirect
127-
go.etcd.io/etcd/server/v3 v3.5.6 // indirect
128-
go.opencensus.io v0.23.0 // indirect
129-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0 // indirect
130-
go.opentelemetry.io/otel v1.4.0 // indirect
131-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0 // indirect
132-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0 // indirect
133-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0 // indirect
127+
github.com/yuin/gopher-lua v1.1.0 // indirect
128+
go.etcd.io/etcd/client/v2 v2.305.7 // indirect
129+
go.etcd.io/etcd/pkg/v3 v3.5.7 // indirect
130+
go.etcd.io/etcd/raft/v3 v3.5.7 // indirect
131+
go.etcd.io/etcd/server/v3 v3.5.7 // indirect
132+
go.opencensus.io v0.24.0 // indirect
133+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.38.0 // indirect
134+
go.opentelemetry.io/otel v1.12.0 // indirect
135+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.12.0 // indirect
136+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.12.0 // indirect
137+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.12.0 // indirect
134138
go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect
135-
go.opentelemetry.io/otel/metric v0.27.0 // indirect
136-
go.opentelemetry.io/otel/sdk v1.3.0 // indirect
137-
go.opentelemetry.io/otel/trace v1.4.0 // indirect
138-
go.opentelemetry.io/proto/otlp v0.11.0 // indirect
139-
go.uber.org/atomic v1.7.0 // indirect
140-
go.uber.org/multierr v1.6.0 // indirect
139+
go.opentelemetry.io/otel/metric v0.35.0 // indirect
140+
go.opentelemetry.io/otel/sdk v1.12.0 // indirect
141+
go.opentelemetry.io/otel/trace v1.12.0 // indirect
142+
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
143+
go.uber.org/atomic v1.10.0 // indirect
144+
go.uber.org/multierr v1.9.0 // indirect
145+
golang.org/x/mod v0.7.0 // indirect
141146
golang.org/x/sync v0.1.0 // indirect
142-
golang.org/x/sys v0.2.0 // indirect
143-
golang.org/x/text v0.4.0 // indirect
144-
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect
145-
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
147+
golang.org/x/sys v0.4.0 // indirect
148+
golang.org/x/text v0.6.0 // indirect
149+
golang.org/x/time v0.3.0 // indirect
150+
golang.org/x/tools v0.5.0 // indirect
151+
google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 // indirect
146152
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
147153
gopkg.in/warnings.v0 v0.1.2 // indirect
148154
gopkg.in/yaml.v2 v2.4.0 // indirect
149155
gopkg.in/yaml.v3 v3.0.1 // indirect
150-
sigs.k8s.io/yaml v1.2.0 // indirect
156+
sigs.k8s.io/yaml v1.3.0 // indirect
151157
)

0 commit comments

Comments
 (0)