ci: replace base image in docker-compose.yml on ci (prepend an actor …

…name)
mickamy · Jan 4, 2024 · 1d2821a · 1d2821a
1 parent 42c11ec
commit 1d2821a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -25,31 +25,35 @@ jobs:
           - "ruby"
     env:
       ISHOCON_APP_LANG: ${{ matrix.language }}
+      UNAME: ${{ github.actor }}
     steps:
       - uses: actions/checkout@v4
       - run: make change-lang LANG=$ISHOCON_APP_LANG
+      - run: sed -i 's/ishocon2-app-'"${{ env.ISHOCON_APP_LANG }}"'/'"${{ env.UNAME }}"'\/ishocon2-app-'"${ISHOCON_APP_LANG}"'/s' ./docker-compose.yml
+      - run: cat ./docker-compose.yml;
       - uses: docker/setup-buildx-action@v3
       - uses: docker/build-push-action@v5.1.0
         with:
             context: .
             file: ./docker/app/base/Dockerfile
             cache-from: type=gha
             cache-to: type=gha,mode=max
-            tags: ishocon2-app-base:latest
+            tags: ${{ env.UNAME }}/ishocon2-app-base:latest
       - uses: docker/build-push-action@v5.1.0
         with:
           context: .
           file: ./docker/benchmarker/Dockerfile
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          tags: ishocon2-app-bench:latest
+          tags: ${{ env.UNAME }}/ishocon2-app-bench:latest
       - uses: docker/build-push-action@v5.1.0
         with:
           context: .
           file: ./docker/app/${{ env.ISHOCON_APP_LANG }}/Dockerfile
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          tags: ishocon2-app-${{ env.ISHOCON_APP_LANG }}:latest
+          tags: ${{ env.UNAME }}/ishocon2-app-${{ env.ISHOCON_APP_LANG }}:latest
+             sed -i 's/ruby\|python\|go\|php\|nodejs\|crystal/'"$(ISHOCON_APP_LANG)"'/g' ./docker-compose.yml; \
       - run: make build
         timeout-minutes: 5
       - run: make up bench-with-db-init

diff --git a/Makefile b/Makefile
@@ -1,5 +1,8 @@
 WORKLOAD = 3
-UNAME = $(shell whoami)
+ifeq ($(UNAME),)
+	UNAME = $(shell whoami)
+endif
+
 ARCH = $(shell uname -m)
 
 UBUNTU_VERSION = 18.04