From 671b1a02fbc93178c0e6492b75394f075994e48a Mon Sep 17 00:00:00 2001 From: Carlton Hanna Date: Wed, 25 Sep 2024 10:31:14 -0600 Subject: [PATCH] Modify workflow to not append the `run-number` to `latest` docker tag (#551) * latest tag will be latest version of main branch * revert formatting so PR is easier to read * fix script if statement * add change log --- .github/workflows/docker.yml | 6 ++++-- CHANGELOG.md | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 1b7ca59b..76d25a12 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -32,9 +32,11 @@ jobs: echo ::set-output name=branch::${VERSION} if [ "${{ github.event.repository.default_branch }}" = "$VERSION" ]; then VERSION=latest - fi + else + VERSION="${VERSION}-${{github.run_number}}" + fi fi - TAGS="${DOCKER_IMAGE}:${VERSION}-${{github.run_number}}" + TAGS="${DOCKER_IMAGE}:${VERSION}" if [[ $VERSION =~ ^v[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then TAGS="$TAGS,${DOCKER_IMAGE}:${VERSION}" fi diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d8bd3e1..46a698c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * Add limit of 1 to missing block queries [#544](https://github.com/provenance-io/explorer-service/pull/544) * Removes the logic for calculating `running_count` and `total_count` in the `missed_blocks` [#548](https://github.com/provenance-io/explorer-service/pull/548) * Remove update block latency procedure call [#550](https://github.com/provenance-io/explorer-service/pull/550) +* Docker images at tag `latest` for main branch merges [#551](https://github.com/provenance-io/explorer-service/pull/551) ## [v5.11.0](https://github.com/provenance-io/explorer-service/releases/tag/v5.11.0) - 2024-08-27