Fix release.yaml

cybozu-go · Nov 8, 2023 · 25a8059 · 25a8059
1 parent f032b91
commit 25a8059
Showing 1 changed file with 10 additions and 14 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -19,20 +19,16 @@ jobs:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ inputs.github_token }}
-      - name: Build and Push necoperf-cli image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./Dockerfile.cli
-          push: true
-          tags: ghcr.io/cybozu-go/necoperf-cli:${{ GITHUB_REF#refs/tags/v }}
-      - name: Build and Push necoperf-daemon image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./Dockerfile.daemon
-          push: true
-          tags: ghcr.io/cybozu-go/necoperf-daemon:${{ GITHUB_REF#refs/tags/v }}       
+      - name: Build necoperf-cli and necoperf-daemon image
+        run: |
+          make docker-build
+      - name: Push necoperf-cli and necoperf-daemon image
+        run: |
+          IMAGE_TAG=${GITHUB_REF#refs/tags/v} # Remove "v" prefix.
+          docker tag necoperf-cli:dev ghcr.io/cybozu-go/necoperf-cli:$IMAGE_TAG
+          docker push ghcr.io/cybozu-go/necoperf-cli:$IMAGE_TAG
+          docker tag necoperf-daemon:dev ghcr.io/cybozu-go/necoperf-daemon:$IMAGE_TAG
+          docker push ghcr.io/cybozu-go/necoperf-daemon:$IMAGE_TAG
   release:
     name: Release on GitHub
     needs: image