From 51345ab8250ee695615112fa3b386b5cb6775d75 Mon Sep 17 00:00:00 2001 From: Jonas Hendrickx Date: Tue, 3 Sep 2024 16:49:12 +0200 Subject: [PATCH 1/3] Update docker.yml --- .github/workflows/docker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 39bbd4baf..8ef01a9ea 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -139,9 +139,9 @@ jobs: --build-arg VERSION=${{ needs.version.outputs.version }} --push ${{ format('--tag {0}/{1}:dev', env.DOCKER_CONTAINER_NAMESPACE, matrix.name) }} - ${{ github.event_name == 'release' && github.event.prerelease && format('--tag {0}/{1}:qa', env.DOCKER_CONTAINER_NAMESPACE, matrix.name) || '' }} - ${{ github.event_name == 'release' && format('--tag {0}/{1}:latest', env.DOCKER_CONTAINER_NAMESPACE, matrix.name) || '' }} - ${{ github.event_name == 'release' && format('--tag {0}/{1}:stable', env.DOCKER_CONTAINER_NAMESPACE, matrix.name) || '' }} + ${{ github.event_name == 'release' && github.event.release.prerelease == true && format('--tag {0}/{1}:qa', env.DOCKER_CONTAINER_NAMESPACE, matrix.name) || '' }} + ${{ github.event_name == 'release'' && github.event.release.prerelease == false && format('--tag {0}/{1}:latest', env.DOCKER_CONTAINER_NAMESPACE, matrix.name) || '' }} + ${{ github.event_name == 'release'' && github.event.release.prerelease == false && format('--tag {0}/{1}:stable', env.DOCKER_CONTAINER_NAMESPACE, matrix.name) || '' }} ${{ github.event_name == 'release' && format('--tag {0}/{1}:{2}', env.DOCKER_CONTAINER_NAMESPACE, matrix.name, github.ref_name) || '' }} ${{ inputs.image-tag && format('--tag {0}/{1}:{2}', env.DOCKER_CONTAINER_NAMESPACE, matrix.name, inputs.image-tag) || '' }} From 12f28286a07ca1a60202db20f7f2f3310238fd94 Mon Sep 17 00:00:00 2001 From: Jonas Hendrickx Date: Tue, 3 Sep 2024 16:52:40 +0200 Subject: [PATCH 2/3] Update docker.yml --- .github/workflows/docker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8ef01a9ea..d018eed13 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -139,9 +139,9 @@ jobs: --build-arg VERSION=${{ needs.version.outputs.version }} --push ${{ format('--tag {0}/{1}:dev', env.DOCKER_CONTAINER_NAMESPACE, matrix.name) }} - ${{ github.event_name == 'release' && github.event.release.prerelease == true && format('--tag {0}/{1}:qa', env.DOCKER_CONTAINER_NAMESPACE, matrix.name) || '' }} - ${{ github.event_name == 'release'' && github.event.release.prerelease == false && format('--tag {0}/{1}:latest', env.DOCKER_CONTAINER_NAMESPACE, matrix.name) || '' }} - ${{ github.event_name == 'release'' && github.event.release.prerelease == false && format('--tag {0}/{1}:stable', env.DOCKER_CONTAINER_NAMESPACE, matrix.name) || '' }} + ${{ github.event_name == 'release' && github.event.release.prerelease && format('--tag {0}/{1}:qa', env.DOCKER_CONTAINER_NAMESPACE, matrix.name) || '' }} + ${{ github.event_name == 'release'' && !github.event.release.prerelease && format('--tag {0}/{1}:latest', env.DOCKER_CONTAINER_NAMESPACE, matrix.name) || '' }} + ${{ github.event_name == 'release'' && !github.event.release.prerelease && format('--tag {0}/{1}:stable', env.DOCKER_CONTAINER_NAMESPACE, matrix.name) || '' }} ${{ github.event_name == 'release' && format('--tag {0}/{1}:{2}', env.DOCKER_CONTAINER_NAMESPACE, matrix.name, github.ref_name) || '' }} ${{ inputs.image-tag && format('--tag {0}/{1}:{2}', env.DOCKER_CONTAINER_NAMESPACE, matrix.name, inputs.image-tag) || '' }} From 0ddefa75ccfcc3c853ff2ba980703aa4511c42f3 Mon Sep 17 00:00:00 2001 From: Jonas Hendrickx Date: Tue, 3 Sep 2024 16:56:34 +0200 Subject: [PATCH 3/3] f --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d018eed13..ed644f129 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -140,8 +140,8 @@ jobs: --push ${{ format('--tag {0}/{1}:dev', env.DOCKER_CONTAINER_NAMESPACE, matrix.name) }} ${{ github.event_name == 'release' && github.event.release.prerelease && format('--tag {0}/{1}:qa', env.DOCKER_CONTAINER_NAMESPACE, matrix.name) || '' }} - ${{ github.event_name == 'release'' && !github.event.release.prerelease && format('--tag {0}/{1}:latest', env.DOCKER_CONTAINER_NAMESPACE, matrix.name) || '' }} - ${{ github.event_name == 'release'' && !github.event.release.prerelease && format('--tag {0}/{1}:stable', env.DOCKER_CONTAINER_NAMESPACE, matrix.name) || '' }} + ${{ github.event_name == 'release' && !github.event.release.prerelease && format('--tag {0}/{1}:latest', env.DOCKER_CONTAINER_NAMESPACE, matrix.name) || '' }} + ${{ github.event_name == 'release' && !github.event.release.prerelease && format('--tag {0}/{1}:stable', env.DOCKER_CONTAINER_NAMESPACE, matrix.name) || '' }} ${{ github.event_name == 'release' && format('--tag {0}/{1}:{2}', env.DOCKER_CONTAINER_NAMESPACE, matrix.name, github.ref_name) || '' }} ${{ inputs.image-tag && format('--tag {0}/{1}:{2}', env.DOCKER_CONTAINER_NAMESPACE, matrix.name, inputs.image-tag) || '' }}