From e2b4d1b1a85279a3e567b6b1726a87226da2c221 Mon Sep 17 00:00:00 2001
From: xboard <xboard@xboard.one>
Date: Tue, 7 Jan 2025 13:29:09 +0800
Subject: [PATCH] chore: update

---
 .github/workflows/docker-publish.yml   |  5 +++++
 .gitignore                             |  1 +
 Dockerfile                             |  2 +-
 app/Console/Commands/XboardInstall.php |  4 ++--
 compose.sample.yaml                    | 10 +++-------
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index ea48cd0..1524ba6 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -59,6 +59,11 @@ jobs:
             ${{ env.REGISTRY }}/${{ github.repository_owner }}/xboard:new
             ${{ env.REGISTRY }}/${{ github.repository_owner }}/xboard:${{ steps.get_version.outputs.version }}
 
+      - name: Install cosign
+        uses: sigstore/cosign-installer@v3.4.0
+        with:
+          cosign-release: 'v2.2.2'
+
       - name: Sign image
         env:
           TAGS: ${{ steps.meta.outputs.tags }}
diff --git a/.gitignore b/.gitignore
index 90119cd..b64312e 100755
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ cli-php.ini
 frontend
 docker-compose.yaml
 bun.lockb
+compose.yaml
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index e5631d8..1c2683a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM phpswoole/swoole:php8.1-alpine
 
 COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
 
-RUN install-php-extensions pcntl bcmath inotify \ 
+RUN install-php-extensions pcntl bcmath \ 
     && apk --no-cache add shadow sqlite mysql-client git patch \
     && addgroup -S -g 1000 www && adduser -S -G www -u 1000 www 
 #复制项目文件以及配置文件
diff --git a/app/Console/Commands/XboardInstall.php b/app/Console/Commands/XboardInstall.php
index 434dd10..6d2477b 100644
--- a/app/Console/Commands/XboardInstall.php
+++ b/app/Console/Commands/XboardInstall.php
@@ -146,8 +146,8 @@ class XboardInstall extends Command
             while (!$isReidsValid) {
                 // 判断是否为Docker环境
                 if ($isDocker == 'true' && ($enableRedis || confirm(label: '是否启用Docker内置的Redis', default: true, yes: '启用', no: '不启用'))) {
-                    $envConfig['REDIS_HOST'] = '/run/redis-socket/redis.sock';
-                    $envConfig['REDIS_PORT'] = 0;
+                    $envConfig['REDIS_HOST'] = 'redis';
+                    $envConfig['REDIS_PORT'] = 6379;
                     $envConfig['REDIS_PASSWORD'] = null;
                 } else {
                     $envConfig['REDIS_HOST'] = text(label: '请输入Redis地址', default: '127.0.0.1', required: true);
diff --git a/compose.sample.yaml b/compose.sample.yaml
index 85dcdf8..8ccc7ca 100644
--- a/compose.sample.yaml
+++ b/compose.sample.yaml
@@ -1,9 +1,9 @@
 services:
   web:
-    image: ghcr.io/cedar2025/xboard:new
+    # image: ghcr.io/cedar2025/xboard:new
+    build: .
     volumes:
       - ./:/www/
-      - redis-socket:/run/redis-socket
     environment:
       - docker=true
     depends_on:
@@ -15,19 +15,17 @@ services:
     image: ghcr.io/cedar2025/xboard:new
     volumes:
       - ./:/www/
-      - redis-socket:/run/redis-socket
     restart: on-failure
     network_mode: host
     command: php artisan horizon
     depends_on:
       - redis
   redis:
-    image: redis:7-alpine 
+    image: redis:7-alpine
     command: redis-server --appendonly yes --appendfsync everysec
     restart: unless-stopped
     volumes:
       - ./.docker/.data/redis:/data
-      - redis-socket:/run/redis-socket
     sysctls:
       net.core.somaxconn: 1024
     ulimits:
@@ -35,5 +33,3 @@ services:
       nofile:
         soft: 20000
         hard: 40000
-volumes:
-  redis-socket: