jimmy/nas-tools
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge dev to main: Security improvements and comprehensive test infrastructure #39

Merged
jimmy merged 195 commits from dev into main 2026-04-08 01:42:27 +08:00
Conversation 0 Commits 195 Files Changed 87
+9 -5
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 89d0b8d341 - Show all commits
.gitea/workflows/deploy-dev.yml
+9 -5
View File
@@ -13,6 +13,10 @@ concurrency:
jobs: jobs:
deploy-dev: deploy-dev:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container:
volumes:
- /var/packages/ContainerManager/target/usr/bin/docker:/usr/bin/docker
- /volume1/docker/nas-dashboard:/nas-dashboard
steps: steps:
- name: Checkout exact commit - name: Checkout exact commit
run: | run: |
@@ -54,12 +58,12 @@ jobs:
- name: Build dev image - name: Build dev image
run: | run: |
export DOCKER_API_VERSION=1.43 export DOCKER_API_VERSION=1.43
DOCKER_BUILDKIT=0 /volume1/@appstore/ContainerManager/usr/bin/docker build --cache-from nas-dashboard-dev:latest -t nas-dashboard-dev:latest dashboard/ DOCKER_BUILDKIT=0 docker build --cache-from nas-dashboard-dev:latest -t nas-dashboard-dev:latest dashboard/
- name: Sync runtime compose file - name: Sync runtime compose file
run: cp dashboard/docker-compose.dev.yml /volume1/docker/nas-dashboard/docker-compose.dev.yml run: cp dashboard/docker-compose.dev.yml /nas-dashboard/docker-compose.dev.yml
- name: Deploy dev - name: Deploy dev
run: | run: |
export DOCKER_API_VERSION=1.43 export DOCKER_API_VERSION=1.43
cd /volume1/docker/nas-dashboard # Use nsenter to run in host network namespace to avoid Docker-in-Docker network limitations
/volume1/@appstore/ContainerManager/usr/bin/docker rm -f nas-dashboard-dev || true nsenter -t 1 -n docker rm -f nas-dashboard-dev || true
/volume1/@appstore/ContainerManager/usr/bin/docker compose -f docker-compose.dev.yml up -d --pull never nsenter -t 1 -n docker compose -f /volume1/docker/nas-dashboard/docker-compose.dev.yml up -d --pull never