Skip to content

Commit 8e69cdf

Browse files
authored
Merge pull request #43 from carolynvs/bump-deps
Update porter to v1.0.9
2 parents 6569535 + 108dad9 commit 8e69cdf

File tree

3 files changed

+122
-483
lines changed

3 files changed

+122
-483
lines changed

cmd/docker/main.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ func main() {
1717
run := func() int {
1818
ctx := context.Background()
1919
m := docker.New()
20-
if err := m.ConfigureLogging(ctx); err != nil {
20+
ctx, err := m.ConfigureLogging(ctx)
21+
if err != nil {
2122
fmt.Println(err)
2223
os.Exit(cli.ExitCodeErr)
2324
}

go.mod

+40-41
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@ replace (
1212
)
1313

1414
require (
15-
get.porter.sh/magefiles v0.3.3
16-
get.porter.sh/porter v1.0.1
15+
get.porter.sh/magefiles v0.5.0
16+
get.porter.sh/porter v1.0.9
1717
github.com/ghodss/yaml v1.0.0
1818
github.com/pkg/errors v0.9.1
19-
github.com/spf13/cobra v1.5.0
20-
github.com/stretchr/testify v1.8.0
19+
github.com/spf13/cobra v1.6.1
20+
github.com/stretchr/testify v1.8.1
2121
github.com/xeipuuv/gojsonschema v1.2.0
22-
go.opentelemetry.io/otel v1.10.0
22+
go.opentelemetry.io/otel v1.13.0
2323
gopkg.in/yaml.v2 v2.4.0
2424
)
2525

2626
require (
2727
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
2828
github.com/Masterminds/semver v1.5.0 // indirect
29-
github.com/Masterminds/semver/v3 v3.1.1 // indirect
29+
github.com/Masterminds/semver/v3 v3.2.0 // indirect
3030
github.com/PaesslerAG/gval v1.2.0 // indirect
3131
github.com/PaesslerAG/jsonpath v0.1.1 // indirect
3232
github.com/PuerkitoBio/goquery v1.8.0 // indirect
@@ -36,17 +36,17 @@ require (
3636
github.com/carolynvs/aferox v0.3.0 // indirect
3737
github.com/carolynvs/magex v0.9.0 // indirect
3838
github.com/cbroglie/mustache v1.4.0 // indirect
39-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
40-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
41-
github.com/cnabio/cnab-go v0.24.1 // indirect
42-
github.com/cnabio/cnab-to-oci v0.3.7 // indirect
43-
github.com/containerd/stargz-snapshotter/estargz v0.12.0 // indirect
39+
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
40+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
41+
github.com/cnabio/cnab-go v0.25.1 // indirect
42+
github.com/cnabio/cnab-to-oci v0.4.0 // indirect
43+
github.com/containerd/stargz-snapshotter/estargz v0.13.0 // indirect
4444
github.com/cyberphone/json-canonicalization v0.0.0-20220623050100-57a0ce2678a7 // indirect
4545
github.com/davecgh/go-spew v1.1.1 // indirect
46-
github.com/docker/cli v20.10.18+incompatible // indirect
46+
github.com/docker/cli v23.0.1+incompatible // indirect
4747
github.com/docker/distribution v2.8.1+incompatible // indirect
48-
github.com/docker/docker v20.10.18+incompatible // indirect
49-
github.com/docker/docker-credential-helpers v0.6.4 // indirect
48+
github.com/docker/docker v23.0.1+incompatible // indirect
49+
github.com/docker/docker-credential-helpers v0.7.0 // indirect
5050
github.com/docker/go-connections v0.4.0 // indirect
5151
github.com/docker/go-metrics v0.0.1 // indirect
5252
github.com/docker/go-units v0.5.0 // indirect
@@ -59,44 +59,43 @@ require (
5959
github.com/gogo/protobuf v1.3.2 // indirect
6060
github.com/golang/protobuf v1.5.2 // indirect
6161
github.com/golang/snappy v0.0.4 // indirect
62-
github.com/google/go-cmp v0.5.9 // indirect
63-
github.com/google/go-containerregistry v0.11.0 // indirect
62+
github.com/google/go-containerregistry v0.13.0 // indirect
6463
github.com/gorilla/mux v1.8.0 // indirect
6564
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
6665
github.com/hashicorp/errwrap v1.1.0 // indirect
67-
github.com/hashicorp/go-hclog v1.3.0 // indirect
66+
github.com/hashicorp/go-hclog v1.4.0 // indirect
6867
github.com/hashicorp/go-multierror v1.1.1 // indirect
6968
github.com/hashicorp/hcl v1.0.0 // indirect
7069
github.com/inconshreveable/mousetrap v1.0.1 // indirect
7170
github.com/jeremywohl/flatten v1.0.1 // indirect
72-
github.com/klauspost/compress v1.15.10 // indirect
71+
github.com/klauspost/compress v1.15.12 // indirect
7372
github.com/klauspost/pgzip v1.2.5 // indirect
7473
github.com/magefile/mage v1.14.0 // indirect
7574
github.com/magiconair/properties v1.8.6 // indirect
7675
github.com/mattn/go-colorable v0.1.13 // indirect
77-
github.com/mattn/go-isatty v0.0.16 // indirect
76+
github.com/mattn/go-isatty v0.0.17 // indirect
7877
github.com/mattn/go-runewidth v0.0.14 // indirect
79-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
78+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
8079
github.com/mholt/archiver/v3 v3.5.1 // indirect
8180
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37 // indirect
8281
github.com/mitchellh/go-homedir v1.1.0 // indirect
8382
github.com/mitchellh/mapstructure v1.5.0 // indirect
84-
github.com/mmcdole/gofeed v1.1.3 // indirect
83+
github.com/mmcdole/gofeed v1.2.0 // indirect
8584
github.com/mmcdole/goxpp v0.0.0-20200921145534-2f3784f67354 // indirect
86-
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
85+
github.com/moby/term v0.0.0-20221120202655-abb19827d345 // indirect
8786
github.com/morikuni/aec v1.0.0 // indirect
8887
github.com/nwaples/rardecode v1.1.3 // indirect
8988
github.com/oklog/ulid v1.3.1 // indirect
9089
github.com/olekukonko/tablewriter v0.0.5 // indirect
9190
github.com/opencontainers/go-digest v1.0.0 // indirect
92-
github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198 // indirect
91+
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
9392
github.com/osteele/liquid v1.3.0 // indirect
9493
github.com/osteele/tuesday v1.0.3 // indirect
9594
github.com/pelletier/go-toml v1.9.5 // indirect
9695
github.com/pierrec/lz4/v4 v4.1.16 // indirect
9796
github.com/pmezard/go-difflib v1.0.0 // indirect
98-
github.com/prometheus/client_golang v1.13.0 // indirect
99-
github.com/prometheus/client_model v0.2.0 // indirect
97+
github.com/prometheus/client_golang v1.14.0 // indirect
98+
github.com/prometheus/client_model v0.3.0 // indirect
10099
github.com/prometheus/common v0.37.0 // indirect
101100
github.com/prometheus/procfs v0.8.0 // indirect
102101
github.com/qri-io/jsonpointer v0.1.1 // indirect
@@ -105,35 +104,35 @@ require (
105104
github.com/rogpeppe/go-internal v1.8.1 // indirect
106105
github.com/shopspring/decimal v1.3.1 // indirect
107106
github.com/sirupsen/logrus v1.9.0 // indirect
108-
github.com/spf13/afero v1.9.2 // indirect
107+
github.com/spf13/afero v1.9.3 // indirect
109108
github.com/spf13/cast v1.5.0 // indirect
110109
github.com/spf13/jwalterweatherman v1.1.0 // indirect
111110
github.com/spf13/pflag v1.0.5 // indirect
112-
github.com/spf13/viper v1.13.0 // indirect
111+
github.com/spf13/viper v1.14.0 // indirect
113112
github.com/subosito/gotenv v1.4.1 // indirect
114113
github.com/ulikunitz/xz v0.5.10 // indirect
115114
github.com/vbatts/tar-split v0.11.2 // indirect
116115
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
117116
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
118117
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
119-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
120-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
121-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
122-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.10.0 // indirect
123-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.10.0 // indirect
124-
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
125-
go.opentelemetry.io/otel/trace v1.10.0 // indirect
118+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.13.0 // indirect
119+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.13.0 // indirect
120+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.13.0 // indirect
121+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.13.0 // indirect
122+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.13.0 // indirect
123+
go.opentelemetry.io/otel/sdk v1.13.0 // indirect
124+
go.opentelemetry.io/otel/trace v1.13.0 // indirect
126125
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
127126
go.uber.org/atomic v1.10.0 // indirect
128127
go.uber.org/multierr v1.8.0 // indirect
129-
go.uber.org/zap v1.23.0 // indirect
130-
golang.org/x/net v0.0.0-20220919232410-f2f64ebce3c1 // indirect
131-
golang.org/x/sync v0.0.0-20220907140024-f12130a52804 // indirect
132-
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
133-
golang.org/x/text v0.3.8 // indirect
128+
go.uber.org/zap v1.24.0 // indirect
129+
golang.org/x/net v0.7.0 // indirect
130+
golang.org/x/sync v0.1.0 // indirect
131+
golang.org/x/sys v0.5.0 // indirect
132+
golang.org/x/text v0.7.0 // indirect
134133
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
135-
google.golang.org/genproto v0.0.0-20220919141832-68c03719ef51 // indirect
136-
google.golang.org/grpc v1.50.0 // indirect
134+
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
135+
google.golang.org/grpc v1.53.0 // indirect
137136
google.golang.org/protobuf v1.28.1 // indirect
138137
gopkg.in/ini.v1 v1.67.0 // indirect
139138
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect

0 commit comments

Comments
 (0)