From 7f48aa2a9a998e6eedf3d6c3ba31348c4c6cc981 Mon Sep 17 00:00:00 2001 From: Tristan Date: Sat, 11 Jan 2025 19:17:42 +0000 Subject: [PATCH] Fix image tags --- .github/workflows/ci.yml | 4 ++-- .github/workflows/publish.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a6e795..6fbb1f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,7 +110,7 @@ jobs: DOCKER_REGISTRY: "ghcr.io" DOCKER_IMAGE: "${{ needs.set_variables.outputs.docker_image }}" DOCKER_TARGET: "hotspot" - DOCKER_TAG_CANONICAL: "${{ needs.set_variables.outputs.build_version }}-hotspot" + DOCKER_TAG_CANONICAL: "${{ needs.set_variables.outputs.build_version }}" DOCKER_TAG_SHORT: "${{ needs.set_variables.outputs.image_version_short }}" build_graal: @@ -158,5 +158,5 @@ jobs: DOCKER_REGISTRY: "ghcr.io" DOCKER_IMAGE: "${{ needs.set_variables.outputs.docker_image }}" DOCKER_TARGET: "graal" - DOCKER_TAG_CANONICAL: "${{ needs.set_variables.outputs.build_version }}-hotspot" + DOCKER_TAG_CANONICAL: "${{ needs.set_variables.outputs.build_version }}" DOCKER_TAG_SHORT: "${{ needs.set_variables.outputs.image_version_short }}" diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3b084b8..09472ec 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -69,8 +69,8 @@ jobs: with: images: "${{ inputs.DOCKER_REGISTRY }}/${{ inputs.DOCKER_IMAGE }}" tags: | - type=raw,event=push,enable=true,value=${{ inputs.DOCKER_TAG_CANONICAL }} - type=raw,event=push,enable={{ is_default_branch }},value=${{ inputs.DOCKER_TAG_SHORT }} + type=raw,event=push,enable=true,value=${{ inputs.DOCKER_TAG_CANONICAL }}-${{ inputs.DOCKER_TARGET }} + type=raw,event=push,enable={{ is_default_branch }},value=${{ inputs.DOCKER_TAG_SHORT }}-${{ inputs.DOCKER_TARGET }} - name: "Build and push Docker image" uses: "docker/build-push-action@v5" with: