chore: update

This commit is contained in:
xboard 2025-01-07 13:29:09 +08:00
parent 440e8d9d35
commit e2b4d1b1a8
5 changed files with 12 additions and 10 deletions

View File

@ -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 }}

1
.gitignore vendored
View File

@ -29,3 +29,4 @@ cli-php.ini
frontend
docker-compose.yaml
bun.lockb
compose.yaml

View File

@ -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
#复制项目文件以及配置文件

View File

@ -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);

View File

@ -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: