Просмотр исходного кода

fix reusable-app-build-image.yml

Yuki Takei 3 лет назад
Родитель
Сommit
ef174d0154
2 измененных файлов с 10 добавлено и 3 удалено
  1. 2 0
      .github/workflows/release-rc.yml
  2. 8 3
      .github/workflows/reusable-app-build-image.yml

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

@@ -19,6 +19,8 @@ jobs:
       tag-version: latest-rc
     secrets:
       AWS_ROLE_TO_ASSUME_FOR_OIDC: ${{ secrets.AWS_ROLE_TO_ASSUME_FOR_OIDC }}
+      DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+      DOCKER_REGISTRY_ON_GITHUB_PASSWORD: ${{ secrets.DOCKER_REGISTRY_ON_GITHUB_PASSWORD }}
 
     # runs-on: ubuntu-latest
 

+ 8 - 3
.github/workflows/reusable-app-build-image.yml

@@ -9,6 +9,11 @@ on:
     secrets:
       AWS_ROLE_TO_ASSUME_FOR_OIDC:
         required: true
+      DOCKER_REGISTRY_PASSWORD:
+        required: true
+      DOCKER_REGISTRY_ON_GITHUB_PASSWORD:
+        required: true
+
 
 
 jobs:
@@ -70,7 +75,7 @@ jobs:
       id: meta-base-image
       uses: docker/metadata-action@v4
       with:
-        images: ${{ (matrix.registry == 'docker.io' && '') || 'ghcr.io/' }}weseek/growi
+        images: ${{ matrix.registry }}/weseek/growi-codebuild-test
         sep-tags: ','
         tags: |
           type=raw,value=${{ steps.package-json.outputs.packageVersion }}
@@ -80,7 +85,7 @@ jobs:
       id: meta-extra-images
       uses: docker/metadata-action@v4
       with:
-        images: ${{ (matrix.registry == 'docker.io' && '') || 'ghcr.io/' }}weseek/growi
+        images: ${{ matrix.registry }}/weseek/growi-codebuild-test
         sep-tags: ','
         tags: |
           type=raw,value=${{ inputs.tag-version }}-amd64
@@ -91,7 +96,7 @@ jobs:
       with:
         registry: ${{ matrix.registry }}
         username: wsmoogle
-        password: ${{ (matrix.registry == 'docker.io' && secrets.DOCKER_REGISTRY_PASSWORD) || secrets.DOCKER_REGISTRY_ON_GITHUB_PASSWORD }}
+        password: ${{ (startsWith(matrix.registry, 'docker') && secrets.DOCKER_REGISTRY_PASSWORD)) || secrets.DOCKER_REGISTRY_ON_GITHUB_PASSWORD }}
 
     - name: Create and push manifest images for ${{ matrix.registry }}
       uses: Noelware/docker-manifest-action@master