From 89ef82337db46e4e5b648fbc03a2f4c9f72ff64c Mon Sep 17 00:00:00 2001 From: Marc 'risson' Schmitt Date: Thu, 15 Feb 2024 17:49:28 +0100 Subject: [PATCH] ci: docker push: re-add timestamp image tag (#8529) --- .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]