diff --git a/dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/config/IntegrationTestConfig.java b/dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/config/IntegrationTestConfig.java index 505c12eea2ad..9c355dea561c 100644 --- a/dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/config/IntegrationTestConfig.java +++ b/dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/config/IntegrationTestConfig.java @@ -89,7 +89,8 @@ private JdbcDatabaseContainer initContainer() { .appendCustomPostgresConfig("max_locks_per_transaction=100") .withDatabaseName(POSTGRES_DATABASE_NAME) .withUsername(POSTGRES_CREDENTIALS) - .withPassword(POSTGRES_CREDENTIALS); + .withPassword(POSTGRES_CREDENTIALS) + .withEnv("LC_COLLATE", "C"); postgisContainer.start(); diff --git a/dhis-2/dhis-test-e2e/docker-compose.yml b/dhis-2/dhis-test-e2e/docker-compose.yml index 67fd61e88d5a..21b934408b8c 100644 --- a/dhis-2/dhis-test-e2e/docker-compose.yml +++ b/dhis-2/dhis-test-e2e/docker-compose.yml @@ -17,6 +17,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: 30s