ci: change tags of images to date

mickamy · Jan 7, 2024 · 3368db1 · 3368db1
1 parent 1e36ad2
commit 3368db1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -27,6 +27,8 @@ jobs:
       ISHOCON_APP_LANG: ${{ matrix.language }}
       UNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
     steps:
+      - name: Set env
+        run: echo "DATE=$(date +%Y%m%d)" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Replace base image in docker-compose.yml with github actor name
         run: |
@@ -49,7 +51,7 @@ jobs:
           context: .
           push: true
           file: ./docker/benchmarker/Dockerfile
-          tags: ${{ env.UNAME }}/ishocon2-bench:${{ github.sha }}
+          tags: ${{ env.UNAME }}/ishocon2-bench:${{ env.DATE }}}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
           platforms: linux/amd64,linux/arm64/v8
@@ -59,7 +61,7 @@ jobs:
           context: .
           push: true
           file: ./docker/app/base/Dockerfile
-          tags: ${{ env.UNAME }}/ishocon2-app-base:${{ github.sha }}
+          tags: ${{ env.UNAME }}/ishocon2-app-base:${{ env.DATE }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
           platforms: linux/amd64,linux/arm64/v8
@@ -69,7 +71,7 @@ jobs:
           context: .
           push: true
           file: ./docker/app/base/Dockerfile
-          tags: ${{ env.UNAME }}/ishocon2-app-${{ env.ISHOCON_APP_LANG }}:${{ github.sha }}
+          tags: ${{ env.UNAME }}/ishocon2-app-${{ env.ISHOCON_APP_LANG }}:${{ env.DATE }}}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
           platforms: linux/amd64,linux/arm64/v8

diff --git a/.github/workflows/build_and_push_images.yml b/.github/workflows/build_and_push_images.yml
@@ -18,6 +18,7 @@ jobs:
     env:
       UNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
     steps:
+      - run: echo "DATE=$(date +%Y%m%d)" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -33,7 +34,7 @@ jobs:
           context: .
           push: true
           file: ./docker/benchmarker/Dockerfile
-          tags: ${{ env.UNAME }}/ishocon2-bench:latest,${{ env.UNAME }}/ishocon2-bench:${{ github.sha }}
+          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
           platforms: linux/amd64,linux/arm64/v8
@@ -43,7 +44,7 @@ jobs:
           context: .
           push: true
           file: ./docker/app/base/Dockerfile
-          tags: ${{ env.UNAME }}/ishocon2-app-base:latest,${{ env.UNAME }}/ishocon2-app-base:${{ github.sha }}
+          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
           platforms: linux/amd64,linux/arm64/v8
@@ -66,6 +67,7 @@ jobs:
       ISHOCON_APP_LANG: ${{ matrix.language }}
       UNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
     steps:
+      - run: echo "DATE=$(date +%Y%m%d)" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -81,7 +83,7 @@ jobs:
           context: .
           push: true
           file: ./docker/app/base/Dockerfile
-          tags: ${{ env.UNAME }}/ishocon2-app-${{ env.ISHOCON_APP_LANG }}:latest,${{ env.UNAME }}/ishocon2-app-${{ env.ISHOCON_APP_LANG }}-${{ github.sha }}:latest
+          tags: ${{ env.UNAME }}/ishocon2-app-${{ env.ISHOCON_APP_LANG }}:latest,${{ env.UNAME }}/ishocon2-app-${{ env.ISHOCON_APP_LANG }}:${{ env.DATE }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
           platforms: linux/amd64,linux/arm64/v8
diff --git a/.gitignore b/.gitignore
@@ -47,3 +47,5 @@ __pycache__/
 
 # go
 /webapp/go/webapp
+
+.secret
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,3 +47,5 @@ __pycache__/

		# go
		/webapp/go/webapp

		.secret