Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

get correct docker tags for everything #271

Merged
merged 3 commits into from
Sep 28, 2023
Merged

get correct docker tags for everything #271

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fab97d
get correct docker tags for everything
curtbushko Sep 28, 2023
4c83d9c
no need for a suffix unless really used
curtbushko Sep 28, 2023
1f0a9bb
extra dash
curtbushko Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand All @@ -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: |
Expand Down
Loading