2
0
Эх сурвалжийг харах

fix: update Docker registry username for image publishing workflows

Shun Miyazawa 6 сар өмнө
parent
commit
56938a3e3a

+ 1 - 0
.github/workflows/release-rc-scheduled.yml

@@ -62,6 +62,7 @@ jobs:
       tags: ${{ needs.determine-tags.outputs.TAGS }}
       registry: docker.io
       image-name: weseek/growi
+      docker-registry-username: wsmoogle
       tag-temporary: latest-rc
     secrets:
       DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}

+ 1 - 0
.github/workflows/release-rc.yml

@@ -54,6 +54,7 @@ jobs:
       tags: ${{ needs.determine-tags.outputs.TAGS }}
       registry: docker.io
       image-name: weseek/growi
+      docker-registry-username: wsmoogle
       tag-temporary: latest-rc
     secrets:
       DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}

+ 18 - 21
.github/workflows/release.yml

@@ -107,45 +107,42 @@ jobs:
   build-app-image:
     needs: create-github-release
 
-    strategy:
-      matrix:
-        image-name: [weseek/growi, growilabs/growi]
-
     uses: growilabs/growi/.github/workflows/reusable-app-build-image.yml@master
     with:
       source-version: refs/tags/v${{ needs.create-github-release.outputs.RELEASED_VERSION }}
-      image-name: ${{ matrix.image-name }}
+      image-name: growilabs/growi
       tag-temporary: latest
     secrets:
       AWS_ROLE_TO_ASSUME_FOR_OIDC: ${{ secrets.AWS_ROLE_TO_ASSUME_FOR_OIDC }}
 
-  publish-app-image:
+  publish-app-image-for-growilabs:
     needs: [determine-tags, build-app-image]
 
-    strategy:
-      matrix:
-        include:
-          - image-name: weseek/growi
-            username: wsmoogle
-          - image-name: growilabs/growi
-            username: growimoogle
+    uses: growilabs/growi/.github/workflows/reusable-app-create-manifests.yml@master
+    with:
+      tags: ${{ needs.determine-tags.outputs.TAGS }}
+      registry: docker.io
+      image-name: 'growilabs/growi'
+      docker-registry-username: 'growimoogle'
+      tag-temporary: latest
+    secrets:
+      DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD_GROWIMOOGLE }}
+
+  publish-app-image-for-weseek:
+    needs: [determine-tags, build-app-image]
 
     uses: growilabs/growi/.github/workflows/reusable-app-create-manifests.yml@master
     with:
       tags: ${{ needs.determine-tags.outputs.TAGS }}
       registry: docker.io
-      image-name: ${{ matrix.image-name }}
-      username: ${{ matrix.username }}
+      image-name: 'weseek/growi'
+      docker-registry-username: 'wsmoogle'
       tag-temporary: latest
     secrets:
-      DOCKER_REGISTRY_PASSWORD: ${{
-        matrix.image-name == 'weseek/growi' && secrets.DOCKER_REGISTRY_PASSWORD ||
-        matrix.image-name == 'growilabs/growi' && secrets.DOCKER_REGISTRY_PASSWORD_GROWIMOOGLE ||
-        'INVALID_SECRET'
-      }}
+      DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
 
   post-publish:
-    needs: [create-github-release, publish-app-image]
+    needs: [create-github-release, publish-app-image-for-growilabs, publish-app-image-for-weseek]
     runs-on: ubuntu-latest
 
     strategy:

+ 1 - 1
.github/workflows/reusable-app-build-image.yml

@@ -8,7 +8,7 @@ on:
         default: ${{ github.sha }}
       image-name:
         type: string
-        default: weseek/growi
+        default: growilabs/growi
       tag-temporary:
         type: string
         default: latest

+ 5 - 2
.github/workflows/reusable-app-create-manifests.yml

@@ -11,7 +11,10 @@ on:
         default: 'docker.io'
       image-name:
         type: string
-        default: weseek/growi
+        default: growilabs/growi
+      docker-registry-username:
+        type: string
+        default: wsmoogle
       tag-temporary:
         type: string
         default: latest
@@ -41,7 +44,7 @@ jobs:
       uses: docker/login-action@v3
       with:
         registry: ${{ inputs.registry }}
-        username: wsmoogle
+        username: ${{ inputs.docker-registry-username }}
         password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
 
     - name: Create and push manifest images