Skip to content

Commit

Permalink
Use postgres 15 images (#235)
Browse files Browse the repository at this point in the history
  • Loading branch information
peb-adr authored Dec 12, 2023
1 parent 4c394b4 commit 454c523
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions pkg/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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")
})
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/config/default-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
6 changes: 3 additions & 3 deletions pkg/setup/setup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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) {
Expand Down Expand Up @@ -639,7 +639,7 @@ services:
- postgres_password
postgres:
image: postgres:11
image: postgres:15
environment:
<< : *default-environment
POSTGRES_DB: openslides
Expand Down

0 comments on commit 454c523

Please sign in to comment.