Skip to content

Commit d223baa

Browse files
carolynvscarolynvs
committed
Bump docker and containerd
* Upgrade containerd to v1.6.16 * Upgrade docker to v23.0.0-rc.1 Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>
1 parent 1ca5c87 commit d223baa

File tree

4 files changed

+64
-53
lines changed

4 files changed

+64
-53
lines changed

‎driver/docker/client.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ func BuildDockerClientOptions() *cliflags.ClientOptions {
5252
// (but don't check the certs).
5353
tlsVerify, tlsConfigured := os.LookupEnv(DockerTLSVerifyEnvVar)
5454
if tlsConfigured && tlsVerify != "" {
55-
cliOpts.Common.TLS = true
55+
cliOpts.TLS = true
5656

5757
// Check if we should verify certs or allow self-signed certs (insecure)
5858
verify, _ := strconv.ParseBool(tlsVerify)
59-
cliOpts.Common.TLSVerify = verify
59+
cliOpts.TLSVerify = verify
6060

6161
// Check if the TLS certs have been overridden
6262
var certPath string
@@ -66,7 +66,7 @@ func BuildDockerClientOptions() *cliflags.ClientOptions {
6666
certPath = cliOpts.ConfigDir
6767
}
6868

69-
cliOpts.Common.TLSOptions = &tlsconfig.Options{
69+
cliOpts.TLSOptions = &tlsconfig.Options{
7070
CAFile: filepath.Join(certPath, cliflags.DefaultCaFile),
7171
CertFile: filepath.Join(certPath, cliflags.DefaultCertFile),
7272
KeyFile: filepath.Join(certPath, cliflags.DefaultKeyFile),

‎driver/docker/client_test.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ func Test_buildDockerClientOptions(t *testing.T) {
2828
t.Run("tls disabled", func(t *testing.T) {
2929
os.Unsetenv(DockerTLSVerifyEnvVar)
3030
opts := BuildDockerClientOptions()
31-
assert.False(t, opts.Common.TLS, "expected TLS to be disabled")
32-
assert.False(t, opts.Common.TLSVerify, "expected TLSVerify to be disabled")
33-
assert.Nil(t, opts.Common.TLSOptions, "expected TLSOptions to be unset")
31+
assert.False(t, opts.TLS, "expected TLS to be disabled")
32+
assert.False(t, opts.TLSVerify, "expected TLSVerify to be disabled")
33+
assert.Nil(t, opts.TLSOptions, "expected TLSOptions to be unset")
3434
})
3535

3636
t.Run("tls enabled without certs", func(t *testing.T) {
@@ -41,9 +41,9 @@ func Test_buildDockerClientOptions(t *testing.T) {
4141
}()
4242

4343
opts := BuildDockerClientOptions()
44-
assert.True(t, opts.Common.TLS, "expected TLS to be enabled")
45-
assert.True(t, opts.Common.TLSVerify, "expected the certs to be verified")
46-
assert.Equal(t, defaultTLSOptions, opts.Common.TLSOptions, "expected TLSOptions to be initialized to the default TLS settings")
44+
assert.True(t, opts.TLS, "expected TLS to be enabled")
45+
assert.True(t, opts.TLSVerify, "expected the certs to be verified")
46+
assert.Equal(t, defaultTLSOptions, opts.TLSOptions, "expected TLSOptions to be initialized to the default TLS settings")
4747
})
4848

4949
t.Run("tls enabled with custom certs", func(t *testing.T) {
@@ -55,9 +55,9 @@ func Test_buildDockerClientOptions(t *testing.T) {
5555
}()
5656

5757
opts := BuildDockerClientOptions()
58-
assert.True(t, opts.Common.TLS, "expected TLS to be enabled")
59-
assert.True(t, opts.Common.TLSVerify, "expected the certs to be verified")
60-
assert.Equal(t, customTLSOptions, opts.Common.TLSOptions, "expected TLSOptions to use the custom DOCKER_CERT_PATH set")
58+
assert.True(t, opts.TLS, "expected TLS to be enabled")
59+
assert.True(t, opts.TLSVerify, "expected the certs to be verified")
60+
assert.Equal(t, customTLSOptions, opts.TLSOptions, "expected TLSOptions to use the custom DOCKER_CERT_PATH set")
6161
})
6262

6363
t.Run("tls enabled with self-signed certs", func(t *testing.T) {
@@ -69,8 +69,8 @@ func Test_buildDockerClientOptions(t *testing.T) {
6969
}()
7070

7171
opts := BuildDockerClientOptions()
72-
assert.True(t, opts.Common.TLS, "expected TLS to be enabled")
73-
assert.False(t, opts.Common.TLSVerify, "expected TLSVerify to be false")
74-
assert.Equal(t, customTLSOptions, opts.Common.TLSOptions, "expected TLSOptions to use the custom DOCKER_CERT_PATH set")
72+
assert.True(t, opts.TLS, "expected TLS to be enabled")
73+
assert.False(t, opts.TLSVerify, "expected TLSVerify to be false")
74+
assert.Equal(t, customTLSOptions, opts.TLSOptions, "expected TLSOptions to use the custom DOCKER_CERT_PATH set")
7575
})
7676
}

‎go.mod

+12-14
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ require (
66
github.com/Masterminds/semver v1.5.0
77
github.com/cnabio/image-relocation v0.0.0-20220815190842-cd2f11ecad88
88
github.com/cyberphone/json-canonicalization v0.0.0-20210303052042-6bc126869bf4
9-
github.com/docker/cli v20.10.17+incompatible
9+
github.com/docker/cli v23.0.0-rc.1+incompatible
1010
github.com/docker/distribution v2.8.1+incompatible
11-
github.com/docker/docker v20.10.17+incompatible
11+
github.com/docker/docker v23.0.0-rc.1+incompatible
1212
github.com/docker/go-connections v0.4.0
1313
github.com/hashicorp/go-multierror v1.1.1
1414
github.com/mitchellh/copystructure v1.0.0
@@ -35,18 +35,17 @@ require (
3535
github.com/Azure/go-autorest/logger v0.2.1 // indirect
3636
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
3737
github.com/Microsoft/go-winio v0.5.2 // indirect
38-
github.com/Microsoft/hcsshim v0.9.3 // indirect
3938
github.com/PuerkitoBio/purell v1.1.1 // indirect
4039
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
40+
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
4141
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
4242
github.com/beorn7/perks v1.0.1 // indirect
4343
github.com/bugsnag/bugsnag-go v1.5.0 // indirect
4444
github.com/bugsnag/panicwrap v1.2.0 // indirect
4545
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
4646
github.com/cespare/xxhash/v2 v2.1.2 // indirect
4747
github.com/cloudflare/cfssl v1.4.1 // indirect
48-
github.com/containerd/cgroups v1.0.3 // indirect
49-
github.com/containerd/containerd v1.6.6 // indirect
48+
github.com/containerd/containerd v1.6.16 // indirect
5049
github.com/containerd/stargz-snapshotter/estargz v0.4.1 // indirect
5150
github.com/davecgh/go-spew v1.1.1 // indirect
5251
github.com/docker/docker-credential-helpers v0.6.3 // indirect
@@ -65,7 +64,6 @@ require (
6564
github.com/go-sql-driver/mysql v1.4.1 // indirect
6665
github.com/gofrs/uuid v3.2.0+incompatible // indirect
6766
github.com/gogo/protobuf v1.3.2 // indirect
68-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6967
github.com/golang/protobuf v1.5.2 // indirect
7068
github.com/google/gnostic v0.5.7-v3refs // indirect
7169
github.com/google/go-containerregistry v0.5.1 // indirect
@@ -79,12 +77,13 @@ require (
7977
github.com/josharian/intern v1.0.0 // indirect
8078
github.com/json-iterator/go v1.1.12 // indirect
8179
github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 // indirect
80+
github.com/klauspost/compress v1.11.13 // indirect
8281
github.com/mailru/easyjson v0.7.6 // indirect
83-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
82+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
8483
github.com/miekg/pkcs11 v1.1.1 // indirect
8584
github.com/mitchellh/reflectwalk v1.0.0 // indirect
86-
github.com/moby/sys/mount v0.2.0 // indirect
87-
github.com/moby/sys/mountinfo v0.6.0 // indirect
85+
github.com/moby/patternmatcher v0.5.0 // indirect
86+
github.com/moby/sys/sequential v0.5.0 // indirect
8887
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
8988
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9089
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -105,23 +104,22 @@ require (
105104
github.com/theupdateframework/notary v0.6.1 // indirect
106105
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
107106
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
108-
go.opencensus.io v0.23.0 // indirect
109-
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
110-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
107+
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
108+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
111109
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
112110
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
113111
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
114112
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
115113
golang.org/x/text v0.3.7 // indirect
116114
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
117115
google.golang.org/appengine v1.6.7 // indirect
118-
google.golang.org/protobuf v1.27.1 // indirect
116+
google.golang.org/protobuf v1.28.0 // indirect
119117
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
120118
gopkg.in/dancannon/gorethink.v3 v3.0.5 // indirect
121119
gopkg.in/fatih/pool.v2 v2.0.0 // indirect
122120
gopkg.in/gorethink/gorethink.v3 v3.0.5 // indirect
123121
gopkg.in/inf.v0 v0.9.1 // indirect
124-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
122+
gopkg.in/yaml.v3 v3.0.1 // indirect
125123
k8s.io/klog/v2 v2.60.1 // indirect
126124
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
127125
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect

0 commit comments

Comments
 (0)