Fix to postgres 17

This commit is contained in:
Jamie Curnow
2025-10-27 08:13:03 +10:00
parent c303b69649
commit 1a117a267c
3 changed files with 17 additions and 18 deletions

View File

@@ -1,17 +1,16 @@
# WARNING: This is a CI docker-compose file used for building and testing of the entire app, it should not be used for production. # WARNING: This is a CI docker-compose file used for building and testing of the entire app, it should not be used for production.
services: services:
cypress: cypress:
environment: environment:
CYPRESS_stack: 'postgres' CYPRESS_stack: "postgres"
fullstack: fullstack:
environment: environment:
DB_POSTGRES_HOST: 'db-postgres' DB_POSTGRES_HOST: "db-postgres"
DB_POSTGRES_PORT: '5432' DB_POSTGRES_PORT: "5432"
DB_POSTGRES_USER: 'npm' DB_POSTGRES_USER: "npm"
DB_POSTGRES_PASSWORD: 'npmpass' DB_POSTGRES_PASSWORD: "npmpass"
DB_POSTGRES_NAME: 'npm' DB_POSTGRES_NAME: "npm"
depends_on: depends_on:
- db-postgres - db-postgres
- authentik - authentik
@@ -19,11 +18,11 @@ services:
- authentik-ldap - authentik-ldap
db-postgres: db-postgres:
image: postgres:latest image: postgres:17
environment: environment:
POSTGRES_USER: 'npm' POSTGRES_USER: "npm"
POSTGRES_PASSWORD: 'npmpass' POSTGRES_PASSWORD: "npmpass"
POSTGRES_DB: 'npm' POSTGRES_DB: "npm"
volumes: volumes:
- psql_vol:/var/lib/postgresql/data - psql_vol:/var/lib/postgresql/data
- ./ci/postgres:/docker-entrypoint-initdb.d - ./ci/postgres:/docker-entrypoint-initdb.d
@@ -31,11 +30,11 @@ services:
- fulltest - fulltest
authentik-redis: authentik-redis:
image: 'redis:alpine' image: "redis:alpine"
command: --save 60 1 --loglevel warning command: --save 60 1 --loglevel warning
restart: unless-stopped restart: unless-stopped
healthcheck: healthcheck:
test: ['CMD-SHELL', 'redis-cli ping | grep PONG'] test: ["CMD-SHELL", "redis-cli ping | grep PONG"]
start_period: 20s start_period: 20s
interval: 30s interval: 30s
retries: 5 retries: 5
@@ -66,9 +65,9 @@ services:
authentik-ldap: authentik-ldap:
image: ghcr.io/goauthentik/ldap:2024.10.1 image: ghcr.io/goauthentik/ldap:2024.10.1
environment: environment:
AUTHENTIK_HOST: 'http://authentik:9000' AUTHENTIK_HOST: "http://authentik:9000"
AUTHENTIK_INSECURE: 'true' AUTHENTIK_INSECURE: "true"
AUTHENTIK_TOKEN: 'wKYZuRcI0ETtb8vWzMCr04oNbhrQUUICy89hSpDln1OEKLjiNEuQ51044Vkp' AUTHENTIK_TOKEN: "wKYZuRcI0ETtb8vWzMCr04oNbhrQUUICy89hSpDln1OEKLjiNEuQ51044Vkp"
restart: unless-stopped restart: unless-stopped
depends_on: depends_on:
- authentik - authentik

View File

@@ -79,7 +79,7 @@ services:
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
db-postgres: db-postgres:
image: postgres:latest image: postgres:17
container_name: npm2dev.db-postgres container_name: npm2dev.db-postgres
networks: networks:
- nginx_proxy_manager - nginx_proxy_manager

View File

@@ -135,7 +135,7 @@ services:
- db - db
db: db:
image: postgres:latest image: postgres:17
environment: environment:
POSTGRES_USER: 'npm' POSTGRES_USER: 'npm'
POSTGRES_PASSWORD: 'npmpass' POSTGRES_PASSWORD: 'npmpass'