From e637d670a4b9fc7775bcd1fef3e915131f54a948 Mon Sep 17 00:00:00 2001 From: danilapog Date: Wed, 24 Aug 2022 13:30:23 +0300 Subject: [PATCH] Set correct nonexample image tag --- .github/workflows/stable-build.yml | 3 ++- docker-bake.hcl | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/stable-build.yml b/.github/workflows/stable-build.yml index f4ecfc5..1b80b48 100644 --- a/.github/workflows/stable-build.yml +++ b/.github/workflows/stable-build.yml @@ -100,10 +100,11 @@ jobs: - name: build image run: | TAG=$(echo ${{ steps.tag_name.outputs.SOURCE_TAG }} | sed 's/^.//; s/-stable//') + SHORTER_TAG=$(echo ${TAG} | grep -o -P '^[\d]+\.[\d]+\.[\d]+') PRODUCT_EDITION=${{ matrix.edition }} \ PRODUCT_NAME=${{ env.PRODUCT_NAME }} \ COMPANY_NAME=${{ env.COMPANY_NAME }} \ - TAG=$TAG \ + TAG=$SHORTER_TAG \ docker buildx bake \ -f docker-bake.hcl ${{ matrix.images }} \ --push diff --git a/docker-bake.hcl b/docker-bake.hcl index 6be7c4b..e589431 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -68,9 +68,9 @@ target "documentserver-stable" { } target "documentserver-nonexample" { - tagret = "documentserver-nonexample" + target = "documentserver-nonexample" dockerfile = "Dockerfile.nonExample" - tags = [ "docker.io/${COMPANY_NAME}/${PRODUCT_NAME}${PREFIX_NAME}${PRODUCT_EDITION}:${SHORTER_TAG}"-nonexample ] + tags = [ "docker.io/${COMPANY_NAME}/${PRODUCT_NAME}${PREFIX_NAME}${PRODUCT_EDITION}:${TAG}-nonexample" ] platforms = ["linux/amd64", "linux/arm64"] args = { "PRODUCT_NAME": "${PRODUCT_NAME}"