diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 309e34e4..626301de 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -184,12 +184,10 @@ jobs: steps: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 - # Strip everything but MAJOR.MINOR from the version string and add a `-dev` suffix # This naming convention will be used ONLY for per-commit dev images - name: Set docker dev tag run: | - version="${{ env.version }}" - echo "dev_tag=${version%.*}-dev" >> $GITHUB_ENV + echo "dev_tag=${{ env.version }}" >> $GITHUB_ENV - name: Docker Build (Action) if: ${{ !matrix.fips }} @@ -274,12 +272,10 @@ jobs: version: ${{ needs.get-product-version.outputs.product-version }}${{ matrix.fips }} steps: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 - # Strip everything but MAJOR.MINOR from the version string and add a `-dev` suffix # This naming convention will be used ONLY for per-commit dev images - name: Set docker dev tag run: | - version="${{ env.version }}" - echo "dev_tag=${version%.*}-dev" >> $GITHUB_ENV + echo "dev_tag=${{ env.version }}" >> $GITHUB_ENV - name: Docker Build (Action) if: ${{ !matrix.fips }} @@ -340,9 +336,9 @@ jobs: - version: v1.17.0-dev image: hashicorppreview/consul:1.17-dev dataplane: - - image_suffix: "dev" + - image_suffix: "" docker_target: "release-default" - - image_suffix: "dev-ubi" + - image_suffix: "-ubi" docker_target: "release-ubi" env: repo: ${{ github.event.repository.name }} @@ -351,7 +347,7 @@ jobs: - name: Set docker dev tag run: | version="${{ env.version }}" - echo "dev_tag=${version%.*}-${{ matrix.dataplane.image_suffix }}" >> $GITHUB_ENV + echo "dev_tag=${{ env.version }}${{ matrix.dataplane.image_suffix }}" >> $GITHUB_ENV - name: Set image tarball run: |