Merge main into stable/4.0.x. Update 20230609

* commit 'dfc1c39ffd7ca03f58c0c6b8d4a2885a4e644ed6': Use redis:alpine (#223)
OpenSlides · Jun 9, 2023 · e4fc8ef · e4fc8ef
2 parents 65c5b5e + dfc1c39
commit e4fc8ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/config/default-docker-compose.yml b/pkg/config/default-docker-compose.yml
@@ -275,7 +275,7 @@ services:
   {{- with .Services.redis }}
 
   redis:
-    image: redis:latest
+    image: redis:alpine
     command: redis-server --save ""
     environment:
       << : *default-environment

diff --git a/pkg/setup/setup_test.go b/pkg/setup/setup_test.go
@@ -699,7 +699,7 @@ services:
       - postgres_password
 
   redis:
-    image: redis:latest
+    image: redis:alpine
     command: redis-server --save ""
     environment:
       << : *default-environment