From 622ce1ef21f32e0e641f7f447e278e2ab0ef6849 Mon Sep 17 00:00:00 2001 From: zk Date: Sun, 3 May 2026 15:13:23 +0100 Subject: [PATCH] hard leather hard house --- .github/workflows/bot.yml | 12 ++---------- .github/workflows/client.yml | 4 ++-- .github/workflows/common.yml | 2 +- .github/workflows/database-seeds.yml | 2 +- .github/workflows/dev-image.yml | 11 ++--------- .github/workflows/github-bot.yml | 11 ++--------- .github/workflows/homepage.yml | 2 +- .github/workflows/seeds-webui.yml | 2 +- .github/workflows/server.yml | 16 ++++------------ 9 files changed, 16 insertions(+), 46 deletions(-) diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml index 04afd1a31..109e620e0 100644 --- a/.github/workflows/bot.yml +++ b/.github/workflows/bot.yml @@ -26,13 +26,6 @@ jobs: with: persist-credentials: false - - name: Image name (lowercase for GHCR) - env: - REPO: ${{ github.repository }} - run: | - REPO_LC="$(echo "$REPO" | tr '[:upper:]' '[:lower:]')" - echo "BOT_IMAGE=ghcr.io/${REPO_LC}-bot" >> "$GITHUB_ENV" - - name: Log in to GHCR uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 with: @@ -44,7 +37,6 @@ jobs: uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1 - name: Build and push - id: docker_build uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0 with: context: . @@ -53,8 +45,8 @@ jobs: provenance: true sbom: true tags: | - ${{ env.BOT_IMAGE }}:${{ github.sha }} - ${{ env.BOT_IMAGE }}:main + ghcr.io/zkldi/tachi-bot:${{ github.sha }} + ghcr.io/zkldi/tachi-bot:main cache-from: type=gha,scope=${{ github.ref_name }}-bot cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-bot diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml index 04d587941..e49ed7969 100644 --- a/.github/workflows/client.yml +++ b/.github/workflows/client.yml @@ -25,7 +25,7 @@ jobs: test: runs-on: ubuntu-latest container: - image: "ghcr.io/${{ github.repository }}-dev:main" + image: ghcr.io/zkldi/tachi-dev:main options: --user root steps: - name: Checkout @@ -45,7 +45,7 @@ jobs: build: runs-on: ubuntu-latest container: - image: "ghcr.io/${{ github.repository }}-dev:main" + image: ghcr.io/zkldi/tachi-dev:main options: --user root needs: test if: ${{ github.ref == 'refs/heads/main' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') }} diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index f52cb8bf8..9baef543d 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -22,7 +22,7 @@ jobs: test: runs-on: ubuntu-latest container: - image: "ghcr.io/${{ github.repository }}-dev:main" + image: ghcr.io/zkldi/tachi-dev:main options: --user root steps: - name: Checkout diff --git a/.github/workflows/database-seeds.yml b/.github/workflows/database-seeds.yml index a45e9b140..f38d8e612 100644 --- a/.github/workflows/database-seeds.yml +++ b/.github/workflows/database-seeds.yml @@ -26,7 +26,7 @@ jobs: test: runs-on: ubuntu-latest container: - image: "ghcr.io/${{ github.repository }}-dev:main" + image: ghcr.io/zkldi/tachi-dev:main options: --user root steps: - name: Checkout diff --git a/.github/workflows/dev-image.yml b/.github/workflows/dev-image.yml index 12d9e0105..585e8a934 100644 --- a/.github/workflows/dev-image.yml +++ b/.github/workflows/dev-image.yml @@ -34,13 +34,6 @@ jobs: with: persist-credentials: false - - name: Image name (lowercase for GHCR) - env: - REPO: ${{ github.repository }} - run: | - REPO_LC="$(echo "$REPO" | tr '[:upper:]' '[:lower:]')" - echo "DEV_IMAGE=ghcr.io/${REPO_LC}-dev" >> "$GITHUB_ENV" - - name: Log in to GHCR if: ${{ github.event_name != 'pull_request' }} uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 @@ -59,7 +52,7 @@ jobs: file: Dockerfile.dev push: ${{ github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }} tags: | - ${{ env.DEV_IMAGE }}:main - ${{ env.DEV_IMAGE }}:${{ github.sha }} + ghcr.io/zkldi/tachi-dev:main + ghcr.io/zkldi/tachi-dev:${{ github.sha }} cache-from: type=gha,scope=dev-image cache-to: type=gha,mode=max,scope=dev-image diff --git a/.github/workflows/github-bot.yml b/.github/workflows/github-bot.yml index 9c91ea1db..96dc6d710 100644 --- a/.github/workflows/github-bot.yml +++ b/.github/workflows/github-bot.yml @@ -25,13 +25,6 @@ jobs: with: persist-credentials: false - - name: Image name (lowercase for GHCR) - env: - REPO: ${{ github.repository }} - run: | - REPO_LC="$(echo "$REPO" | tr '[:upper:]' '[:lower:]')" - echo "GHBOT_IMAGE=ghcr.io/${REPO_LC}-ghbot" >> "$GITHUB_ENV" - - name: Log in to GHCR uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 with: @@ -51,8 +44,8 @@ jobs: provenance: true sbom: true tags: | - ${{ env.GHBOT_IMAGE }}:${{ github.sha }} - ${{ env.GHBOT_IMAGE }}:main + ghcr.io/zkldi/tachi-ghbot:${{ github.sha }} + ghcr.io/zkldi/tachi-ghbot:main cache-from: type=gha,scope=${{ github.ref_name }}-github-bot cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-github-bot diff --git a/.github/workflows/homepage.yml b/.github/workflows/homepage.yml index 103a16e67..3d9062e69 100644 --- a/.github/workflows/homepage.yml +++ b/.github/workflows/homepage.yml @@ -16,7 +16,7 @@ jobs: deploy: runs-on: ubuntu-latest container: - image: "ghcr.io/${{ github.repository }}-dev:main" + image: ghcr.io/zkldi/tachi-dev:main options: --user root if: ${{ github.ref == 'refs/heads/main' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') }} steps: diff --git a/.github/workflows/seeds-webui.yml b/.github/workflows/seeds-webui.yml index 92534637e..e7fcd40fe 100644 --- a/.github/workflows/seeds-webui.yml +++ b/.github/workflows/seeds-webui.yml @@ -26,7 +26,7 @@ jobs: build: runs-on: ubuntu-latest container: - image: "ghcr.io/${{ github.repository }}-dev:main" + image: ghcr.io/zkldi/tachi-dev:main options: --user root steps: - name: Checkout diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml index b192c5878..cb98ce293 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -36,7 +36,7 @@ jobs: test: runs-on: ubuntu-latest container: - image: "ghcr.io/${{ github.repository }}-dev:main" + image: ghcr.io/zkldi/tachi-dev:main options: --user root env: NODE_ENV: "test" @@ -111,14 +111,6 @@ jobs: with: persist-credentials: false - - name: Image name (lowercase for GHCR) - env: - REPO: ${{ github.repository }} - run: | - REPO_LC="$(echo "$REPO" | tr '[:upper:]' '[:lower:]')" - echo "TACHI_IMAGE=ghcr.io/${REPO_LC}" >> "$GITHUB_ENV" - echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> "$GITHUB_ENV" - - name: Log in to GHCR uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 with: @@ -139,10 +131,10 @@ jobs: provenance: true sbom: true tags: | - ${{ env.TACHI_IMAGE }}:${{ github.sha }} - ${{ env.TACHI_IMAGE }}:main + ghcr.io/zkldi/tachi:${{ github.sha }} + ghcr.io/zkldi/tachi:main build-args: | - COMMIT_HASH=${{ env.SHORT_SHA }} + COMMIT_HASH=${{ github.sha }} cache-from: type=gha,scope=server-${{ github.ref_name }} cache-to: type=gha,mode=max,scope=server-${{ github.ref_name }}