From 7875e7304e71845fa7300b5a1ee57242eb78d256 Mon Sep 17 00:00:00 2001 From: Napster Date: Sun, 10 Nov 2024 20:24:00 +0100 Subject: [PATCH] PostgreSQL 17 --- docker/deploy/docker-compose.yml | 6 ++---- docker/dev/docker-compose.yaml | 6 ++---- gradle.properties | 2 +- .../java/space/npstr/wolfia/PostgresAndRedisContainers.java | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/docker/deploy/docker-compose.yml b/docker/deploy/docker-compose.yml index db27195c..6252e7c2 100644 --- a/docker/deploy/docker-compose.yml +++ b/docker/deploy/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.6' - networks: traefik: dockersock4traefik: @@ -63,12 +61,12 @@ services: - CF_API_KEY=${CF_KEY} db: - image: napstr/poggres:16 + image: napstr/poggres:17 restart: always ports: - 127.0.0.1:5432:5432 volumes: - - ./postgres-data/16/data:/var/lib/postgresql/data + - ./postgres-data/17/data:/var/lib/postgresql/data environment: - POSTGRES_PASSWORD=${PG_PASS} # See https://github.com/napstr/poggres#env-vars diff --git a/docker/dev/docker-compose.yaml b/docker/dev/docker-compose.yaml index 1dff757e..6b3a9507 100644 --- a/docker/dev/docker-compose.yaml +++ b/docker/dev/docker-compose.yaml @@ -1,15 +1,13 @@ # Required services to run Wolfia on a local machine -version: '3.7' - services: dev-postgres: - image: napstr/poggres:16 + image: napstr/poggres:17 restart: always ports: - 127.0.0.1:5442:5432 volumes: - - ./postgres-data/16/data:/var/lib/postgresql/data + - ./postgres-data/17/data:/var/lib/postgresql/data environment: - POSTGRES_PASSWORD=wolfia - ROLE=wolfia diff --git a/gradle.properties b/gradle.properties index 7276997e..803b625a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,7 +26,7 @@ org.gradle.warning.mode=all javaVersion=21 -postgresVersion=16 +postgresVersion=17 kotlinVersion=[1.9.21, 2.0[ springBootVersion=[3.3.5, 3.4[ flywayVersion=[10.21.0, 12.0[ diff --git a/src/test/java/space/npstr/wolfia/PostgresAndRedisContainers.java b/src/test/java/space/npstr/wolfia/PostgresAndRedisContainers.java index d1836738..e24c66b5 100644 --- a/src/test/java/space/npstr/wolfia/PostgresAndRedisContainers.java +++ b/src/test/java/space/npstr/wolfia/PostgresAndRedisContainers.java @@ -31,7 +31,7 @@ */ public abstract class PostgresAndRedisContainers { - private static final GenericContainer DB = new GenericContainer<>("napstr/poggres:16") + private static final GenericContainer DB = new GenericContainer<>("napstr/poggres:17") .withLogConsumer(new Slf4jLogConsumer(containerLogger("Postgres"))) .withEnv("POSTGRES_HOST_AUTH_METHOD", "trust") .withEnv("ROLE", "wolfia_test")