Skip to content

Commit 90cd27f

Browse files
authored
Use automatic upgrading PostgreSQL 15 docker image (#6162)
Also adds the POSTGRES_HOST_AUTH_METHOD environment variable to the CI docker compose files. Modern PostgreSQL docker images need it, at least as they're used by our CI.
1 parent 26010f7 commit 90cd27f

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

.ci/docker-compose.ci.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,15 @@ services:
1212
PYTHONUNBUFFERED: 0
1313
REDASH_LOG_LEVEL: "INFO"
1414
REDASH_REDIS_URL: "redis://redis:6379/0"
15-
REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
15+
POSTGRES_PASSWORD: "FmTKs5vX52ufKR1rd8tn4MoSP7zvCJwb"
16+
REDASH_DATABASE_URL: "postgresql://postgres:FmTKs5vX52ufKR1rd8tn4MoSP7zvCJwb@postgres/postgres"
1617
REDASH_COOKIE_SECRET: "2H9gNG9obnAQ9qnR9BDTQUph6CbXKCzF"
1718
redis:
1819
image: redis:3.0-alpine
1920
restart: unless-stopped
2021
postgres:
21-
image: postgres:9.5.6-alpine
22+
image: pgautoupgrade/pgautoupgrade:dev
2223
command: "postgres -c fsync=off -c full_page_writes=off -c synchronous_commit=OFF"
2324
restart: unless-stopped
25+
environment:
26+
POSTGRES_HOST_AUTH_METHOD: "trust"

.ci/docker-compose.cypress.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ x-redash-service: &redash-service
99
x-redash-environment: &redash-environment
1010
REDASH_LOG_LEVEL: "INFO"
1111
REDASH_REDIS_URL: "redis://redis:6379/0"
12-
REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
12+
POSTGRES_PASSWORD: "FmTKs5vX52ufKR1rd8tn4MoSP7zvCJwb"
13+
REDASH_DATABASE_URL: "postgresql://postgres:FmTKs5vX52ufKR1rd8tn4MoSP7zvCJwb@postgres/postgres"
1314
REDASH_RATELIMIT_ENABLED: "false"
1415
REDASH_ENFORCE_CSRF: "true"
1516
REDASH_COOKIE_SECRET: "2H9gNG9obnAQ9qnR9BDTQUph6CbXKCzF"
@@ -67,6 +68,8 @@ services:
6768
image: redis:3.0-alpine
6869
restart: unless-stopped
6970
postgres:
70-
image: postgres:9.5.6-alpine
71+
image: pgautoupgrade/pgautoupgrade:dev
7172
command: "postgres -c fsync=off -c full_page_writes=off -c synchronous_commit=OFF"
7273
restart: unless-stopped
74+
environment:
75+
POSTGRES_HOST_AUTH_METHOD: "trust"

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ services:
5252
image: redis:3-alpine
5353
restart: unless-stopped
5454
postgres:
55-
image: postgres:9.5-alpine
55+
image: pgautoupgrade/pgautoupgrade:dev
5656
ports:
5757
- "15432:5432"
5858
# The following turns the DB into less durable, but gains significant performance improvements for the tests run (x3

0 commit comments

Comments
 (0)