mirror of
https://github.com/cedar2025/Xboard.git
synced 2025-03-14 00:38:13 -04:00
chore: update
This commit is contained in:
parent
440e8d9d35
commit
e2b4d1b1a8
5
.github/workflows/docker-publish.yml
vendored
5
.github/workflows/docker-publish.yml
vendored
@ -59,6 +59,11 @@ jobs:
|
|||||||
${{ env.REGISTRY }}/${{ github.repository_owner }}/xboard:new
|
${{ env.REGISTRY }}/${{ github.repository_owner }}/xboard:new
|
||||||
${{ env.REGISTRY }}/${{ github.repository_owner }}/xboard:${{ steps.get_version.outputs.version }}
|
${{ 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
|
- name: Sign image
|
||||||
env:
|
env:
|
||||||
TAGS: ${{ steps.meta.outputs.tags }}
|
TAGS: ${{ steps.meta.outputs.tags }}
|
||||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -29,3 +29,4 @@ cli-php.ini
|
|||||||
frontend
|
frontend
|
||||||
docker-compose.yaml
|
docker-compose.yaml
|
||||||
bun.lockb
|
bun.lockb
|
||||||
|
compose.yaml
|
@ -2,7 +2,7 @@ FROM phpswoole/swoole:php8.1-alpine
|
|||||||
|
|
||||||
COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
|
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 \
|
&& apk --no-cache add shadow sqlite mysql-client git patch \
|
||||||
&& addgroup -S -g 1000 www && adduser -S -G www -u 1000 www
|
&& addgroup -S -g 1000 www && adduser -S -G www -u 1000 www
|
||||||
#复制项目文件以及配置文件
|
#复制项目文件以及配置文件
|
||||||
|
@ -146,8 +146,8 @@ class XboardInstall extends Command
|
|||||||
while (!$isReidsValid) {
|
while (!$isReidsValid) {
|
||||||
// 判断是否为Docker环境
|
// 判断是否为Docker环境
|
||||||
if ($isDocker == 'true' && ($enableRedis || confirm(label: '是否启用Docker内置的Redis', default: true, yes: '启用', no: '不启用'))) {
|
if ($isDocker == 'true' && ($enableRedis || confirm(label: '是否启用Docker内置的Redis', default: true, yes: '启用', no: '不启用'))) {
|
||||||
$envConfig['REDIS_HOST'] = '/run/redis-socket/redis.sock';
|
$envConfig['REDIS_HOST'] = 'redis';
|
||||||
$envConfig['REDIS_PORT'] = 0;
|
$envConfig['REDIS_PORT'] = 6379;
|
||||||
$envConfig['REDIS_PASSWORD'] = null;
|
$envConfig['REDIS_PASSWORD'] = null;
|
||||||
} else {
|
} else {
|
||||||
$envConfig['REDIS_HOST'] = text(label: '请输入Redis地址', default: '127.0.0.1', required: true);
|
$envConfig['REDIS_HOST'] = text(label: '请输入Redis地址', default: '127.0.0.1', required: true);
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
services:
|
services:
|
||||||
web:
|
web:
|
||||||
image: ghcr.io/cedar2025/xboard:new
|
# image: ghcr.io/cedar2025/xboard:new
|
||||||
|
build: .
|
||||||
volumes:
|
volumes:
|
||||||
- ./:/www/
|
- ./:/www/
|
||||||
- redis-socket:/run/redis-socket
|
|
||||||
environment:
|
environment:
|
||||||
- docker=true
|
- docker=true
|
||||||
depends_on:
|
depends_on:
|
||||||
@ -15,19 +15,17 @@ services:
|
|||||||
image: ghcr.io/cedar2025/xboard:new
|
image: ghcr.io/cedar2025/xboard:new
|
||||||
volumes:
|
volumes:
|
||||||
- ./:/www/
|
- ./:/www/
|
||||||
- redis-socket:/run/redis-socket
|
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
network_mode: host
|
network_mode: host
|
||||||
command: php artisan horizon
|
command: php artisan horizon
|
||||||
depends_on:
|
depends_on:
|
||||||
- redis
|
- redis
|
||||||
redis:
|
redis:
|
||||||
image: redis:7-alpine
|
image: redis:7-alpine
|
||||||
command: redis-server --appendonly yes --appendfsync everysec
|
command: redis-server --appendonly yes --appendfsync everysec
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- ./.docker/.data/redis:/data
|
- ./.docker/.data/redis:/data
|
||||||
- redis-socket:/run/redis-socket
|
|
||||||
sysctls:
|
sysctls:
|
||||||
net.core.somaxconn: 1024
|
net.core.somaxconn: 1024
|
||||||
ulimits:
|
ulimits:
|
||||||
@ -35,5 +33,3 @@ services:
|
|||||||
nofile:
|
nofile:
|
||||||
soft: 20000
|
soft: 20000
|
||||||
hard: 40000
|
hard: 40000
|
||||||
volumes:
|
|
||||||
redis-socket:
|
|
||||||
|
Loading…
Reference in New Issue
Block a user