From d8b37e6870730e7f39d84fd35c5160d99ddecb94 Mon Sep 17 00:00:00 2001
From: Christian Winther <jippignu@gmail.com>
Date: Wed, 17 Jan 2024 14:13:38 +0000
Subject: [PATCH] debug redis

---
 .github/workflows/docker.yml | 8 +++++---
 docker-compose.yml           | 9 ++++++---
 goss.yaml                    | 1 -
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index ea3533a3e..87b91a20f 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -188,14 +188,16 @@ jobs:
           cache-from: type=gha,scope=${{ matrix.target_runtime }}-${{ matrix.php_base }}-${{ matrix.php_version }}
           cache-to: type=gha,mode=max,scope=${{ matrix.target_runtime }}-${{ matrix.php_base }}-${{ matrix.php_version }}
 
+      # goss validate the image
+      #
+      # See: https://github.com/goss-org/goss
       - uses: e1himself/goss-installation-action@v1
         with:
           version: "v0.4.4"
-
       - name: Execute Goss tests
         run: |
           dgoss run \
             -v "./.env.testing:/var/www/.env" \
-            -e EXPECTED_PHP_VERSION=${{ matrix.php_version }} \
-            -e PHP_BASE_TYPE=${{ matrix.php_base }} \
+            -e "EXPECTED_PHP_VERSION=${{ matrix.php_version }}" \
+            -e "PHP_BASE_TYPE=${{ matrix.php_base }}" \
             ${{ steps.meta.outputs.tags }}
diff --git a/docker-compose.yml b/docker-compose.yml
index 76aebf609..b85118411 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -128,18 +128,21 @@ services:
       - "${DOCKER_DB_PORT_EXTERNAL}:3306"
 
   redis:
-    image: redis:7
+    image: redis:7.2
     container_name: "${DOCKER_CONTAINER_NAME_PREFIX}-redis"
     restart: unless-stopped
+    command: ["/etc/redis/redis.conf", "--requirepass", "${REDIS_PASSWORD:-}"]
+    environment:
+      - REDISCLI_AUTH=${REDIS_PASSWORD:-}
     env_file:
       - ".env"
     volumes:
       - "${DOCKER_CONFIG_ROOT}/redis:/etc/redis"
       - "${DOCKER_REDIS_DATA_PATH}:/data"
     ports:
-      - "${DOCKER_REDIS_PORT_EXTERNAL}:6399"
+      - "${DOCKER_REDIS_PORT_EXTERNAL}:6379"
     healthcheck:
       interval: 10s
       timeout: 5s
       retries: 2
-      test: ["CMD", "redis-cli", "-p", "6399", "ping"]
+      test: ["CMD", "redis-cli", "-p", "6379", "ping"]
diff --git a/goss.yaml b/goss.yaml
index a43763b7a..aa5ee6058 100644
--- a/goss.yaml
+++ b/goss.yaml
@@ -67,7 +67,6 @@ command:
       - pdo_sqlite
       - Phar
       - posix
-      - random
       - readline
       - redis
       - Reflection