Merge remote-tracking branch 'upstream/main' into update_caddy

Update caddy
2022-06-16 14:01:39 +02:00 · 2022-06-16 14:00:12 +02:00
6 changed files with 6 additions and 6 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 3394f64c9022a6db630bee09e3085792b6a6d491
+Subproject commit 61841f76cec4287fd5bfd6944be3ecfc092dced2
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 3db17ae68a2527ec2e694c60ae69fc0d27c1e9d0
+Subproject commit 45635fe7e1723957174c441a5047322edde2a81d
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit a363c9694bb5119231df713842e51cb91240af8b
+Subproject commit 6b54dd7d24a61db632ada3970e78fcb9650e94f2
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit fd753ea41fcff17ce2bcbc4868945bf6d3fa0afc
+Subproject commit 783ffc09830d5481fe73c24b1c967b343aad8fc3
--- a/proxy/Dockerfile
+++ b/proxy/Dockerfile
@ -1,4 +1,4 @@
-FROM caddy:2.3.0-alpine
+FROM caddy:2.5.1-alpine

 LABEL org.opencontainers.image.title="OpenSlides Proxy"
 LABEL org.opencontainers.image.description="The proxy is the entrypoint for traffic going into an OpenSlides instance."
--- a/proxy/Dockerfile.dev
+++ b/proxy/Dockerfile.dev
@ -1,4 +1,4 @@
-FROM caddy:2.3.0-alpine
+FROM caddy:2.5.1-alpine

 RUN apk update && apk add --no-cache jq gettext
Author	SHA1	Message	Date
Oskar Hahn	b9421037f5	Merge remote-tracking branch 'upstream/main' into update_caddy	2022-06-16 14:01:39 +02:00
Oskar Hahn	c39d039a0b	Update caddy	2022-06-16 14:00:12 +02:00