From dc1ed8c570e161cd43b5218a7efffe09c94453c9 Mon Sep 17 00:00:00 2001 From: Joel Falknau Date: Thu, 5 Dec 2024 11:48:45 +1000 Subject: [PATCH 1/3] +x --- docker/conf/redis_healthcheck.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 docker/conf/redis_healthcheck.sh diff --git a/docker/conf/redis_healthcheck.sh b/docker/conf/redis_healthcheck.sh old mode 100644 new mode 100755 From a868438492e01580f396e2d1fcbc60d397667011 Mon Sep 17 00:00:00 2001 From: Joel Falknau Date: Thu, 5 Dec 2024 11:49:32 +1000 Subject: [PATCH 2/3] force these flags on setup --- docker/scripts/download.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/scripts/download.sh b/docker/scripts/download.sh index 833b254c..f8a4526c 100755 --- a/docker/scripts/download.sh +++ b/docker/scripts/download.sh @@ -1,4 +1,6 @@ #!/bin/bash git clone https://gitlab.com/allianceauth/allianceauth.git aa-git cp -R aa-git/docker ./aa-docker +chmod +x aa-docker/conf/memory_check.sh +chmod +x aa-docker/conf/redis_healthcheck.sh rm -rf aa-git From 0a940810bde31a54d7d124ec6388980c7b5ba48f Mon Sep 17 00:00:00 2001 From: Joel Falknau Date: Thu, 5 Dec 2024 11:49:54 +1000 Subject: [PATCH 3/3] dont need this now the flag is set correctly, more consistent --- docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 1c427652..c6917fa5 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -83,7 +83,7 @@ services: - "redis-data:/data" - ./conf/redis_healthcheck.sh:/usr/local/bin/redis_healthcheck.sh healthcheck: - test: ["CMD", "bash", "/usr/local/bin/redis_healthcheck.sh"] + test: ["CMD", "/usr/local/bin/redis_healthcheck.sh"] logging: driver: "json-file" options: