Skip to content

Commit 74faa46

Browse files
carolynvscarolynvs
committed
Bump Go, docker, containerd
* Use the most recent version of Go to pick up security fixes * Update docker, containerd, and k8s to the most recently patched versions * Replace packr with go:embed now that we are on a newer version of Go using go:embed to access files on-disk instead of the packr library. Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>
1 parent df6ed99 commit 74faa46

File tree

6 files changed

+755
-177
lines changed

6 files changed

+755
-177
lines changed

‎Makefile

+1-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ HAS_KUBECTL := $(shell $(CHECK) kubectl)
4040
HAS_GOCOV_XML := $(shell $(CHECK) gocov-xml;)
4141
HAS_GOCOV := $(shell $(CHECK) gocov;)
4242
HAS_GO_JUNIT_REPORT := $(shell $(CHECK) go-junit-report;)
43-
HAS_PACKR2 := $(shell $(CHECK) packr2;)
4443

4544
.PHONY: bootstrap
4645
bootstrap:
@@ -63,9 +62,7 @@ endif
6362
ifndef HAS_GO_JUNIT_REPORT
6463
go get github.com/jstemmer/go-junit-report@v0.9.1
6564
endif
66-
ifndef HAS_PACKR2
67-
go get github.com/gobuffalo/packr/v2/packr2@v2.8.0
68-
endif
65+
6966
@# go get to install global tools with modules modify our dependencies. Reset them back
7067
git checkout go.mod go.sum
7168

‎azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pool:
44
steps:
55
- task: GoTool@0
66
inputs:
7-
version: '1.13.10'
7+
version: '1.17.8'
88
displayName: 'Install Go'
99

1010
- script: |

‎brigade.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const { events, Job } = require("brigadier");
33
const projectOrg = "cnabio";
44
const projectName = "cnab-go";
55

6-
const goImg = "golang:1.13";
6+
const goImg = "golang:1.17";
77
const gopath = "/go";
88
const localPath = gopath + `/src/github.com/${projectOrg}/${projectName}`;
99

‎go.mod

+99-30
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,123 @@
11
module github.com/cnabio/cnab-go
22

3-
go 1.13
3+
go 1.17
44

55
require (
66
github.com/Masterminds/semver v1.5.0
7+
github.com/cyberphone/json-canonicalization v0.0.0-20210303052042-6bc126869bf4
8+
github.com/docker/cli v20.10.13+incompatible
9+
github.com/docker/distribution v2.8.1+incompatible
10+
github.com/docker/docker v20.10.13+incompatible
11+
github.com/hashicorp/go-multierror v1.1.1
12+
github.com/mitchellh/copystructure v1.0.0
13+
github.com/oklog/ulid v1.3.1
14+
github.com/opencontainers/go-digest v1.0.0
15+
github.com/pivotal/image-relocation v0.0.0-20191111101224-e94aff6df06c
16+
github.com/pkg/errors v0.9.1
17+
github.com/qri-io/jsonpointer v0.1.1
18+
github.com/qri-io/jsonschema v0.2.2-0.20210723092138-2eb22ee8115f
19+
github.com/stretchr/testify v1.7.0
20+
github.com/xeipuuv/gojsonschema v1.2.0
21+
gopkg.in/yaml.v2 v2.4.0
22+
k8s.io/api v0.23.4
23+
k8s.io/apimachinery v0.23.4
24+
k8s.io/client-go v0.23.4
25+
k8s.io/kubernetes v1.13.0
26+
)
27+
28+
require (
29+
cloud.google.com/go v0.81.0 // indirect
30+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
31+
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
32+
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
33+
github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
34+
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
35+
github.com/Azure/go-autorest/logger v0.2.1 // indirect
36+
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
37+
github.com/Microsoft/go-winio v0.5.2 // indirect
38+
github.com/Microsoft/hcsshim v0.9.2 // indirect
739
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
8-
github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 // indirect
40+
github.com/beorn7/perks v1.0.1 // indirect
941
github.com/bugsnag/bugsnag-go v1.5.0 // indirect
1042
github.com/bugsnag/panicwrap v1.2.0 // indirect
1143
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
44+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
1245
github.com/cloudflare/cfssl v1.4.1 // indirect
13-
github.com/containerd/containerd v1.5.0-beta.1 // indirect
14-
github.com/cyberphone/json-canonicalization v0.0.0-20210303052042-6bc126869bf4
15-
github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017
16-
github.com/docker/distribution v2.8.0+incompatible
17-
github.com/docker/docker v20.10.6+incompatible
46+
github.com/containerd/cgroups v1.0.3 // indirect
47+
github.com/containerd/containerd v1.6.1 // indirect
48+
github.com/containerd/stargz-snapshotter/estargz v0.4.1 // indirect
49+
github.com/davecgh/go-spew v1.1.1 // indirect
50+
github.com/docker/docker-credential-helpers v0.6.3 // indirect
1851
github.com/docker/go v1.5.1-1 // indirect
52+
github.com/docker/go-connections v0.4.0 // indirect
53+
github.com/docker/go-metrics v0.0.1 // indirect
54+
github.com/docker/go-units v0.4.0 // indirect
1955
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
20-
github.com/gobuffalo/packr/v2 v2.8.0
56+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
57+
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
58+
github.com/fvbommel/sortorder v1.0.2 // indirect
59+
github.com/go-logr/logr v1.2.2 // indirect
60+
github.com/go-sql-driver/mysql v1.4.1 // indirect
2161
github.com/gofrs/uuid v3.2.0+incompatible // indirect
22-
github.com/gorilla/mux v1.7.3 // indirect
62+
github.com/gogo/protobuf v1.3.2 // indirect
63+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
64+
github.com/golang/protobuf v1.5.2 // indirect
65+
github.com/google/go-cmp v0.5.6 // indirect
66+
github.com/google/go-containerregistry v0.5.1 // indirect
67+
github.com/google/gofuzz v1.2.0 // indirect
68+
github.com/googleapis/gnostic v0.5.5 // indirect
69+
github.com/gorilla/mux v1.8.0 // indirect
2370
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
24-
github.com/hashicorp/go-multierror v1.1.0
25-
github.com/hashicorp/go-version v1.1.0 // indirect
71+
github.com/hashicorp/errwrap v1.1.0 // indirect
72+
github.com/imdario/mergo v0.3.12 // indirect
73+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
2674
github.com/jinzhu/gorm v1.9.11 // indirect
75+
github.com/json-iterator/go v1.1.12 // indirect
2776
github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 // indirect
28-
github.com/lib/pq v1.2.0 // indirect
77+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
2978
github.com/miekg/pkcs11 v1.0.3 // indirect
30-
github.com/mitchellh/copystructure v1.0.0
79+
github.com/mitchellh/reflectwalk v1.0.0 // indirect
3180
github.com/moby/sys/mount v0.2.0 // indirect
32-
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
81+
github.com/moby/sys/mountinfo v0.6.0 // indirect
82+
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
83+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
84+
github.com/modern-go/reflect2 v1.0.2 // indirect
3385
github.com/morikuni/aec v1.0.0 // indirect
34-
github.com/oklog/ulid v1.3.1
35-
github.com/opencontainers/go-digest v1.0.0
36-
github.com/pivotal/image-relocation v0.0.0-20191111101224-e94aff6df06c
37-
github.com/pkg/errors v0.9.1
38-
github.com/qri-io/jsonpointer v0.1.1
39-
github.com/qri-io/jsonschema v0.2.2-0.20210723092138-2eb22ee8115f
40-
github.com/stretchr/testify v1.6.1
86+
github.com/opencontainers/image-spec v1.0.2 // indirect
87+
github.com/opencontainers/runc v1.1.0 // indirect
88+
github.com/pmezard/go-difflib v1.0.0 // indirect
89+
github.com/prometheus/client_golang v1.11.0 // indirect
90+
github.com/prometheus/client_model v0.2.0 // indirect
91+
github.com/prometheus/common v0.30.0 // indirect
92+
github.com/prometheus/procfs v0.7.3 // indirect
93+
github.com/sirupsen/logrus v1.8.1 // indirect
94+
github.com/spf13/cobra v1.1.3 // indirect
95+
github.com/spf13/pflag v1.0.5 // indirect
4196
github.com/theupdateframework/notary v0.6.1 // indirect
42-
github.com/xeipuuv/gojsonschema v1.2.0
43-
github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect
44-
golang.org/x/sys v0.0.0-20210507161434-a76c4d0a0096 // indirect
97+
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
98+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
99+
go.opencensus.io v0.23.0 // indirect
100+
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
101+
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
102+
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
103+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
104+
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 // indirect
105+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
106+
golang.org/x/text v0.3.7 // indirect
107+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
108+
google.golang.org/appengine v1.6.7 // indirect
109+
google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106 // indirect
110+
google.golang.org/grpc v1.45.0 // indirect
111+
google.golang.org/protobuf v1.27.1 // indirect
45112
gopkg.in/dancannon/gorethink.v3 v3.0.5 // indirect
46113
gopkg.in/fatih/pool.v2 v2.0.0 // indirect
47114
gopkg.in/gorethink/gorethink.v3 v3.0.5 // indirect
48-
gopkg.in/yaml.v2 v2.3.0
49-
k8s.io/api v0.20.1
50-
k8s.io/apimachinery v0.20.1
51-
k8s.io/client-go v0.20.1
52-
k8s.io/kubernetes v1.13.0
53-
vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 // indirect
115+
gopkg.in/inf.v0 v0.9.1 // indirect
116+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
117+
k8s.io/klog/v2 v2.30.0 // indirect
118+
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
119+
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
120+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
121+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
122+
sigs.k8s.io/yaml v1.2.0 // indirect
54123
)

0 commit comments

Comments
 (0)