From cf9ad64a4602f8d021781167d466b41955dec873 Mon Sep 17 00:00:00 2001
From: "allen.yan" <hungyi0816@gmail.com>
Date: Thu, 29 May 2025 16:47:34 +0800
Subject: [PATCH] =?UTF-8?q?Laravel=20=E7=AC=AC=E4=B8=80=E7=89=88=20?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4redis=2020250529?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.example            |  7 -------
 docker-compose.yaml     | 27 ---------------------------
 docker/entrypoint.sh    |  8 --------
 docker/supervisord.conf |  2 +-
 4 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/.env.example b/.env.example
index b111c44..a147d91 100644
--- a/.env.example
+++ b/.env.example
@@ -11,10 +11,3 @@ GIT_REPO_URL=http://47.251.18.130:3000/Leecheng/KTVCentral.git
 DB_DATABASE=Karaoke-Kingpin
 DB_USERNAME=Karaoke-Kingpin
 DB_PASSWORD=ESM7yTPMnavFmbBH
-
-# Redis
-REDIS_HOST=redis
-REDIS_PORT=6379
-QUEUE_CONNECTION=redis
-CACHE_DRIVER=redis
-SESSION_DRIVER=redis
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index cc48fd2..ca36de0 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -17,11 +17,6 @@ services:
       DB_DATABASE: ${DB_DATABASE}
       DB_USERNAME: ${DB_USERNAME}
       DB_PASSWORD: ${DB_PASSWORD}
-      REDIS_HOST: ${REDIS_HOST}
-      REDIS_PORT: ${REDIS_PORT}
-      QUEUE_CONNECTION: ${QUEUE_CONNECTION}
-      CACHE_DRIVER: ${CACHE_DRIVER}
-      SESSION_DRIVER: ${SESSION_DRIVER}
     networks:
       - nginx_proxy
     expose:
@@ -43,27 +38,6 @@ services:
     networks:
       - nginx_proxy
 
-  redis:
-    image: redis:alpine
-    container_name: ${PROJECT_NAME}_redis
-    ports:
-      - "6379:6379"
-    restart: unless-stopped
-    volumes:
-      - redisdata:/data
-    networks:
-      - nginx_proxy
-
-  redisinsight:
-    image: redislabs/redisinsight:latest
-    container_name: ${PROJECT_NAME}_redisinsight
-    ports:
-      - "8001:8001"
-    networks:
-      - nginx_proxy
-    depends_on:
-      - redis
-
   nginx-proxy:
     image: jwilder/nginx-proxy
     container_name: ${PROJECT_NAME}_nginx_proxy
@@ -80,7 +54,6 @@ services:
 
 volumes:
   dbdata:
-  redisdata:
 
 networks:
   nginx_proxy:
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index b5dc314..3100e9e 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -4,8 +4,6 @@ cd /var/www
 
 APP_URL="${APP_URL%/}"
 
-: "${REDIS_HOST:=redis}"
-: "${REDIS_PORT:=6379}"
 
 if [ ! -d "html" ]; then
   if [ -n "$GIT_REPO_URL" ]; then
@@ -42,17 +40,11 @@ update_env_var "L5_SWAGGER_CONST_HOST" "$APP_URL"
 update_env_var "DB_DATABASE" "$DB_DATABASE"
 update_env_var "DB_USERNAME" "$DB_USERNAME"
 update_env_var "DB_PASSWORD" "$DB_PASSWORD"
-update_env_var "REDIS_HOST" "$REDIS_HOST"
-update_env_var "REDIS_PORT" "$REDIS_PORT"
-update_env_var "QUEUE_CONNECTION" "$QUEUE_CONNECTION"
-update_env_var "CACHE_DRIVER" "$CACHE_DRIVER"
-update_env_var "SESSION_DRIVER" "$SESSION_DRIVER"
 
 echo "Generating Laravel app key..."
 php artisan key:generate
 
 echo "Running migrations..."
-php artisan config:clear && cache:clear
 php artisan migrate --force
 
 echo "Installing npm packages..."
diff --git a/docker/supervisord.conf b/docker/supervisord.conf
index b4088f9..d17211e 100644
--- a/docker/supervisord.conf
+++ b/docker/supervisord.conf
@@ -9,7 +9,7 @@ priority=1
 
 [program:queue-worker]
 directory=/var/www/html
-command=php artisan queue:work redis --daemon --timeout=3600 --tries=1 --queue=default
+command=php artisan queue:work --daemon --timeout=3600 --tries=1 --queue=default
 autostart=true
 autorestart=true
 priority=2