From 1ac8131ea7f08226d2a65336bafb78bb6b7458fd Mon Sep 17 00:00:00 2001
From: mickamy <t.mikami1992@gmail.com>
Date: Sun, 7 Jan 2024 22:26:23 +0900
Subject: [PATCH] ci: add tag by docker buildx

---
 .github/workflows/benchmark.yml             | 17 +++++++++--------
 .github/workflows/build_and_push_images.yml | 13 ++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index a14c4070..91d1fda0 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -54,7 +54,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-${{ matrix.language }}
             ${{ runner.os }}-buildx
-      - name: Build and push bench image
+      - name: Build bench image
         uses: docker/build-push-action@v5
         with:
           context: .
@@ -63,7 +63,7 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
           platforms: linux/amd64,linux/arm64/v8
-      - name: Build and push base image
+      - name: Build base image
         uses: docker/build-push-action@v5
         with:
           context: .
@@ -72,13 +72,11 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
           platforms: linux/amd64,linux/arm64/v8
-      - name: Add tags without UNAME
+      - name: Add tags without UNAME to bench and base images
         run: |
-            docker tag ${{ env.UNAME }}/ishocon2-bench:latest ishocon2-bench:latest
-            docker tag ${{ env.UNAME }}/ishocon2-bench:${{ env.DATE }} ishocon2-bench:${{ env.DATE }}
-            docker tag ${{ env.UNAME }}/ishocon2-app-base:latest ishocon2-app-base:latest
-            docker tag ${{ env.UNAME }}/ishocon2-app-base:${{ env.DATE }} ishocon2-app-base:${{ env.DATE }}
-      - name: Build and push app image
+            docker buildx imagetools create --tag ishocon2-bench:latest ${{ env.UNAME }}/ishocon2-bench:latest
+            docker buildx imagetools create --tag ishocon2-app-base:latest ${{ env.UNAME }}/ishocon2-app-base:latest
+      - name: Build app image
         uses: docker/build-push-action@v5
         with:
           context: .
@@ -87,6 +85,9 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
           platforms: linux/amd64,linux/arm64/v8
+      - name: Add tags without UNAME to app image
+        run: |
+            docker buildx imagetools create --tag ishocon2-app-${{ env.ISHOCON_APP_LANG }}:latest ${{ env.UNAME }}/ishocon2-app-${{ env.ISHOCON_APP_LANG }}:latest
       - run: make up bench-with-db-init
         timeout-minutes: 10
       - name: Dump docker logs
diff --git a/.github/workflows/build_and_push_images.yml b/.github/workflows/build_and_push_images.yml
index b3196f37..09cea118 100644
--- a/.github/workflows/build_and_push_images.yml
+++ b/.github/workflows/build_and_push_images.yml
@@ -40,8 +40,9 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
+          push: true
           file: ./docker/benchmarker/Dockerfile
-          tags: ${{ env.UNAME }}/ishocon2-bench:latest,${{ env.UNAME }}/ishocon2-bench:${{ env.DATE }},ishocon2-bench:latest,ishocon2-bench:${{ env.DATE }}
+          tags: ${{ env.UNAME }}/ishocon2-bench:latest,${{ env.UNAME }}/ishocon2-bench:${{ env.DATE }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
           platforms: linux/amd64,linux/arm64/v8
@@ -49,17 +50,15 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
+          push: true
           file: ./docker/app/base/Dockerfile
-          tags: ${{ env.UNAME }}/ishocon2-app-base:latest,${{ env.UNAME }}/ishocon2-app-base:${{ env.DATE }},ishocon2-app-base:latest,ishocon2-app-base:${{ env.DATE }}
+          tags: ${{ env.UNAME }}/ishocon2-app-base:latest,${{ env.UNAME }}/ishocon2-app-base:${{ env.DATE }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
           platforms: linux/amd64,linux/arm64/v8
-      - name: Push bench and base images
+      - name: Add tag to base image
         run: |
-          docker push ${{ env.UNAME }}/ishocon2-bench:latest
-          docker push ${{ env.UNAME }}/ishocon2-bench:${{ env.DATE }}
-          docker push ${{ env.UNAME }}/ishocon2-app-base:latest
-          docker push ${{ env.UNAME }}/ishocon2-app-base:${{ env.DATE }}
+          docker buildx imagetools create --tag ishocon2-app-base:latest ${{ env.UNAME }}/ishocon2-app-base:latest
       - name: Move new cache to the place where to be cached
         run: |
           echo "Temporary fix for cleaning up old cache."