Skip to content

Commit

Permalink
fix names
Browse files Browse the repository at this point in the history
  • Loading branch information
MP91 committed Apr 24, 2024
1 parent ce0c2a9 commit 1cbbde6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
10 changes: 3 additions & 7 deletions .github/workflows/build-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,20 +143,16 @@ jobs:
- name: "${{ env.APP_NAME }} -- Upload oci compliant image to artifacts"
if: ${{ steps.image_build.outcome == 'success' }}
uses: actions/upload-artifact@v4
env:
VAPP_IMAGE: ${{ env.APP_NAME }}-${{ inputs.platform }}_oci
with:
name: ${{ env.VAPP_IMAGE }}
name: ${{ env.APP_NAME }}-${{ inputs.platform }}-oci-archive
path: ./${{ env.APP_NAME }}-*.tar
if-no-files-found: error

- name: "${{ env.APP_NAME }} -- Upload docker image to artifacts"
if: ${{ steps.image_build.outcome == 'success' }}
uses: actions/upload-artifact@v4
env:
VAPP_IMAGE: ${{ env.APP_NAME }}-${{ inputs.platform }}_docker
with:
name: ${{ env.VAPP_IMAGE }}
name: ${{ env.APP_NAME }}-${{ inputs.platform }}-docker-archive
path: ./${{ env.APP_NAME }}_*.tar
if-no-files-found: error

Expand Down Expand Up @@ -193,7 +189,7 @@ jobs:
uses: actions/download-artifact@v4
with:
path: .
pattern: ${{ env.APP_NAME }}*_docker
pattern: ${{ env.APP_NAME }}*-docker-archive
merge-multiple: true

- name: "${{ env.APP_NAME }} -- Scan docker image for vulnerabilities"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
- name: "${{ env.APP_NAME }} -- Publish release image to GHCR"
working-directory: ${{github.workspace}}
env:
VAPP_IMAGE: ${{ env.APP_NAME }}-multiarch_oci/${{ env.APP_NAME }}-multiarch.tar
VAPP_IMAGE: ${{ env.APP_NAME }}-multiarch-oci-archive/${{ env.APP_NAME }}-multiarch.tar
VAPP_NAME: ${{ env.APP_NAME }}
VAPP_VERSION: ${{ steps.get_version.outputs.version-without-v }}
REGISTRY: "ghcr.io/${{steps.github-repository-name-case-adjusted.outputs.lowercase}}"
Expand Down

0 comments on commit 1cbbde6

Please sign in to comment.