chore(fe-build-image): update build args (#94)

Byzanteam · Jul 25, 2024 · ec840f0 · ec840f0
1 parent 9358268
commit ec840f0
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/fe-build-image/action.yml b/fe-build-image/action.yml
@@ -75,10 +75,10 @@ runs:
         context: ${{ inputs.context }}
         file: ${{ inputs.dockerfile }}
         build-args: |
-          APP_VSN=${{ steps.meta.outputs.version }}
           APP_NAME=${{ steps.image.outputs.image_name }}
+          APP_VERSION=${{ fromJSON(steps.metadata.outputs.json).labels['org.opencontainers.image.version'] }}
+          APP_REVISION=${{ fromJSON(steps.metadata.outputs.json).labels['org.opencontainers.image.revision'] }}
           SOURCE_REPO_URL=${{ github.repositoryUrl }}
-          SOURCE_SHA=${{ github.sha }}
           ${{ inputs.build_args }}
         push: true
         labels: ${{ steps.meta.outputs.labels }}
@@ -94,10 +94,10 @@ runs:
         context: ${{ inputs.context }}
         file: ${{ inputs.dockerfile }}
         build-args: |
-          APP_VSN=${{ steps.meta.outputs.version }}
           APP_NAME=${{ steps.image.outputs.image_name }}
+          APP_VERSION=${{ fromJSON(steps.metadata.outputs.json).labels['org.opencontainers.image.version'] }}
+          APP_REVISION=${{ fromJSON(steps.metadata.outputs.json).labels['org.opencontainers.image.revision'] }}
           SOURCE_REPO_URL=${{ github.repositoryUrl }}
-          SOURCE_SHA=${{ github.sha }}
           ${{ inputs.build_args }}
         push: true
         labels: ${{ steps.meta.outputs.labels }}
@@ -113,10 +113,10 @@ runs:
         context: ${{ inputs.context }}
         file: ${{ inputs.dockerfile }}
         build-args: |
-          APP_VSN=${{ steps.meta.outputs.version }}
           APP_NAME=${{ steps.image.outputs.image_name }}
+          APP_VERSION=${{ fromJSON(steps.metadata.outputs.json).labels['org.opencontainers.image.version'] }}
+          APP_REVISION=${{ fromJSON(steps.metadata.outputs.json).labels['org.opencontainers.image.revision'] }}
           SOURCE_REPO_URL=${{ github.repositoryUrl }}
-          SOURCE_SHA=${{ github.sha }}
           ${{ inputs.build_args }}
         push: true
         labels: ${{ steps.meta.outputs.labels }}