diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 104981e..96d47f0 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -19,10 +19,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Sync Dashboard Source + - name: Pull and Deploy run: | - cp -r dashboard/* /nas-dashboard/ - - - name: Rebuild and Deploy - run: | - DOCKER_BUILDKIT=1 docker compose -f /nas-dashboard/docker-compose.yml up -d --build + docker compose -f /nas-dashboard/docker-compose.yml pull + docker compose -f /nas-dashboard/docker-compose.yml up -d diff --git a/dashboard/deploy.sh b/dashboard/deploy.sh new file mode 100755 index 0000000..1afea4f --- /dev/null +++ b/dashboard/deploy.sh @@ -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." diff --git a/dashboard/docker-compose.yml b/dashboard/docker-compose.yml index 9b56884..d4ee31d 100644 --- a/dashboard/docker-compose.yml +++ b/dashboard/docker-compose.yml @@ -19,8 +19,8 @@ services: max-file: "3" dashboard: - build: . - image: nas-dashboard:latest + # build: . + image: 100.78.131.124:3300/jimmy/nas-dashboard:latest container_name: nas-dashboard restart: unless-stopped ports: @@ -39,6 +39,7 @@ services: - TELEGRAM_BOT_TOKEN=${TELEGRAM_BOT_TOKEN:-} - TELEGRAM_CHAT_ID=${TELEGRAM_CHAT_ID:-} - TELEGRAM_PROXY=${TELEGRAM_PROXY:-} + - CORS_ORIGINS=https://nas.jimmygan.com volumes: - /volume1:/volume1 - /volume1/docker/nas-dashboard/ssh/dashboard_terminal:/app/ssh/id_ed25519:ro