Merge dev into main #20
@@ -11,6 +11,10 @@ on:
|
|||||||
description: 'Optional full image ref (for rollback), e.g. claude-dev:dev-abc123'
|
description: 'Optional full image ref (for rollback), e.g. claude-dev:dev-abc123'
|
||||||
required: false
|
required: false
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: deploy-claude-dev-dev
|
||||||
|
cancel-in-progress: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
deploy-claude-dev-dev:
|
deploy-claude-dev-dev:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@@ -19,8 +23,13 @@ jobs:
|
|||||||
- /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
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout dev branch
|
- name: Checkout exact commit
|
||||||
run: git clone --depth 1 --branch dev http://gitea:3000/jimmy/nas-tools.git .
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
git init .
|
||||||
|
git remote add origin http://gitea:3000/jimmy/nas-tools.git
|
||||||
|
git fetch --depth 1 origin "$GITHUB_SHA"
|
||||||
|
git checkout --detach FETCH_HEAD
|
||||||
|
|
||||||
- name: Resolve image tags
|
- name: Resolve image tags
|
||||||
run: |
|
run: |
|
||||||
@@ -80,6 +89,7 @@ jobs:
|
|||||||
- name: Record previous image
|
- name: Record previous image
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
mkdir -p /claude-dev-runtime
|
||||||
previous_image="$(docker inspect -f '{{.Config.Image}}' claude-dev 2>/dev/null || true)"
|
previous_image="$(docker inspect -f '{{.Config.Image}}' claude-dev 2>/dev/null || true)"
|
||||||
if [ -n "$previous_image" ]; then
|
if [ -n "$previous_image" ]; then
|
||||||
printf '%s\n' "$previous_image" > /claude-dev-runtime/previous-image.txt
|
printf '%s\n' "$previous_image" > /claude-dev-runtime/previous-image.txt
|
||||||
@@ -94,6 +104,9 @@ jobs:
|
|||||||
cp claude-dev/docker-compose.yml /claude-dev-runtime/docker-compose.yml
|
cp claude-dev/docker-compose.yml /claude-dev-runtime/docker-compose.yml
|
||||||
printf '%s\n' "$CLAUDE_DEV_IMAGE_TAG" > /claude-dev-runtime/target-tag.txt
|
printf '%s\n' "$CLAUDE_DEV_IMAGE_TAG" > /claude-dev-runtime/target-tag.txt
|
||||||
|
|
||||||
|
- name: Remove stale claude-dev container
|
||||||
|
run: docker rm -f claude-dev || true
|
||||||
|
|
||||||
- name: Deploy claude-dev
|
- name: Deploy claude-dev
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|||||||
@@ -4,7 +4,11 @@ on:
|
|||||||
branches: [dev]
|
branches: [dev]
|
||||||
paths:
|
paths:
|
||||||
- 'dashboard/**'
|
- 'dashboard/**'
|
||||||
- '.gitea/workflows/**'
|
- '.gitea/workflows/deploy-dev.yml'
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: deploy-dashboard-dev
|
||||||
|
cancel-in-progress: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
deploy-dev:
|
deploy-dev:
|
||||||
@@ -14,8 +18,13 @@ jobs:
|
|||||||
- /var/packages/ContainerManager/target/usr/bin/docker:/usr/bin/docker
|
- /var/packages/ContainerManager/target/usr/bin/docker:/usr/bin/docker
|
||||||
- /volume1/docker/nas-dashboard:/nas-dashboard
|
- /volume1/docker/nas-dashboard:/nas-dashboard
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout dev branch
|
- name: Checkout exact commit
|
||||||
run: git clone --depth 1 --branch dev http://gitea:3000/jimmy/nas-tools.git .
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
git init .
|
||||||
|
git remote add origin http://gitea:3000/jimmy/nas-tools.git
|
||||||
|
git fetch --depth 1 origin "$GITHUB_SHA"
|
||||||
|
git checkout --detach FETCH_HEAD
|
||||||
- name: Build dev image
|
- name: Build dev image
|
||||||
run: DOCKER_BUILDKIT=0 docker build --cache-from nas-dashboard-dev:latest -t nas-dashboard-dev:latest dashboard/
|
run: DOCKER_BUILDKIT=0 docker build --cache-from nas-dashboard-dev:latest -t nas-dashboard-dev:latest dashboard/
|
||||||
- name: Deploy dev
|
- name: Deploy dev
|
||||||
|
|||||||
@@ -4,7 +4,11 @@ on:
|
|||||||
branches: [main]
|
branches: [main]
|
||||||
paths:
|
paths:
|
||||||
- 'dashboard/**'
|
- 'dashboard/**'
|
||||||
- '.gitea/workflows/**'
|
- '.gitea/workflows/deploy.yml'
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: deploy-dashboard-main
|
||||||
|
cancel-in-progress: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
deploy:
|
deploy:
|
||||||
@@ -14,8 +18,13 @@ jobs:
|
|||||||
- /var/packages/ContainerManager/target/usr/bin/docker:/usr/bin/docker
|
- /var/packages/ContainerManager/target/usr/bin/docker:/usr/bin/docker
|
||||||
- /volume1/docker/nas-dashboard:/nas-dashboard
|
- /volume1/docker/nas-dashboard:/nas-dashboard
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout exact commit
|
||||||
run: git clone --depth 1 http://gitea:3000/jimmy/nas-tools.git .
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
git init .
|
||||||
|
git remote add origin http://gitea:3000/jimmy/nas-tools.git
|
||||||
|
git fetch --depth 1 origin "$GITHUB_SHA"
|
||||||
|
git checkout --detach FETCH_HEAD
|
||||||
- name: Build
|
- name: Build
|
||||||
run: DOCKER_BUILDKIT=0 docker build -t nas-dashboard:latest dashboard/
|
run: DOCKER_BUILDKIT=0 docker build -t nas-dashboard:latest dashboard/
|
||||||
- name: Deploy
|
- name: Deploy
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM node:20-bookworm
|
FROM node:20-bookworm-slim
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user