From 92da5518eb722297233f9430922561f8e4cb263f Mon Sep 17 00:00:00 2001 From: Dave Horton Date: Mon, 10 Apr 2023 09:08:54 -0400 Subject: [PATCH] try 5 --- .github/workflows/docker-publish.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index ed410888..7ddb2dc0 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -19,21 +19,25 @@ jobs: uses: actions/checkout@v3 - name: prepare tag + id: prepare_tag run: | - export IMAGE_ID=jambonz/$IMAGE_NAME + IMAGE_ID=jambonz/$IMAGE_NAME # Strip git ref prefix from version - export VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,') + VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,') # Strip "v" prefix from tag name [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//') # Use Docker `latest` tag convention - [ "$VERSION" == "main" ] && export VERSION=latest + [ "$VERSION" == "main" ] && VERSION=latest echo IMAGE_ID=$IMAGE_ID echo VERSION=$VERSION + echo "::set-output name=image_id::$IMAGE_ID" + echo "::set-output name=version::$VERSION" + - name: Login to Docker Hub uses: docker/login-action@v2 with: @@ -45,10 +49,7 @@ jobs: with: context: . push: true - tags: ${{ env.IMAGE_ID }}:${{ env.VERSION }} + tags: ${{ steps.prepare_tag.outputs.image_id }}:${{ steps.prepare_tag.outputs.version }} build-args: | GITHUB_REPOSITORY=$GITHUB_REPOSITORY GITHUB_REF=$GITHUB_REF - env: - IMAGE_ID: ${{ env.IMAGE_ID }} - VERSION: ${{ env.VERSION }}