Skip to content

Commit cf89f68

Browse files
lucaslorentzlucaslorentz
authored
Merge pull request #402 from lucaslorentz/update-caddy-2.6.1
Update caddy to 2.6.1
2 parents 1b63ec6 + 1ac9fb2 commit cf89f68

File tree

3 files changed

+267
-1143
lines changed

3 files changed

+267
-1143
lines changed

‎azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- task: GoTool@0
1414
inputs:
15-
version: '1.17'
15+
version: '1.18'
1616
GOPATH: '$(Agent.BuildDirectory)/go'
1717
GOBIN: '$(GOPATH)/bin'
1818

‎go.mod‎

Lines changed: 81 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,147 +1,150 @@
11
module github.com/lucaslorentz/caddy-docker-proxy/v2
22

3-
go 1.17
3+
go 1.18
44

55
require (
6-
github.com/caddyserver/caddy/v2 v2.5.2
7-
github.com/docker/docker v20.10.17+incompatible
6+
github.com/caddyserver/caddy/v2 v2.6.1
7+
github.com/docker/docker v20.10.18+incompatible
88
github.com/stretchr/testify v1.8.0
9-
go.uber.org/zap v1.21.0
9+
go.uber.org/zap v1.23.0
1010
)
1111

1212
require (
13-
filippo.io/edwards25519 v1.0.0-rc.1 // indirect
13+
filippo.io/edwards25519 v1.0.0 // indirect
1414
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
15-
github.com/BurntSushi/toml v1.1.0 // indirect
15+
github.com/BurntSushi/toml v1.2.0 // indirect
1616
github.com/Masterminds/goutils v1.1.1 // indirect
1717
github.com/Masterminds/semver/v3 v3.1.1 // indirect
1818
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
19-
github.com/Microsoft/go-winio v0.4.14 // indirect
19+
github.com/Microsoft/go-winio v0.6.0 // indirect
2020
github.com/alecthomas/chroma v0.10.0 // indirect
21-
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed // indirect
21+
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
2222
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect
2323
github.com/beorn7/perks v1.0.1 // indirect
24-
github.com/caddyserver/certmagic v0.16.1 // indirect
25-
github.com/cenkalti/backoff/v4 v4.1.2 // indirect
24+
github.com/caddyserver/certmagic v0.17.1 // indirect
25+
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
2626
github.com/cespare/xxhash v1.1.0 // indirect
2727
github.com/cespare/xxhash/v2 v2.1.2 // indirect
28-
github.com/cheekybits/genny v1.0.0 // indirect
29-
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
30-
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
28+
github.com/chzyer/readline v1.5.1 // indirect
29+
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
3130
github.com/davecgh/go-spew v1.1.1 // indirect
3231
github.com/dgraph-io/badger v1.6.2 // indirect
3332
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
34-
github.com/dgraph-io/ristretto v0.0.4-0.20200906165740-41ebdbffecfd // indirect
33+
github.com/dgraph-io/ristretto v0.1.0 // indirect
3534
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
36-
github.com/dlclark/regexp2 v1.4.0 // indirect
35+
github.com/dlclark/regexp2 v1.7.0 // indirect
3736
github.com/docker/distribution v2.8.1+incompatible // indirect
3837
github.com/docker/go-connections v0.4.0 // indirect
39-
github.com/docker/go-units v0.4.0 // indirect
38+
github.com/docker/go-units v0.5.0 // indirect
4039
github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac // indirect
41-
github.com/felixge/httpsnoop v1.0.2 // indirect
42-
github.com/fsnotify/fsnotify v1.5.1 // indirect
40+
github.com/felixge/httpsnoop v1.0.3 // indirect
41+
github.com/fsnotify/fsnotify v1.5.4 // indirect
4342
github.com/go-chi/chi v4.1.2+incompatible // indirect
44-
github.com/go-kit/kit v0.10.0 // indirect
45-
github.com/go-logfmt/logfmt v0.5.0 // indirect
46-
github.com/go-logr/logr v1.2.2 // indirect
43+
github.com/go-kit/kit v0.12.0 // indirect
44+
github.com/go-kit/log v0.2.1 // indirect
45+
github.com/go-logfmt/logfmt v0.5.1 // indirect
46+
github.com/go-logr/logr v1.2.3 // indirect
4747
github.com/go-logr/stdr v1.2.2 // indirect
4848
github.com/go-sql-driver/mysql v1.6.0 // indirect
4949
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
5050
github.com/gogo/protobuf v1.3.2 // indirect
51+
github.com/golang/glog v1.0.0 // indirect
52+
github.com/golang/mock v1.6.0 // indirect
5153
github.com/golang/protobuf v1.5.2 // indirect
5254
github.com/golang/snappy v0.0.4 // indirect
53-
github.com/google/cel-go v0.11.4 // indirect
55+
github.com/google/cel-go v0.12.5 // indirect
5456
github.com/google/uuid v1.3.0 // indirect
55-
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
57+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
5658
github.com/huandu/xstrings v1.3.2 // indirect
57-
github.com/imdario/mergo v0.3.12 // indirect
59+
github.com/imdario/mergo v0.3.13 // indirect
60+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
5861
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
59-
github.com/jackc/pgconn v1.10.1 // indirect
62+
github.com/jackc/pgconn v1.13.0 // indirect
6063
github.com/jackc/pgio v1.0.0 // indirect
6164
github.com/jackc/pgpassfile v1.0.0 // indirect
62-
github.com/jackc/pgproto3/v2 v2.2.0 // indirect
65+
github.com/jackc/pgproto3/v2 v2.3.1 // indirect
6366
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
64-
github.com/jackc/pgtype v1.9.0 // indirect
65-
github.com/jackc/pgx/v4 v4.14.0 // indirect
66-
github.com/klauspost/compress v1.15.6 // indirect
67-
github.com/klauspost/cpuid/v2 v2.0.13 // indirect
67+
github.com/jackc/pgtype v1.12.0 // indirect
68+
github.com/jackc/pgx/v4 v4.17.2 // indirect
69+
github.com/klauspost/compress v1.15.10 // indirect
70+
github.com/klauspost/cpuid/v2 v2.1.1 // indirect
6871
github.com/libdns/libdns v0.2.1 // indirect
69-
github.com/lucas-clemente/quic-go v0.28.0 // indirect
72+
github.com/lucas-clemente/quic-go v0.29.1 // indirect
7073
github.com/manifoldco/promptui v0.9.0 // indirect
7174
github.com/marten-seemann/qpack v0.2.1 // indirect
72-
github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect
73-
github.com/marten-seemann/qtls-go1-17 v0.1.2 // indirect
7475
github.com/marten-seemann/qtls-go1-18 v0.1.2 // indirect
75-
github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1 // indirect
76-
github.com/mattn/go-colorable v0.1.8 // indirect
77-
github.com/mattn/go-isatty v0.0.13 // indirect
76+
github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect
77+
github.com/mattn/go-colorable v0.1.13 // indirect
78+
github.com/mattn/go-isatty v0.0.16 // indirect
7879
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
7980
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
80-
github.com/mholt/acmez v1.0.2 // indirect
81+
github.com/mholt/acmez v1.0.4 // indirect
8182
github.com/micromdm/scep/v2 v2.1.0 // indirect
82-
github.com/miekg/dns v1.1.46 // indirect
83+
github.com/miekg/dns v1.1.50 // indirect
8384
github.com/mitchellh/copystructure v1.2.0 // indirect
8485
github.com/mitchellh/go-ps v1.0.0 // indirect
8586
github.com/mitchellh/reflectwalk v1.0.2 // indirect
8687
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
8788
github.com/morikuni/aec v1.0.0 // indirect
8889
github.com/nxadm/tail v1.4.8 // indirect
89-
github.com/onsi/ginkgo v1.16.4 // indirect
90+
github.com/onsi/ginkgo v1.16.5 // indirect
9091
github.com/opencontainers/go-digest v1.0.0 // indirect
9192
github.com/opencontainers/image-spec v1.0.2 // indirect
9293
github.com/pkg/errors v0.9.1 // indirect
9394
github.com/pmezard/go-difflib v1.0.0 // indirect
94-
github.com/prometheus/client_golang v1.12.1 // indirect
95+
github.com/prometheus/client_golang v1.13.0 // indirect
9596
github.com/prometheus/client_model v0.2.0 // indirect
96-
github.com/prometheus/common v0.32.1 // indirect
97-
github.com/prometheus/procfs v0.7.3 // indirect
98-
github.com/rs/xid v1.2.1 // indirect
99-
github.com/russross/blackfriday/v2 v2.0.1 // indirect
100-
github.com/shopspring/decimal v1.2.0 // indirect
97+
github.com/prometheus/common v0.37.0 // indirect
98+
github.com/prometheus/procfs v0.8.0 // indirect
99+
github.com/rs/xid v1.4.0 // indirect
100+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
101+
github.com/shopspring/decimal v1.3.1 // indirect
101102
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
102-
github.com/sirupsen/logrus v1.8.1 // indirect
103-
github.com/slackhq/nebula v1.5.2 // indirect
104-
github.com/smallstep/certificates v0.19.0 // indirect
105-
github.com/smallstep/cli v0.18.0 // indirect
103+
github.com/sirupsen/logrus v1.9.0 // indirect
104+
github.com/slackhq/nebula v1.6.0 // indirect
105+
github.com/smallstep/certificates v0.22.1 // indirect
106+
github.com/smallstep/cli v0.22.0 // indirect
106107
github.com/smallstep/nosql v0.4.0 // indirect
107-
github.com/smallstep/truststore v0.11.0 // indirect
108-
github.com/spf13/cast v1.4.1 // indirect
108+
github.com/smallstep/truststore v0.12.0 // indirect
109+
github.com/spf13/cast v1.5.0 // indirect
110+
github.com/spf13/cobra v1.5.0 // indirect
111+
github.com/spf13/pflag v1.0.5 // indirect
109112
github.com/stoewer/go-strcase v1.2.0 // indirect
110113
github.com/tailscale/tscert v0.0.0-20220316030059-54bbcb9f74e2 // indirect
111-
github.com/urfave/cli v1.22.5 // indirect
112-
github.com/yuin/goldmark v1.4.12 // indirect
114+
github.com/urfave/cli v1.22.10 // indirect
115+
github.com/yuin/goldmark v1.5.2 // indirect
113116
github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594 // indirect
114117
go.etcd.io/bbolt v1.3.6 // indirect
115118
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
116-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect
117-
go.opentelemetry.io/otel v1.4.0 // indirect
118-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.0 // indirect
119-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.4.0 // indirect
120-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.4.0 // indirect
121-
go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect
122-
go.opentelemetry.io/otel/metric v0.27.0 // indirect
123-
go.opentelemetry.io/otel/sdk v1.4.0 // indirect
124-
go.opentelemetry.io/otel/trace v1.4.0 // indirect
125-
go.opentelemetry.io/proto/otlp v0.12.0 // indirect
126-
go.step.sm/cli-utils v0.7.0 // indirect
127-
go.step.sm/crypto v0.16.1 // indirect
128-
go.step.sm/linkedca v0.15.0 // indirect
129-
go.uber.org/atomic v1.9.0 // indirect
130-
go.uber.org/multierr v1.6.0 // indirect
131-
golang.org/x/crypto v0.0.0-20220210151621-f4118a5b28e2 // indirect
132-
golang.org/x/mod v0.4.2 // indirect
133-
golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e // indirect
134-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
135-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
119+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.0 // indirect
120+
go.opentelemetry.io/otel v1.10.0 // indirect
121+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
122+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
123+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
124+
go.opentelemetry.io/otel/metric v0.32.1 // indirect
125+
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
126+
go.opentelemetry.io/otel/trace v1.10.0 // indirect
127+
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
128+
go.step.sm/cli-utils v0.7.5 // indirect
129+
go.step.sm/crypto v0.19.0 // indirect
130+
go.step.sm/linkedca v0.18.0 // indirect
131+
go.uber.org/atomic v1.10.0 // indirect
132+
go.uber.org/multierr v1.8.0 // indirect
133+
golang.org/x/crypto v0.0.0-20220924013350-4ba4fb4dd9e7 // indirect
134+
golang.org/x/exp v0.0.0-20220921164117-439092de6870 // indirect
135+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
136+
golang.org/x/net v0.0.0-20220923203811-8be639271d50 // indirect
137+
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
138+
golang.org/x/term v0.0.0-20220919170432-7a66f970e087 // indirect
136139
golang.org/x/text v0.3.8-0.20211004125949-5bd84dd9b33b // indirect
137-
golang.org/x/tools v0.1.7 // indirect
138-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
139-
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
140-
google.golang.org/grpc v1.46.0 // indirect
141-
google.golang.org/protobuf v1.28.0 // indirect
140+
golang.org/x/tools v0.1.12 // indirect
141+
google.golang.org/genproto v0.0.0-20220923205249-dd2d53f1fffc // indirect
142+
google.golang.org/grpc v1.49.0 // indirect
143+
google.golang.org/protobuf v1.28.1 // indirect
142144
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
143145
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
144146
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
147+
gopkg.in/yaml.v2 v2.4.0 // indirect
145148
gopkg.in/yaml.v3 v3.0.1 // indirect
146149
gotest.tools/v3 v3.3.0 // indirect
147150
howett.net/plist v1.0.0 // indirect

0 commit comments

Comments
 (0)