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
Showing only changes of commit a401ba677c - Show all commits
+6 -13
View File
@@ -13,10 +13,6 @@ concurrency:
jobs:
deploy-dev:
runs-on: ubuntu-latest
container:
volumes:
- /var/packages/ContainerManager/target/usr/bin/docker:/usr/bin/docker
- /volume1/docker/nas-dashboard:/nas-dashboard
steps:
- name: Checkout exact commit
run: |
@@ -58,15 +54,12 @@ jobs:
- name: Build dev image
run: |
export DOCKER_API_VERSION=1.43
DOCKER_BUILDKIT=0 docker build --cache-from nas-dashboard-dev:latest -t nas-dashboard-dev:latest dashboard/
DOCKER_BUILDKIT=0 /volume1/@appstore/ContainerManager/usr/bin/docker build --cache-from nas-dashboard-dev:latest -t nas-dashboard-dev:latest dashboard/
- name: Sync runtime compose file
run: cp dashboard/docker-compose.dev.yml /nas-dashboard/docker-compose.dev.yml
run: cp dashboard/docker-compose.dev.yml /volume1/docker/nas-dashboard/docker-compose.dev.yml
- name: Deploy dev
run: |
echo "✅ Image built: nas-dashboard-dev:latest"
echo ""
echo "⚠️ Auto-deploy blocked by Docker-in-Docker network limitation"
echo "Containers with external networks cannot be created from workflow context"
echo ""
echo "To deploy, run:"
echo " ssh nas 'cd /volume1/docker/nas-dashboard && docker rm -f nas-dashboard-dev && docker compose -f docker-compose.dev.yml up -d --pull never'"
export DOCKER_API_VERSION=1.43
cd /volume1/docker/nas-dashboard
/volume1/@appstore/ContainerManager/usr/bin/docker rm -f nas-dashboard-dev || true
/volume1/@appstore/ContainerManager/usr/bin/docker compose -f docker-compose.dev.yml up -d --pull never