Skip to content

Commit

Permalink
chore: add C collation to postgres e2e and testcontainer (#15388)
Browse files Browse the repository at this point in the history
  • Loading branch information
lucaCambi77 authored Oct 26, 2023
1 parent b510f69 commit 3afd7e5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ public class IntegrationTestConfig {
.withUsername(POSTGRES_USERNAME)
.withPassword(POSTGRES_PASSWORD)
.withInitScript("db/extensions.sql")
.withTmpFs(Map.of("/testtmpfs", "rw"));
.withTmpFs(Map.of("/testtmpfs", "rw"))
.withEnv("LC_COLLATE", "C");

POSTGRES_CONTAINER.start();
}

Expand Down
1 change: 1 addition & 0 deletions dhis-2/dhis-test-e2e/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ services:
POSTGRES_DB: dhis
POSTGRES_PASSWORD: &postgres_password dhis
PGPASSWORD: *postgres_password # needed by psql in healthcheck
LC_COLLATE : C
healthcheck:
test: [ "CMD-SHELL", "psql --no-password --quiet --username $$POSTGRES_USER postgres://127.0.0.1/$$POSTGRES_DB -p 5432 --command \"SELECT 'ok'\" > /dev/null" ]
start_period: 120s
Expand Down

0 comments on commit 3afd7e5

Please sign in to comment.