Use postgres 15 images (OpenSlides#235)

peb-adr · Dec 12, 2023 · 454c523 · 454c523
1 parent 4c394b4
commit 454c523
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
@@ -89,7 +89,7 @@ disablePostgres: true
 		if err := config.Config(testDir, nil, c); err != nil {
 			t.Fatalf("running config.Config() failed with error: %v", err)
 		}
-		testFileNotContains(t, testDir, "docker-compose.yml", "image: postgres:11")
+		testFileNotContains(t, testDir, "docker-compose.yml", "image: postgres:15")
 	})
 
 	t.Run("running config.Config() using a custom config twice 3", func(t *testing.T) {
@@ -105,7 +105,7 @@ disablePostgres: false
 		if err := config.Config(testDir, nil, c); err != nil {
 			t.Fatalf("running config.Config() failed with error: %v", err)
 		}
-		testFileContains(t, testDir, "docker-compose.yml", "image: postgres:11")
+		testFileContains(t, testDir, "docker-compose.yml", "image: postgres:15")
 	})
 }
 

diff --git a/pkg/config/default-docker-compose.yml b/pkg/config/default-docker-compose.yml
@@ -190,7 +190,7 @@ services:
   {{- if checkFlag .DisablePostgres }}{{ else }}{{- with .Services.postgres }}
 
   postgres:
-    image: postgres:11
+    image: postgres:15
     environment:
       << : *default-environment
       {{- with .Environment }}{{ marshalContent 6 . }}{{- end }}

diff --git a/pkg/setup/setup_test.go b/pkg/setup/setup_test.go
@@ -311,7 +311,7 @@ services:
 		testFileContains(t, testDir, myFileName, "image: example.com/test_Waetai0ohf/openslides-proxy:2.0.0")
 		testFileContains(t, testDir, myFileName, "image: example.com/test_Waetai0ohf/openslides-client:latest")
 		testFileContains(t, testDir, myFileName, "ports:\n      - 127.0.0.1:8001:8000")
-		testFileContains(t, testDir, myFileName, "image: postgres:11")
+		testFileContains(t, testDir, myFileName, "image: postgres:15")
 		testFileNotContains(t, testDir, myFileName, "cert_crt")
 		testKeyFile(t, secDir, "auth_token_key")
 		testKeyFile(t, secDir, "auth_cookie_key")
@@ -331,7 +331,7 @@ disablePostgres: true
 		if err := setup.Setup(testDir, false, nil, c); err != nil {
 			t.Fatalf("running Setup() failed with error: %v", err)
 		}
-		testFileNotContains(t, testDir, myFileName, "image: postgres:11")
+		testFileNotContains(t, testDir, myFileName, "image: postgres:15")
 	})
 
 	t.Run("running setup.Setup() and create all stuff in tmp directory using yet another custom config", func(t *testing.T) {
@@ -639,7 +639,7 @@ services:
       - postgres_password
 
   postgres:
-    image: postgres:11
+    image: postgres:15
     environment:
       << : *default-environment
       POSTGRES_DB: openslides