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
2 changed files with 2 additions and 2 deletions
--- 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
`@ -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`	`RUN apk update && apk add --no-cache jq gettext`