Skip to content

Commit 29f64ee

Browse files
git001git001
committed
Update to go 1.22.3, caddy 2.8.1 and xcaddy 0.4.2
This commit closes gh issue #20
1 parent f7ce013 commit 29f64ee

File tree

4 files changed

+302
-224
lines changed

4 files changed

+302
-224
lines changed

‎.github/workflows/go.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ jobs:
1616
- name: Set up Go
1717
uses: actions/setup-go@v3
1818
with:
19-
go-version: 1.22.0
19+
go-version: 1.22.3
2020

2121
- name: Download xcaddy
22-
run: curl -vLO https://github.com/caddyserver/xcaddy/releases/download/v0.3.5/xcaddy_0.3.5_linux_amd64.tar.gz
22+
run: curl -vLO https://github.com/caddyserver/xcaddy/releases/download/v0.4.2/xcaddy_0.4.2_linux_amd64.tar.gz
2323

2424
- name: Extract xcaddy
25-
run: tar xfvz xcaddy_0.3.5_linux_amd64.tar.gz
25+
run: tar xfvz xcaddy_0.4.2_linux_amd64.tar.gz
2626

2727
- name: Build
2828
run: ./xcaddy build --with github.com/kirsch33/realip --with github.com/caddyserver/jsonc-adapter --with github.com/git001/caddyv2-upload

‎Dockerfile‎

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

3-
ENV XCADDY_VERSION=0.3.5 \
4-
GOLANG_VERSION=22.0 \
3+
ENV XCADDY_VERSION=0.4.2 \
4+
GOLANG_VERSION=22.3 \
55
APPPORT=:2011 \
66
UPLOADER_VERSION=0.17
77

@@ -15,7 +15,7 @@ RUN set -x \
1515
&& curl -sSLO https://github.com/caddyserver/xcaddy/releases/download/v${XCADDY_VERSION}/xcaddy_${XCADDY_VERSION}_linux_amd64.tar.gz \
1616
&& curl -sSLO https://go.dev/dl/go1.${GOLANG_VERSION}.linux-amd64.tar.gz \
1717
&& rm -rf /usr/local/go \
18-
&& tar -C /usr/local -xzf go1.${GOLANG_VERSION}.linux-amd64.tar.gz \
18+
&& tar -C /usr/local --no-overwrite-dir --no-same-owner --no-same-permissions -xzf go1.${GOLANG_VERSION}.linux-amd64.tar.gz \
1919
&& export PATH=$PATH:/usr/local/go/bin \
2020
&& tar xfvz xcaddy_${XCADDY_VERSION}_linux_amd64.tar.gz \
2121
&& ./xcaddy build --with github.com/kirsch33/realip \

‎go.mod‎

Lines changed: 61 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,116 @@
11
module github.com/git001/caddyv2-upload
22

3-
go 1.22
3+
go 1.22.3
44

55
require (
6-
github.com/caddyserver/caddy/v2 v2.7.6
6+
github.com/caddyserver/caddy/v2 v2.8.1
77
github.com/dustin/go-humanize v1.0.1
8-
github.com/google/uuid v1.3.0
8+
github.com/google/uuid v1.6.0
99
github.com/pkg/errors v0.9.1
10-
go.uber.org/zap v1.25.0
10+
go.uber.org/zap v1.27.0
1111
)
1212

1313
require (
14-
filippo.io/edwards25519 v1.0.0 // indirect
14+
filippo.io/edwards25519 v1.1.0 // indirect
1515
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
1616
github.com/Masterminds/goutils v1.1.1 // indirect
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/v4 v4.0.0-20230305170008-8188dc5388df // indirect
20+
github.com/antlr4-go/antlr/v4 v4.13.0 // 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.19.1 // indirect
23+
github.com/caddyserver/certmagic v0.21.2 // indirect
24+
github.com/caddyserver/zerossl v0.1.3 // indirect
2425
github.com/cespare/xxhash v1.1.0 // indirect
2526
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2627
github.com/chzyer/readline v1.5.1 // indirect
27-
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
28+
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
2829
github.com/dgraph-io/badger v1.6.2 // indirect
2930
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
3031
github.com/dgraph-io/ristretto v0.1.1 // indirect
3132
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
32-
github.com/go-kit/kit v0.12.0 // indirect
33+
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
34+
github.com/go-kit/kit v0.13.0 // indirect
3335
github.com/go-kit/log v0.2.1 // indirect
3436
github.com/go-logfmt/logfmt v0.6.0 // indirect
35-
github.com/go-sql-driver/mysql v1.7.0 // indirect
37+
github.com/go-sql-driver/mysql v1.7.1 // indirect
3638
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
37-
github.com/golang/glog v1.1.1 // indirect
38-
github.com/golang/mock v1.6.0 // indirect
39-
github.com/golang/protobuf v1.5.3 // indirect
39+
github.com/golang/glog v1.2.0 // indirect
40+
github.com/golang/protobuf v1.5.4 // indirect
4041
github.com/golang/snappy v0.0.4 // indirect
41-
github.com/google/cel-go v0.15.1 // indirect
42-
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
42+
github.com/google/cel-go v0.20.1 // indirect
43+
github.com/google/pprof v0.0.0-20231212022811-ec68065c825e // indirect
4344
github.com/huandu/xstrings v1.4.0 // indirect
4445
github.com/imdario/mergo v0.3.15 // indirect
4546
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4647
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
47-
github.com/jackc/pgconn v1.14.0 // indirect
48+
github.com/jackc/pgconn v1.14.3 // indirect
4849
github.com/jackc/pgio v1.0.0 // indirect
4950
github.com/jackc/pgpassfile v1.0.0 // indirect
50-
github.com/jackc/pgproto3/v2 v2.3.2 // indirect
51+
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
5152
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
5253
github.com/jackc/pgtype v1.14.0 // indirect
53-
github.com/jackc/pgx/v4 v4.18.1 // indirect
54-
github.com/klauspost/compress v1.16.7 // indirect
55-
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
56-
github.com/libdns/libdns v0.2.1 // indirect
54+
github.com/jackc/pgx/v4 v4.18.3 // indirect
55+
github.com/klauspost/compress v1.17.8 // indirect
56+
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
57+
github.com/libdns/libdns v0.2.2 // indirect
5758
github.com/manifoldco/promptui v0.9.0 // indirect
5859
github.com/mattn/go-colorable v0.1.13 // indirect
59-
github.com/mattn/go-isatty v0.0.18 // indirect
60-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
60+
github.com/mattn/go-isatty v0.0.20 // indirect
6161
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
62-
github.com/mholt/acmez v1.2.0 // indirect
63-
github.com/micromdm/scep/v2 v2.1.0 // indirect
64-
github.com/miekg/dns v1.1.55 // indirect
62+
github.com/mholt/acmez/v2 v2.0.1 // indirect
63+
github.com/miekg/dns v1.1.59 // indirect
6564
github.com/mitchellh/copystructure v1.2.0 // indirect
6665
github.com/mitchellh/go-ps v1.0.0 // indirect
6766
github.com/mitchellh/reflectwalk v1.0.2 // indirect
68-
github.com/onsi/ginkgo/v2 v2.9.5 // indirect
69-
github.com/prometheus/client_golang v1.14.0 // indirect
70-
github.com/prometheus/client_model v0.3.0 // indirect
71-
github.com/prometheus/common v0.42.0 // indirect
72-
github.com/prometheus/procfs v0.9.0 // indirect
67+
github.com/onsi/ginkgo/v2 v2.13.2 // indirect
68+
github.com/prometheus/client_golang v1.19.1 // indirect
69+
github.com/prometheus/client_model v0.5.0 // indirect
70+
github.com/prometheus/common v0.48.0 // indirect
71+
github.com/prometheus/procfs v0.12.0 // indirect
7372
github.com/quic-go/qpack v0.4.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
73+
github.com/quic-go/quic-go v0.44.0 // indirect
74+
github.com/rs/xid v1.5.0 // indirect
7675
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7776
github.com/shopspring/decimal v1.3.1 // indirect
7877
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
7978
github.com/slackhq/nebula v1.6.1 // indirect
80-
github.com/smallstep/certificates v0.24.3-rc.5 // indirect
81-
github.com/smallstep/nosql v0.6.0 // indirect
82-
github.com/smallstep/truststore v0.12.1 // indirect
79+
github.com/smallstep/certificates v0.26.1 // indirect
80+
github.com/smallstep/nosql v0.6.1 // indirect
81+
github.com/smallstep/pkcs7 v0.0.0-20231024181729-3b98ecc1ca81 // indirect
82+
github.com/smallstep/scep v0.0.0-20231024192529-aee96d7ad34d // indirect
83+
github.com/smallstep/truststore v0.13.0 // indirect
8384
github.com/spf13/cast v1.5.0 // indirect
84-
github.com/spf13/cobra v1.7.0 // indirect
85+
github.com/spf13/cobra v1.8.0 // indirect
8586
github.com/spf13/pflag v1.0.5 // indirect
8687
github.com/stoewer/go-strcase v1.2.1 // indirect
87-
github.com/tailscale/tscert v0.0.0-20230509043813-4e9cb4f2b4ad // indirect
88+
github.com/tailscale/tscert v0.0.0-20240517230440-bbccfbf48933 // indirect
8889
github.com/urfave/cli v1.22.14 // indirect
8990
github.com/zeebo/blake3 v0.2.3 // indirect
90-
go.etcd.io/bbolt v1.3.7 // indirect
91-
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // 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
91+
go.etcd.io/bbolt v1.3.9 // indirect
92+
go.step.sm/cli-utils v0.9.0 // indirect
93+
go.step.sm/crypto v0.45.0 // indirect
94+
go.step.sm/linkedca v0.20.1 // indirect
95+
go.uber.org/automaxprocs v1.5.3 // indirect
96+
go.uber.org/mock v0.4.0 // indirect
9597
go.uber.org/multierr v1.11.0 // indirect
96-
golang.org/x/crypto v0.11.0 // indirect
97-
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // 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
108-
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
98+
go.uber.org/zap/exp v0.2.0 // indirect
99+
golang.org/x/crypto v0.23.0 // indirect
100+
golang.org/x/crypto/x509roots/fallback v0.0.0-20240507223354-67b13616a595 // indirect
101+
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
102+
golang.org/x/mod v0.17.0 // indirect
103+
golang.org/x/net v0.25.0 // indirect
104+
golang.org/x/sync v0.7.0 // indirect
105+
golang.org/x/sys v0.20.0 // indirect
106+
golang.org/x/term v0.20.0 // indirect
107+
golang.org/x/text v0.15.0 // indirect
108+
golang.org/x/time v0.5.0 // indirect
109+
golang.org/x/tools v0.21.0 // indirect
110+
google.golang.org/genproto/googleapis/api v0.0.0-20240506185236-b8a5c65736ae // indirect
111+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 // indirect
112+
google.golang.org/grpc v1.63.2 // indirect
113+
google.golang.org/protobuf v1.34.1 // indirect
109114
gopkg.in/yaml.v3 v3.0.1 // indirect
110115
howett.net/plist v1.0.0 // indirect
111116
)

0 commit comments

Comments
 (0)