diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 82627fd..3f91346 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,7 +98,8 @@ jobs: uses: docker/metadata-action@v4.6.0 with: github-token: ${{ secrets.GITHUB_TOKEN }} - images: ${{ github.actor != 'nektos/act' && format('{0}/{1}', env.REGISTRY, env.IMAGE_REPOSITORY) || env.IMAGE_REPOSITORY }} + # images: ${{ github.actor != 'nektos/act' && format('{0}/{1}', env.REGISTRY, env.IMAGE_REPOSITORY) || env.IMAGE_REPOSITORY }} + images: ${{ env.IMAGE_NAME }} tags: | type=sha,prefix=${{ matrix.from-version }}-,format=short,enable={{is_default_branch}},priority=1000 type=raw,value=${{ matrix.from-version }},enable={{is_default_branch}},priority=900 @@ -152,6 +153,10 @@ jobs: REGISTRY_IMAGE: ${{ format('{0}/{1}', env.REGISTRY, env.IMAGE_REPOSITORY) }} CACHE_FROM_REGISTRY_IMAGE: ${{ format('{0}/{1}', env.CACHE_FROM_REGISTRY, env.IMAGE_REPOSITORY) }} + - run: docker image inspect "${IMAGE_NAME}" + env: + IMAGE_NAME: ${{ format('{0}:{1}-{2}', env.IMAGE_NAME, matrix.from-version, github.head_ref || github.ref_name) }} + # vulnerability scanning to verify PRs - name: Docker Scout id: docker-scout @@ -159,9 +164,9 @@ jobs: uses: docker/scout-action@v0.23.4 with: command: sbom,compare - # image: ${{ steps.meta.outputs.tags }} + image: ${{ steps.meta.outputs.tags }} # image: ${{ github.actor != 'nektos/act' && steps.meta.outputs.tags || format('{0}:{1}-{2}', env.IMAGE_REPOSITORY, matrix.from-version, github.head_ref || github.ref_name) }} - image: ${{ format('{0}:{1}-{2}', env.IMAGE_REPOSITORY, matrix.from-version, github.head_ref || github.ref_name) }} + # image: ${{ format('{0}:{1}-{2}', env.IMAGE_REPOSITORY, matrix.from-version, github.head_ref || github.ref_name) }} to: ${{ format('{0}/{1}:{2}-{3}', env.CACHE_FROM_REGISTRY, env.IMAGE_REPOSITORY, matrix.from-version, 'main') }} organization: ${{ vars.DOCKERHUB_USER }} ignore-unchanged: true