From 92216e4ea894dc0e25a21f9da6c4fbf4edcd1c80 Mon Sep 17 00:00:00 2001 From: "gcp-cherry-pick-bot[bot]" <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com> Date: Thu, 15 Feb 2024 17:12:30 +0000 Subject: [PATCH] ci: docker push: re-add timestamp image tag (cherry-pick #8529) (#8532) Co-authored-by: Marc 'risson' Schmitt --- .github/actions/docker-push-variables/action.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/actions/docker-push-variables/action.yml b/.github/actions/docker-push-variables/action.yml index b0671bd966..ee52f8d740 100644 --- a/.github/actions/docker-push-variables/action.yml +++ b/.github/actions/docker-push-variables/action.yml @@ -78,8 +78,9 @@ runs: suffix = f"-{image_arch}" for name in image_names: image_tags += [ - f"{name}:gh-{sha}{suffix}", - f"{name}:gh-{safe_branch_name}{suffix}", + f"{name}:gh-{sha}{suffix}", # Used for ArgoCD and PR comments + f"{name}:gh-{safe_branch_name}{suffix}", # For convenience + f"{name}:gh-{safe_branch_name}-{int(time())}-{sha[:7]}{suffix}", # Use by FluxCD ] image_main_tag = image_tags[0]