From bebd42a52e1b315891e560e386bb191d4e709a14 Mon Sep 17 00:00:00 2001 From: Patrick Niebeling Date: Wed, 20 Nov 2024 13:38:18 +0100 Subject: [PATCH] Fix Signed-off-by: Patrick Niebeling --- .gitea/workflows/deploy.yaml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index a166fa9..75a777c 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -22,9 +22,7 @@ jobs: id: meta run: | echo VERSION=$(git ls-remote --tags -q https://github.com/rspamd/rspamd | sed -n "s/^[[:xdigit:]]\{40\}[[:blank:]]refs\/tags\/\([0-9]\{1\}\.[0-9]\{1,2\}\($\|\.[0-9]\{1,2\}$\)\)/\1/p" | sort --version-sort | tail -1) | tee -a $GITHUB_OUTPUT - echo COMMIT=$(git ls-remote --tags -q https://github.com/rspamd/rspamd | sed -n "s/^\([[:xdigit:]]\{40\}\)[[:blank:]]refs\/tags\/${VERSION}^{}$/\1/p" | xargs git rev-parse --short) | tee -a $GITHUB_OUTPUT - echo BRANCH=$(git rev-parse --abbrev-ref HEAD) | tee -a $GITHUB_OUTPUT - echo DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") | tee -a $GITHUB_OUTPUT + echo IMAGE_CREATED=$(date -u +"%Y-%m-%dT%H:%M:%SZ") | tee -a $GITHUB_OUTPUT - name: Build and push uses: docker/build-push-action@v6 @@ -34,9 +32,7 @@ jobs: no-cache: true build-args: | VERSION=${{ steps.meta.outputs.VERSION }} - COMMIT=${{ steps.meta.outputs.COMMIT }} - BRANCH=${{ steps.meta.outputs.BRANCH }} - DATE=${{ steps.meta.outputs.DATE }} + IMAGE_CREATED=${{ steps.meta.outputs.DATE }} tags: | - ${{ vars.DOCKER_REPO }}/${{ vars.repository_owner }}/${{ vars.IMAGE_NAME }} - ${{ vars.DOCKER_REPO }}/${{ vars.repository_owner }}/${{ vars.IMAGE_NAME }}:${{ steps.meta.outputs.VERSION }} \ No newline at end of file + ${{ vars.DOCKER_REPO }}/${{ gitea.repository_owner }}/${{ vars.IMAGE_NAME }} + ${{ vars.DOCKER_REPO }}/${{ gitea.repository_owner }}/${{ vars.IMAGE_NAME }}:${{ steps.meta.outputs.VERSION }} \ No newline at end of file