From da1fdafa51dd23b782325f2c5407418cc6d0eff6 Mon Sep 17 00:00:00 2001 From: zk Date: Fri, 15 May 2026 20:34:56 +0000 Subject: [PATCH] fix: improve Dockerfiles 2 --- .github/workflows/bot.yml | 7 +++++++ .github/workflows/github-bot.yml | 7 +++++++ .github/workflows/server.yml | 5 +++++ 3 files changed, 19 insertions(+) diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml index a03820593..70247996a 100644 --- a/.github/workflows/bot.yml +++ b/.github/workflows/bot.yml @@ -36,6 +36,10 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1 + - name: Set build time + id: build_time + run: echo "value=$(date -u +%Y-%m-%dT%H:%M:%SZ)" >> "$GITHUB_OUTPUT" + - name: Build and push uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0 with: @@ -48,6 +52,9 @@ jobs: ghcr.io/zkldi/tachi-bot:${{ github.sha }} ghcr.io/zkldi/tachi-bot:main ghcr.io/zkldi/tachi-bot:latest + build-args: | + COMMIT_HASH=${{ github.sha }} + BUILD_TIME=${{ steps.build_time.outputs.value }} 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/github-bot.yml b/.github/workflows/github-bot.yml index 029f2a110..f861ba6b0 100644 --- a/.github/workflows/github-bot.yml +++ b/.github/workflows/github-bot.yml @@ -35,6 +35,10 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1 + - name: Set build time + id: build_time + run: echo "value=$(date -u +%Y-%m-%dT%H:%M:%SZ)" >> "$GITHUB_OUTPUT" + - name: Build and push uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0 with: @@ -47,6 +51,9 @@ jobs: ghcr.io/zkldi/tachi-ghbot:${{ github.sha }} ghcr.io/zkldi/tachi-ghbot:main ghcr.io/zkldi/tachi-ghbot:latest + build-args: | + COMMIT_HASH=${{ github.sha }} + BUILD_TIME=${{ steps.build_time.outputs.value }} 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/server.yml b/.github/workflows/server.yml index 9f239ac6c..e65b3b743 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -126,6 +126,10 @@ jobs: run: | echo "version=$(jq -r .version typescript/server/package.json)" >> "$GITHUB_OUTPUT" + - name: Set build time + id: build_time + run: echo "value=$(date -u +%Y-%m-%dT%H:%M:%SZ)" >> "$GITHUB_OUTPUT" + - name: Build and push unified server image uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0 with: @@ -142,6 +146,7 @@ jobs: build-args: | VERSION=${{ steps.server_version.outputs.version }} COMMIT_HASH=${{ github.sha }} + BUILD_TIME=${{ steps.build_time.outputs.value }} cache-from: type=gha,scope=server-${{ github.ref_name }} cache-to: type=gha,mode=max,scope=server-${{ github.ref_name }}