Skip to content

Commit e514042

Browse files
git001git001
committed
Update to caddy 2.7.2, golang 20.7, xcaddy 0.3.4
1 parent f72078c commit e514042

File tree

5 files changed

+134
-141
lines changed

5 files changed

+134
-141
lines changed

‎Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
FROM ubuntu:latest
22

3-
ENV XCADDY_VERSION=0.3.3 \
4-
GOLANG_VERSION=20.4 \
3+
ENV XCADDY_VERSION=0.3.4 \
4+
GOLANG_VERSION=20.7 \
55
APPPORT=:2011 \
6-
UPLOADER_VERSION=0.12
6+
UPLOADER_VERSION=0.13
77

88
COPY docker-files /
99

‎docker-files/opt/webroot/config/Caddyfile-upload-test

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
}
1010

1111
localhost:{$APPPORT} {
12-
1312
file_server browse
1413
templates
1514

‎go.mod

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ module github.com/git001/caddyv2-upload
33
go 1.20
44

55
require (
6-
github.com/caddyserver/caddy/v2 v2.6.4
6+
github.com/caddyserver/caddy/v2 v2.7.2
77
github.com/dustin/go-humanize v1.0.1
88
github.com/google/uuid v1.3.0
99
github.com/pkg/errors v0.9.1
10-
go.uber.org/zap v1.24.0
10+
go.uber.org/zap v1.25.0
1111
)
1212

1313
require (
@@ -17,10 +17,10 @@ require (
1717
github.com/Masterminds/semver/v3 v3.2.0 // indirect
1818
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
1919
github.com/Microsoft/go-winio v0.6.0 // indirect
20-
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
20+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
2121
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect
2222
github.com/beorn7/perks v1.0.1 // indirect
23-
github.com/caddyserver/certmagic v0.17.2 // indirect
23+
github.com/caddyserver/certmagic v0.19.1 // indirect
2424
github.com/cespare/xxhash v1.1.0 // indirect
2525
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2626
github.com/chzyer/readline v1.5.1 // indirect
@@ -38,7 +38,7 @@ require (
3838
github.com/golang/mock v1.6.0 // indirect
3939
github.com/golang/protobuf v1.5.3 // indirect
4040
github.com/golang/snappy v0.0.4 // indirect
41-
github.com/google/cel-go v0.13.0 // indirect
41+
github.com/google/cel-go v0.15.1 // indirect
4242
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
4343
github.com/huandu/xstrings v1.4.0 // indirect
4444
github.com/imdario/mergo v0.3.15 // indirect
@@ -51,60 +51,60 @@ require (
5151
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
5252
github.com/jackc/pgtype v1.14.0 // indirect
5353
github.com/jackc/pgx/v4 v4.18.1 // indirect
54-
github.com/klauspost/compress v1.16.3 // indirect
55-
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
54+
github.com/klauspost/compress v1.16.7 // indirect
55+
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
5656
github.com/libdns/libdns v0.2.1 // indirect
5757
github.com/manifoldco/promptui v0.9.0 // indirect
5858
github.com/mattn/go-colorable v0.1.13 // indirect
5959
github.com/mattn/go-isatty v0.0.18 // indirect
6060
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
6161
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
62-
github.com/mholt/acmez v1.1.0 // indirect
62+
github.com/mholt/acmez v1.2.0 // indirect
6363
github.com/micromdm/scep/v2 v2.1.0 // indirect
64-
github.com/miekg/dns v1.1.52 // indirect
64+
github.com/miekg/dns v1.1.55 // indirect
6565
github.com/mitchellh/copystructure v1.2.0 // indirect
6666
github.com/mitchellh/go-ps v1.0.0 // indirect
6767
github.com/mitchellh/reflectwalk v1.0.2 // indirect
68-
github.com/onsi/ginkgo/v2 v2.9.2 // indirect
68+
github.com/onsi/ginkgo/v2 v2.9.5 // indirect
6969
github.com/prometheus/client_golang v1.14.0 // indirect
7070
github.com/prometheus/client_model v0.3.0 // indirect
7171
github.com/prometheus/common v0.42.0 // indirect
7272
github.com/prometheus/procfs v0.9.0 // indirect
7373
github.com/quic-go/qpack v0.4.0 // indirect
74-
github.com/quic-go/qtls-go1-19 v0.3.0 // indirect
75-
github.com/quic-go/qtls-go1-20 v0.2.0 // indirect
76-
github.com/quic-go/quic-go v0.33.0 // indirect
74+
github.com/quic-go/qtls-go1-20 v0.3.0 // indirect
75+
github.com/quic-go/quic-go v0.37.1 // indirect
7776
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7877
github.com/shopspring/decimal v1.3.1 // indirect
7978
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
8079
github.com/slackhq/nebula v1.6.1 // indirect
81-
github.com/smallstep/certificates v0.23.2 // indirect
80+
github.com/smallstep/certificates v0.24.3-rc.5 // indirect
8281
github.com/smallstep/nosql v0.6.0 // indirect
8382
github.com/smallstep/truststore v0.12.1 // indirect
8483
github.com/spf13/cast v1.5.0 // indirect
85-
github.com/spf13/cobra v1.6.1 // indirect
84+
github.com/spf13/cobra v1.7.0 // indirect
8685
github.com/spf13/pflag v1.0.5 // indirect
8786
github.com/stoewer/go-strcase v1.2.1 // indirect
88-
github.com/tailscale/tscert v0.0.0-20230124224810-c6dc1f4049b2 // indirect
89-
github.com/urfave/cli v1.22.12 // indirect
87+
github.com/tailscale/tscert v0.0.0-20230509043813-4e9cb4f2b4ad // indirect
88+
github.com/urfave/cli v1.22.14 // indirect
89+
github.com/zeebo/blake3 v0.2.3 // indirect
9090
go.etcd.io/bbolt v1.3.7 // indirect
9191
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
92-
go.step.sm/cli-utils v0.7.5 // indirect
93-
go.step.sm/crypto v0.28.0 // indirect
94-
go.step.sm/linkedca v0.19.0 // indirect
95-
go.uber.org/atomic v1.10.0 // indirect
96-
go.uber.org/multierr v1.10.0 // indirect
97-
golang.org/x/crypto v0.7.0 // indirect
92+
go.step.sm/cli-utils v0.8.0 // indirect
93+
go.step.sm/crypto v0.33.0 // indirect
94+
go.step.sm/linkedca v0.20.0 // indirect
95+
go.uber.org/multierr v1.11.0 // indirect
96+
golang.org/x/crypto v0.11.0 // indirect
9897
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
99-
golang.org/x/mod v0.9.0 // indirect
100-
golang.org/x/net v0.8.0 // indirect
101-
golang.org/x/sys v0.6.0 // indirect
102-
golang.org/x/term v0.6.0 // indirect
103-
golang.org/x/text v0.8.0 // indirect
104-
golang.org/x/tools v0.7.0 // indirect
105-
google.golang.org/genproto v0.0.0-20230327152035-dc694ad2151e // indirect
106-
google.golang.org/grpc v1.54.0 // indirect
107-
google.golang.org/protobuf v1.30.0 // indirect
98+
golang.org/x/mod v0.11.0 // indirect
99+
golang.org/x/net v0.12.0 // indirect
100+
golang.org/x/sys v0.10.0 // indirect
101+
golang.org/x/term v0.10.0 // indirect
102+
golang.org/x/text v0.11.0 // indirect
103+
golang.org/x/tools v0.10.0 // indirect
104+
google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 // indirect
105+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
106+
google.golang.org/grpc v1.56.2 // indirect
107+
google.golang.org/protobuf v1.31.0 // indirect
108108
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
109109
gopkg.in/yaml.v3 v3.0.1 // indirect
110110
howett.net/plist v1.0.0 // indirect

0 commit comments

Comments
 (0)