From 36f611b7c1a71f388892a91527ad5e2af7594c49 Mon Sep 17 00:00:00 2001
From: Corban-Lee Jones <corbz.jones@gmail.com>
Date: Sun, 4 Aug 2024 20:13:29 +0100
Subject: [PATCH] Update docker-build.yaml

---
 .gitea/workflows/docker-build.yaml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/docker-build.yaml b/.gitea/workflows/docker-build.yaml
index 71a1c99..3c2035f 100644
--- a/.gitea/workflows/docker-build.yaml
+++ b/.gitea/workflows/docker-build.yaml
@@ -25,17 +25,25 @@ jobs:
           git config --global user.name "${{ secrets.GIT_USERNAME }}"
 
       - name: Bump version
+        id: bump_version
         run: |
           bump2version patch
+          NEW_VERSION=$(git describe --tags)
+          echo ${NEW_VERSION}
+          echo "NEW_VERSION=${NEW_VERSION}" > new_version.txt
 
       - name: Build Docker image
         run: |
-          docker build -t pyrss-website:${{ steps.bump-version.outputs.new_version }} .
+          NEW_VERSION=$(cat new_version.txt)
+          docker build -t pyrss-website:${{ NEW_VERSION }} .
 
       - name: Push Docker image
         run: |
-          docker tag pyrss-website:${{ steps.bump-version.outputs.new_version }} xordk/pyrss-website:${{ steps.bump-version.outputs.new_version }}
-          docker push xordk/pyrss-website:${{ steps.bump-version.outputs.new_version }}
+          NEW_VERSION=$(cat new_version.txt)
+          docker tag pyrss-website:${{ NEW_VERSION }} xordk/pyrss-website:${{ NEW_VERSION }}
+          docker push xordk/pyrss-website:${{ NEW_VERSION }}
+          rm new_version.txt
+
         env:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
\ No newline at end of file