Skip to content

Commit 1e4e606

Browse files
aledbfaledbf
authored
Update caddy to v2.7.6 (#19232)
* Update caddy to v2.7.6 * Update go modules
1 parent eedcf89 commit 1e4e606

File tree

26 files changed

+334
-346
lines changed

26 files changed

+334
-346
lines changed

‎components/dashboard/leeway.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN find . -type f \( -name '*.html' -o -name '*.js' -o -name '*.css' -o -name '
1818

1919
COPY components-gitpod-protocol--gitpod-schema/gitpod-schema.json /www/static/schemas/gitpod-schema.json
2020

21-
FROM caddy/caddy:2.7.5-alpine
21+
FROM caddy/caddy:2.7.6-alpine
2222

2323
COPY components-dashboard--static/conf/Caddyfile /etc/caddy/Caddyfile
2424
COPY --from=compress /www /www

‎components/ide-proxy/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN for FILE in `ls /bin/gitpod-local-companion*`;do \
1313
gzip -v -f -9 -k "$FILE"; \
1414
done
1515

16-
FROM caddy/caddy:2.7.5-alpine
16+
FROM caddy/caddy:2.7.6-alpine
1717

1818
COPY conf/Caddyfile /etc/caddy/Caddyfile
1919
COPY static /www/

‎components/proxy/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# Licensed under the GNU Affero General Public License (AGPL).
33
# See License.AGPL.txt in the project root for license information.
44

5-
FROM caddy:2.7.5-builder AS builder
5+
FROM caddy:2.7.6-builder AS builder
66

77
WORKDIR /plugins
88

99
COPY plugins /plugins
1010

1111
# build caddy
12-
RUN xcaddy build v2.7.5 \
12+
RUN xcaddy build v2.7.6 \
1313
--output /caddy \
1414
--with github.com/gitpod-io/gitpod/proxy/plugins/corsorigin=/plugins/corsorigin \
1515
--with github.com/gitpod-io/gitpod/proxy/plugins/secwebsocketkey=/plugins/secwebsocketkey \

‎components/proxy/plugins/analytics/go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/gitpod-io/gitpod/proxy/plugins/analytics
33
go 1.21
44

55
require (
6-
github.com/caddyserver/caddy/v2 v2.7.5
6+
github.com/caddyserver/caddy/v2 v2.7.6
77
go.uber.org/zap v1.25.0
88
gopkg.in/segmentio/analytics-go.v3 v3.1.0
99
)
@@ -19,7 +19,7 @@ require (
1919
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect
2020
github.com/beorn7/perks v1.0.1 // indirect
2121
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
22-
github.com/caddyserver/certmagic v0.19.2 // indirect
22+
github.com/caddyserver/certmagic v0.20.0 // indirect
2323
github.com/cespare/xxhash v1.1.0 // indirect
2424
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2525
github.com/chzyer/readline v1.5.1 // indirect
@@ -33,7 +33,7 @@ require (
3333
github.com/go-logfmt/logfmt v0.5.1 // indirect
3434
github.com/go-sql-driver/mysql v1.7.1 // indirect
3535
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
36-
github.com/golang/glog v1.1.0 // indirect
36+
github.com/golang/glog v1.1.2 // indirect
3737
github.com/golang/protobuf v1.5.3 // indirect
3838
github.com/golang/snappy v0.0.4 // indirect
3939
github.com/google/cel-go v0.15.1 // indirect
@@ -71,8 +71,8 @@ require (
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-20 v0.3.4 // indirect
75-
github.com/quic-go/quic-go v0.39.0 // indirect
74+
github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
75+
github.com/quic-go/quic-go v0.40.0 // indirect
7676
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7777
github.com/segmentio/backo-go v1.0.1 // indirect
7878
github.com/shopspring/decimal v1.2.0 // indirect
@@ -100,13 +100,13 @@ require (
100100
golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0 // indirect
101101
golang.org/x/mod v0.11.0 // indirect
102102
golang.org/x/net v0.17.0 // indirect
103-
golang.org/x/sys v0.13.0 // indirect
103+
golang.org/x/sys v0.14.0 // indirect
104104
golang.org/x/term v0.13.0 // indirect
105105
golang.org/x/text v0.13.0 // indirect
106106
golang.org/x/tools v0.10.0 // indirect
107-
google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect
108-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
109-
google.golang.org/grpc v1.58.2 // indirect
107+
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
108+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
109+
google.golang.org/grpc v1.59.0 // indirect
110110
google.golang.org/protobuf v1.31.0 // indirect
111111
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
112112
gopkg.in/yaml.v3 v3.0.1 // indirect

‎components/proxy/plugins/analytics/go.sum‎

Lines changed: 24 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/proxy/plugins/configcat/go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/gitpod-io/gitpod/proxy/plugins/configcat
33
go 1.21
44

55
require (
6-
github.com/caddyserver/caddy/v2 v2.7.5
6+
github.com/caddyserver/caddy/v2 v2.7.6
77
go.uber.org/zap v1.25.0
88
golang.org/x/sync v0.4.0
99
)
@@ -18,7 +18,7 @@ require (
1818
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
1919
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect
2020
github.com/beorn7/perks v1.0.1 // indirect
21-
github.com/caddyserver/certmagic v0.19.2 // indirect
21+
github.com/caddyserver/certmagic v0.20.0 // indirect
2222
github.com/cespare/xxhash v1.1.0 // indirect
2323
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2424
github.com/chzyer/readline v1.5.1 // indirect
@@ -32,7 +32,7 @@ require (
3232
github.com/go-logfmt/logfmt v0.5.1 // indirect
3333
github.com/go-sql-driver/mysql v1.7.1 // indirect
3434
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
35-
github.com/golang/glog v1.1.0 // indirect
35+
github.com/golang/glog v1.1.2 // indirect
3636
github.com/golang/protobuf v1.5.3 // indirect
3737
github.com/golang/snappy v0.0.4 // indirect
3838
github.com/google/cel-go v0.15.1 // indirect
@@ -70,8 +70,8 @@ require (
7070
github.com/prometheus/common v0.42.0 // indirect
7171
github.com/prometheus/procfs v0.9.0 // indirect
7272
github.com/quic-go/qpack v0.4.0 // indirect
73-
github.com/quic-go/qtls-go1-20 v0.3.4 // indirect
74-
github.com/quic-go/quic-go v0.39.0 // indirect
73+
github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
74+
github.com/quic-go/quic-go v0.40.0 // indirect
7575
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7676
github.com/shopspring/decimal v1.2.0 // indirect
7777
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
@@ -97,13 +97,13 @@ require (
9797
golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0 // indirect
9898
golang.org/x/mod v0.11.0 // indirect
9999
golang.org/x/net v0.17.0 // indirect
100-
golang.org/x/sys v0.13.0 // indirect
100+
golang.org/x/sys v0.14.0 // indirect
101101
golang.org/x/term v0.13.0 // indirect
102102
golang.org/x/text v0.13.0 // indirect
103103
golang.org/x/tools v0.10.0 // indirect
104-
google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect
105-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
106-
google.golang.org/grpc v1.58.2 // indirect
104+
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
105+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
106+
google.golang.org/grpc v1.59.0 // indirect
107107
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

0 commit comments

Comments
 (0)