From db34a0ae2bc382b0e09d1ae740e7d492cccd56d6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 27 Sep 2024 03:23:22 +0000
Subject: [PATCH 1/2] Update docker.io/postgres Docker tag to v17

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

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 98a6c19..e1f3372 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -39,7 +39,7 @@ services:
       interval: 15s
 
   postgres:
-    image: docker.io/postgres:16-alpine
+    image: docker.io/postgres:17-alpine
     env_file: env/postgres.env
     healthcheck:
       test: pg_isready -q -t 2 -d $$POSTGRES_DB -U $$POSTGRES_USER ## $$ because of docker-compose
diff --git a/docker-compose.yml b/docker-compose.yml
index a00825c..1e27d91 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -46,7 +46,7 @@ services:
 
   # postgres
   postgres:
-    image: docker.io/postgres:16-alpine
+    image: docker.io/postgres:17-alpine
     healthcheck:
       test: pg_isready -q -t 2 -d $$POSTGRES_DB -U $$POSTGRES_USER
       start_period: 20s

From 49d80c9109110fcb205ec0e0f3b8a72933de5c6c Mon Sep 17 00:00:00 2001
From: Tobias Genannt <tobias.genannt@qbeyond.de>
Date: Wed, 18 Dec 2024 12:41:10 +0100
Subject: [PATCH 2/2] Make superlinter happy

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

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index e1f3372..8e89790 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -9,9 +9,9 @@ services:
       redis-cache:
         condition: service_healthy
     env_file: env/netbox.env
-    user: 'unit:root'
+    user: "unit:root"
     volumes:
-    - ./test-configuration/test_config.py:/etc/netbox/config/test_config.py:z,ro
+      - ./test-configuration/test_config.py:/etc/netbox/config/test_config.py:z,ro
     healthcheck:
       test: curl -f http://localhost:8080/login/ || exit 1
       start_period: ${NETBOX_START_PERIOD-120s}
@@ -20,9 +20,9 @@ services:
   netbox-worker:
     <<: *netbox
     command:
-    - /opt/netbox/venv/bin/python
-    - /opt/netbox/netbox/manage.py
-    - rqworker
+      - /opt/netbox/venv/bin/python
+      - /opt/netbox/netbox/manage.py
+      - rqworker
     healthcheck:
       test: ps -aux | grep -v grep | grep -q rqworker || exit 1
       start_period: 40s
@@ -31,7 +31,7 @@ services:
   netbox-housekeeping:
     <<: *netbox
     command:
-    - /opt/netbox/housekeeping.sh
+      - /opt/netbox/housekeeping.sh
     healthcheck:
       test: ps -aux | grep -v grep | grep -q housekeeping || exit 1
       start_period: 40s
@@ -51,12 +51,12 @@ services:
   redis: &redis
     image: docker.io/valkey/valkey:8.0-alpine
     command:
-    - sh
-    - -c # this is to evaluate the $REDIS_PASSWORD from the env
-    - valkey-server --save "" --appendonly no --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
+      - sh
+      - -c # this is to evaluate the $REDIS_PASSWORD from the env
+      - valkey-server --save "" --appendonly no --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
     env_file: env/redis.env
     healthcheck:
-      test: "[ $$(valkey-cli --pass \"$${REDIS_PASSWORD}\" ping) = 'PONG' ]"
+      test: '[ $$(valkey-cli --pass "$${REDIS_PASSWORD}" ping) = ''PONG'' ]'
       start_period: 5s
       timeout: 3s
       interval: 1s