Browse Source

update for quay tags and pr feedback

Signed-off-by: Cliff Colvin <ccolvin@kubecost.com>
Cliff Colvin 2 năm trước cách đây
mục cha
commit
22b12cc097
1 tập tin đã thay đổi với 16 bổ sung13 xóa
  1. 16 13
      .github/workflows/build-and-publish-release.yml

+ 16 - 13
.github/workflows/build-and-publish-release.yml

@@ -53,16 +53,19 @@ jobs:
           echo "IMAGE_TAG_UI_VERSION=ghcr.io/opencost/opencost-ui:${{ inputs.release_version }}" >> $GITHUB_ENV
           echo "IMAGE_TAG_QUAY=quay.io/kubecost1/kubecost-cost-model:${{ steps.sha.outputs.OC_SHORTHASH }}" >> $GITHUB_ENV
           echo "IMAGE_TAG_LATEST_QUAY=quay.io/kubecost1/kubecost-cost-model:latest" >> $GITHUB_ENV
-          echo "IMAGE_TAG_VERSION_QUAY=quay.io/kubecost1/kubecost-cost-model:prod-v${{ inputs.release_version }}" >> $GITHUB_ENV
+          echo "IMAGE_TAG_VERSION_QUAY=quay.io/kubecost1/kubecost-cost-model:prod-${{ inputs.release_version }}" >> $GITHUB_ENV
           echo "IMAGE_TAG_UI_QUAY=quay.io/kubecost1/opencost-ui:${{ steps.sha.outputs.OC_SHORTHASH }}" >> $GITHUB_ENV
           echo "IMAGE_TAG_UI_LATEST_QUAY=quay.io/kubecost1/opencost-ui:latest" >> $GITHUB_ENV
-          echo "IMAGE_TAG_UI_VERSION_QUAY=quay.io/kubecost1/opencost-ui:${{ inputs.release_version }}" >> $GITHUB_ENV
+          echo "IMAGE_TAG_UI_VERSION_QUAY=quay.io/kubecost1/opencost-ui:prod-${{ inputs.release_version }}" >> $GITHUB_ENV
      
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       
       - name: Set up just
         uses: extractions/setup-just@v1
+      
+      - name: Install crane
+        uses: imjasonh/setup-crane@v0.1
 
       ## Install manifest-tool, which is required to combine multi-arch images
       ## https://github.com/estesp/manifest-tool
@@ -86,17 +89,17 @@ jobs:
         working-directory: ./opencost
         run: |
           just build '${steps.tags.outputs.IMAGE_TAG}'
-          just build '${steps.tags.outputs.IMAGE_TAG_LATEST}'
-          just build '${steps.tags.outputs.IMAGE_TAG_VERSION}'
-          just build '${steps.tags.outputs.IMAGE_TAG_QUAY}'
-          just build '${steps.tags.outputs.IMAGE_TAG_LATEST_QUAY}'
-          just build '${steps.tags.outputs.IMAGE_TAG_VERSION_QUAY}'
+          crane copy '${steps.tags.outputs.IMAGE_TAG}' '${steps.tags.outputs.IMAGE_TAG_LATEST}'
+          crane copy '${steps.tags.outputs.IMAGE_TAG}' '${steps.tags.outputs.IMAGE_TAG_VERSION}'
+          crane copy '${steps.tags.outputs.IMAGE_TAG}' '${steps.tags.outputs.IMAGE_TAG_QUAY}'
+          crane copy '${steps.tags.outputs.IMAGE_TAG}' '${steps.tags.outputs.IMAGE_TAG_LATEST_QUAY}'
+          crane copy '${steps.tags.outputs.IMAGE_TAG}' '${steps.tags.outputs.IMAGE_TAG_VERSION_QUAY}'
+
       - name: Build and push (multiarch) OpenCost UI
         working-directory: ./opencost/ui
         run: |
-          just build '${steps.tags.outputs.IMAGE_TAG_UI}'
-          just build '${steps.tags.outputs.IMAGE_TAG_UI_LATEST}'
-          just build '${steps.tags.outputs.IMAGE_TAG_UI_VERSION}'
-          just build '${steps.tags.outputs.IMAGE_TAG_UI_QUAY}'
-          just build '${steps.tags.outputs.IMAGE_TAG_UI_LATEST_QUAY}'
-          just build '${steps.tags.outputs.IMAGE_TAG_UI_VERSION_QUAY}'
+          just build '${steps.tags.outputs.IMAGE_TAG_UI}' '${steps.tags.outputs.IMAGE_TAG_UI_LATEST}'
+          crane copy '${steps.tags.outputs.IMAGE_TAG_UI}' '${steps.tags.outputs.IMAGE_TAG_UI_VERSION}'
+          crane copy '${steps.tags.outputs.IMAGE_TAG_UI}' '${steps.tags.outputs.IMAGE_TAG_UI_QUAY}'
+          crane copy '${steps.tags.outputs.IMAGE_TAG_UI}' '${steps.tags.outputs.IMAGE_TAG_UI_LATEST_QUAY}'
+          crane copy '${steps.tags.outputs.IMAGE_TAG_UI}' '${steps.tags.outputs.IMAGE_TAG_UI_VERSION_QUAY}'