From 17f1bb0af0f202a625ef561b429228d2087f8036 Mon Sep 17 00:00:00 2001
From: Tobias Genannt <tobias.genannt@gmail.com>
Date: Wed, 29 Mar 2023 10:31:52 +0200
Subject: [PATCH 1/2] Preparation for 2.5.2

---
 VERSION            | 2 +-
 docker-compose.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 73462a5a1..f225a78ad 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5.1
+2.5.2
diff --git a/docker-compose.yml b/docker-compose.yml
index 148bf4bb8..d8537266a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   netbox: &netbox
-    image: docker.io/netboxcommunity/netbox:${VERSION-v3.4-2.5.1}
+    image: docker.io/netboxcommunity/netbox:${VERSION-v3.4-2.5.2}
     depends_on:
     - postgres
     - redis

From 41fd4e5d673d85906877d7cfe7ab5253ca870adb Mon Sep 17 00:00:00 2001
From: Tobias Genannt <tobias.genannt@gmail.com>
Date: Wed, 29 Mar 2023 12:40:32 +0200
Subject: [PATCH 2/2] Further improved test configuration

---
 docker-compose.test.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index d0863ac22..6854e00e9 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -6,9 +6,9 @@ services:
       postgres:
         condition: service_healthy
       redis:
-        condition: service_started
+        condition: service_healthy
       redis-cache:
-        condition: service_started
+        condition: service_healthy
     env_file: env/netbox.env
     user: 'unit:root'
     volumes:
@@ -42,23 +42,24 @@ services:
     image: postgres:15-alpine
     env_file: env/postgres.env
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: "pg_isready -t 2 -d $$POSTGRES_DB -U $$POSTGRES_USER" ## $$ because of docker-compose
       interval: 10s
       timeout: 5s
       retries: 5
-  redis:
+  redis: &redis
     image: redis:7-alpine
     command:
     - sh
     - -c # this is to evaluate the $REDIS_PASSWORD from the env
     - redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
     env_file: env/redis.env
+    healthcheck:
+      start_period: 20s
+      timeout: 3s
+      interval: 15s
+      test: "timeout 2 redis-cli ping"
   redis-cache:
-    image: redis:7-alpine
-    command:
-    - sh
-    - -c # this is to evaluate the $REDIS_PASSWORD from the env
-    - redis-server --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
+    <<: *redis
     env_file: env/redis-cache.env
 volumes:
   netbox-media-files: