Update compose files to support special chars

ConvoyPanel · Feb 1, 2024 · 4e9ecc5 · 4e9ecc5
1 parent 1bf116c
commit 4e9ecc5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
@@ -16,7 +16,7 @@ services:
     expose:
       - 6379
     healthcheck:
-      test: redis-cli -a ${REDIS_PASSWORD} ping | grep PONG
+      test: redis-cli -a $$REDIS_PASSWORD ping | grep PONG
       interval: 5s
       timeout: 5s
       retries: 20
@@ -33,7 +33,7 @@ services:
       MYSQL_USER: ${DB_USERNAME}
       MYSQL_PASSWORD: ${DB_PASSWORD}
     healthcheck:
-      test: mysqladmin ping -u${DB_USERNAME} -p${DB_PASSWORD}
+      test: mysqladmin ping -u$$MYSQL_USER -p$$MYSQL_PASSWORD
       interval: 5s
       timeout: 5s
       retries: 20
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -68,8 +68,10 @@ services:
     command: redis-server --save 60 1 --loglevel notice --requirepass '${REDIS_PASSWORD}'
     ports:
       - 6379:6379
+    environment:
+      REDIS_PASSWORD: ${REDIS_PASSWORD}
     healthcheck:
-      test: redis-cli -a ${REDIS_PASSWORD} ping | grep PONG
+      test: redis-cli -a $$REDIS_PASSWORD ping | grep PONG
       interval: 5s
       timeout: 5s
       retries: 20
@@ -86,7 +88,7 @@ services:
       MYSQL_USER: ${DB_USERNAME}
       MYSQL_PASSWORD: ${DB_PASSWORD}
     healthcheck:
-      test: mysqladmin ping -u${DB_USERNAME} -p${DB_PASSWORD}
+      test: mysqladmin ping -u$$MYSQL_USER -p$$MYSQL_PASSWORD
       interval: 5s
       timeout: 5s
-      retries: 20
+      retries: 20