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

Merge dev into main #20

Merged
jimmy merged 9 commits from dev into main 2026-03-03 02:30:12 +08:00
Conversation 0 Commits 9 Files Changed 4
+3 -1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d7b2cb3885 - Show all commits
.gitea/workflows/deploy-claude-dev-dev.yml
+3 -1
View File
@@ -22,6 +22,7 @@ jobs:
volumes: volumes:
- /var/packages/ContainerManager/target/usr/bin/docker:/usr/bin/docker - /var/packages/ContainerManager/target/usr/bin/docker:/usr/bin/docker
- /volume1/docker/claude-dev:/claude-dev-runtime - /volume1/docker/claude-dev:/claude-dev-runtime
- /volume1/docker/nas-dashboard/ssh/vps_terminal:/runner-ssh/server2_key:ro
steps: steps:
- name: Checkout exact commit - name: Checkout exact commit
run: | run: |
@@ -56,7 +57,8 @@ jobs:
if: env.ROLLBACK_ONLY == '0' if: env.ROLLBACK_ONLY == '0'
run: | run: |
set -euo pipefail set -euo pipefail
if ssh -o StrictHostKeyChecking=accept-new jimmyg@158.101.140.85 "podman pull docker.io/library/node:20-bookworm-slim >/dev/null && podman save docker.io/library/node:20-bookworm-slim" | docker load; then chmod 600 /runner-ssh/server2_key
if ssh -i /runner-ssh/server2_key -o IdentitiesOnly=yes -o StrictHostKeyChecking=accept-new jimmyg@158.101.140.85 "podman pull docker.io/library/node:20-bookworm-slim >/dev/null && podman save docker.io/library/node:20-bookworm-slim" | docker load; then
echo "Preloaded node:20-bookworm-slim from server2" echo "Preloaded node:20-bookworm-slim from server2"
else else
echo "Preload from server2 failed; continuing with registry pull during docker build" echo "Preload from server2 failed; continuing with registry pull during docker build"