Skip to content

Commit d1773df

Browse files
committed
chore: update postgres
1 parent 1b8c3ae commit d1773df

2 files changed

Lines changed: 17 additions & 12 deletions

File tree

config/database.ts

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,22 @@ export default ({ env }) => {
3636
database: env('DATABASE_NAME', 'strapi'),
3737
user: env('DATABASE_USERNAME', 'strapi'),
3838
password: env('DATABASE_PASSWORD', 'strapi'),
39-
ssl: env.bool('DATABASE_SSL', false) && {
40-
key: env('DATABASE_SSL_KEY', undefined),
41-
cert: env('DATABASE_SSL_CERT', undefined),
42-
ca: env('DATABASE_SSL_CA', undefined),
43-
capath: env('DATABASE_SSL_CAPATH', undefined),
44-
cipher: env('DATABASE_SSL_CIPHER', undefined),
45-
rejectUnauthorized: env.bool(
46-
'DATABASE_SSL_REJECT_UNAUTHORIZED',
47-
true
48-
),
49-
},
39+
// When DATABASE_SSL is unset, leave `ssl` undefined so node-postgres
40+
// honours `sslmode=require` (or any other sslmode) embedded in
41+
// DATABASE_URL. Explicitly setting `ssl: false` would override it.
42+
ssl: env.bool('DATABASE_SSL', false)
43+
? {
44+
key: env('DATABASE_SSL_KEY', undefined),
45+
cert: env('DATABASE_SSL_CERT', undefined),
46+
ca: env('DATABASE_SSL_CA', undefined),
47+
capath: env('DATABASE_SSL_CAPATH', undefined),
48+
cipher: env('DATABASE_SSL_CIPHER', undefined),
49+
rejectUnauthorized: env.bool(
50+
'DATABASE_SSL_REJECT_UNAUTHORIZED',
51+
true
52+
),
53+
}
54+
: undefined,
5055
schema: env('DATABASE_SCHEMA', 'public'),
5156
},
5257
pool: {

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ services:
1919
command: 'npm run develop'
2020

2121
database_default:
22-
image: postgres:15.7-alpine
22+
image: postgres:18-alpine
2323
environment:
2424
POSTGRES_DB: 'db'
2525
POSTGRES_HOST_AUTH_METHOD: 'trust'

0 commit comments

Comments
 (0)