From 454c523c31158580e375984c9de504fddf19f227 Mon Sep 17 00:00:00 2001 From: peb-adr Date: Tue, 12 Dec 2023 16:09:45 +0100 Subject: [PATCH] Use postgres 15 images (#235) --- pkg/config/config_test.go | 4 ++-- pkg/config/default-docker-compose.yml | 2 +- pkg/setup/setup_test.go | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index 523ac40..8c2c155 100644 --- 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 index 5d2a08b..b2926c5 100644 --- 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 index 071e154..9a65153 100644 --- 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