From b51ea576a3c2b0b8265009e70ce7ac11fdc28122 Mon Sep 17 00:00:00 2001 From: Lukasz Raczylo Date: Thu, 2 Feb 2023 09:56:42 +0000 Subject: [PATCH] fixup! fixup! Fix pipefail in entrypoint.sh --- .github/workflows/release.yaml | 4 ++-- entrypoint.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 60e42f7..d522634 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -139,9 +139,9 @@ jobs: id: prep run: | if [ -z "${{ needs.prepare.outputs.RELEASE_VERSION }}" ]; then - TAGS="${{ needs.prepare.outputs.DOCKER_IMAGE }}:${{ needs.prepare.outputs.GITHUB_SHA }},${{ needs.prepare.outputs.DOCKER_IMAGE }}:latest" + TAGS="${{ needs.prepare.outputs.DOCKER_IMAGE }}:${{ needs.prepare.outputs.GITHUB_SHA }},${{ needs.prepare.outputs.DOCKER_IMAGE }}:latest,${{ needs.prepare.outputs.DOCKER_IMAGE }}:v1" else - TAGS="${{ needs.prepare.outputs.DOCKER_IMAGE }}:${{ needs.prepare.outputs.GITHUB_SHA }},${{ needs.prepare.outputs.DOCKER_IMAGE }}:${{ needs.prepare.outputs.RELEASE_VERSION }},${{ needs.prepare.outputs.DOCKER_IMAGE }}:latest" + TAGS="${{ needs.prepare.outputs.DOCKER_IMAGE }}:${{ needs.prepare.outputs.GITHUB_SHA }},${{ needs.prepare.outputs.DOCKER_IMAGE }}:${{ needs.prepare.outputs.RELEASE_VERSION }},${{ needs.prepare.outputs.DOCKER_IMAGE }}:latest,${{ needs.prepare.outputs.DOCKER_IMAGE }}:v1" fi echo "TAGS=$TAGS" >> $GITHUB_OUTPUT BRANCH=$(echo ${GITHUB_REF##*/} | tr '[A-Z]' '[a-z]') diff --git a/entrypoint.sh b/entrypoint.sh index 411fed5..e795028 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,4 +1,5 @@ -#!/bin/sh -l +#!/bin/sh +set -e FLAGS=""