Skip to content

A self-hosted media server and file management system

Update build and release

aminnausina3cf0fc22d2a
diff --git a/.editorconfig b/.editorconfig
index 11745be1..8f0de65c 100755
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,7 +12,7 @@ trim_trailing_whitespace = true
trim_trailing_whitespace = false
[*.{yml,yaml}]
-indent_size = 4
+indent_size = 2
[docker-compose.yml]
indent_size = 4
diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml
index 22082f5f..1a7bbaaf 100644
--- a/.github/workflows/build-beta.yml
+++ b/.github/workflows/build-beta.yml
@@ -1,7 +1,12 @@
name: Docker Image CI
on:
- pull_request:
+ workflow_dispatch:
+ inputs:
+ release:
+ description: 'yes to release'
+ required: false
+ push:
branches: ['dev']
jobs:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0513da7b..4194f72e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,8 +11,11 @@ on:
jobs:
build:
- runs-on: ubuntu-latest
+ name: Build
+ permissions:
+ contents: write
+ runs-on: ubuntu-latest
steps:
- name: 读取仓库的内容
uses: actions/checkout@v4
@@ -36,7 +39,6 @@ jobs:
- name: Zip Files Windows
run: |
zip -r mediaServerDockerWindows.zip ./docker ./docker-compose.yaml ./startDocker.bat ./README.md
-
- name: Create Release
uses: ncipollo/release-action@v1
with:
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 1629f147..13494101 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,6 +1,6 @@
services:
app:
- image: aminnausin/mediaserver:latest
+ image: aminnausin/mediaserver:${DOCKER_BRANCH:-latest}
container_name: MediaServer
volumes:
- ./data:/var/www/html/storage/app/public
@@ -20,7 +20,7 @@ services:
env_file:
- .env
queue:
- image: aminnausin/mediaserver:latest
+ image: aminnausin/mediaserver:${DOCKER_BRANCH:-latest}
container_name: job_queue
command: ['php', '/var/www/html/artisan', 'queue:work', '--tries=3']
volumes:
@@ -36,7 +36,7 @@ services:
test: ['CMD', 'healthcheck-queue']
start_period: 10s
event-queue:
- image: aminnausin/mediaserver:latest
+ image: aminnausin/mediaserver:${DOCKER_BRANCH:-latest}
container_name: event_queue
command: ['php', '/var/www/html/artisan', 'queue:work', '--queue=high', '--tries=3']
volumes:
@@ -51,7 +51,7 @@ services:
healthcheck:
test: ['CMD', 'healthcheck-queue']
scheduler:
- image: aminnausin/mediaserver:latest
+ image: aminnausin/mediaserver:${DOCKER_BRANCH:-latest}
container_name: laravel_scheduler
command: ['php', '/var/www/html/artisan', 'schedule:work']
volumes:
@@ -66,7 +66,7 @@ services:
healthcheck:
test: ['CMD', 'healthcheck-schedule']
ws:
- image: aminnausin/mediaserver:latest
+ image: aminnausin/mediaserver:${DOCKER_BRANCH:-latest}
container_name: ws
command: php artisan reverb:start
volumes:
diff --git a/docker/.env.docker b/docker/.env.docker
index 95b6fd16..a4c0adaa 100644
--- a/docker/.env.docker
+++ b/docker/.env.docker
@@ -13,3 +13,5 @@ DB_USERNAME=postgres
DB_PASSWORD=root
TRUSTED_PROXIES=*
+
+DOCKER_RELEASE=latest