From 2f7b4e54517f03625e59b7a77fffaba18b22496f Mon Sep 17 00:00:00 2001
From: modrake <12264057+modrake@users.noreply.github.com>
Date: Fri, 4 Feb 2022 09:54:26 -0800
Subject: [PATCH] Docker version parity to reduce oss->ent merge conflicts
 (#1843)

---
 .github/workflows/build.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3d9870882e..057c9de994 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -306,13 +306,16 @@ jobs:
         uses: docker/setup-qemu-action@v1
         with:
           image: docker.artifactory.hashicorp.engineering/prodsec-binfmt:latest
+      - name: Replace + in version
+        run: |
+          echo "dockerversion=$(echo ${{ needs.get-product-version.outputs.product-version }} | sed 's/+ent/-ent/g')" >> $GITHUB_ENV
       - name: Docker Build (Action)
         uses: hashicorp/actions-docker-build@v1
         with:
-          version: ${{ env.version }}
+          version: ${{ env.dockerversion }}
           target: default
           arch: ${{ matrix.arch }}
           zip_artifact_name: ${{ env.PKG_NAME }}_${{ needs.get-product-version.outputs.product-version }}_linux_${{ matrix.arch }}.zip
           tags: |
-            docker.io/hashicorp/${{ env.repo }}:${{ env.version }}
-            public.ecr.aws/hashicorp/${{ env.repo }}:${{ env.version }}
+            docker.io/hashicorp/${{ env.repo }}:${{ env.dockerversion }}
+            public.ecr.aws/hashicorp/${{ env.repo }}:${{ env.dockerversion }}