Switch to cross-build from M1 via Gitea container registry
Deploy Dashboard / deploy (push) Failing after 1m31s

This commit is contained in:
Gan, Jimmy
2026-02-21 00:40:46 +08:00
parent fa63214e0c
commit 1e3bd71bfb
3 changed files with 25 additions and 8 deletions
+3 -6
View File
@@ -19,10 +19,7 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Sync Dashboard Source - name: Pull and Deploy
run: | run: |
cp -r dashboard/* /nas-dashboard/ docker compose -f /nas-dashboard/docker-compose.yml pull
docker compose -f /nas-dashboard/docker-compose.yml up -d
- name: Rebuild and Deploy
run: |
DOCKER_BUILDKIT=1 docker compose -f /nas-dashboard/docker-compose.yml up -d --build
+19
View File
@@ -0,0 +1,19 @@
#!/bin/bash
set -e
REGISTRY="100.78.131.124:3300"
IMAGE="$REGISTRY/jimmy/nas-dashboard"
TAG="${1:-latest}"
DIR="$(cd "$(dirname "$0")" && pwd)"
echo "Building linux/amd64 image..."
docker buildx build --platform linux/amd64 -t "$IMAGE:$TAG" -t "$IMAGE:latest" "$DIR"
echo "Pushing to registry..."
docker push "$IMAGE:$TAG"
[ "$TAG" != "latest" ] && docker push "$IMAGE:latest"
echo "Deploying on NAS..."
ssh zjgump@100.78.131.124 "cd /volume1/docker/nas-dashboard && docker compose pull && docker compose up -d"
echo "Done."
+3 -2
View File
@@ -19,8 +19,8 @@ services:
max-file: "3" max-file: "3"
dashboard: dashboard:
build: . # build: .
image: nas-dashboard:latest image: 100.78.131.124:3300/jimmy/nas-dashboard:latest
container_name: nas-dashboard container_name: nas-dashboard
restart: unless-stopped restart: unless-stopped
ports: ports:
@@ -39,6 +39,7 @@ services:
- TELEGRAM_BOT_TOKEN=${TELEGRAM_BOT_TOKEN:-} - TELEGRAM_BOT_TOKEN=${TELEGRAM_BOT_TOKEN:-}
- TELEGRAM_CHAT_ID=${TELEGRAM_CHAT_ID:-} - TELEGRAM_CHAT_ID=${TELEGRAM_CHAT_ID:-}
- TELEGRAM_PROXY=${TELEGRAM_PROXY:-} - TELEGRAM_PROXY=${TELEGRAM_PROXY:-}
- CORS_ORIGINS=https://nas.jimmygan.com
volumes: volumes:
- /volume1:/volume1 - /volume1:/volume1
- /volume1/docker/nas-dashboard/ssh/dashboard_terminal:/app/ssh/id_ed25519:ro - /volume1/docker/nas-dashboard/ssh/dashboard_terminal:/app/ssh/id_ed25519:ro