From 15b5eacbc8f512882c397d433faebbffbb7a8e98 Mon Sep 17 00:00:00 2001
From: sujiba <65259334+sujiba@users.noreply.github.com>
Date: Wed, 9 Mar 2022 10:58:30 +0100
Subject: [PATCH] added version var

---
 .github/workflows/docker_build_push.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker_build_push.yml b/.github/workflows/docker_build_push.yml
index fbcc625..080c935 100644
--- a/.github/workflows/docker_build_push.yml
+++ b/.github/workflows/docker_build_push.yml
@@ -16,9 +16,14 @@ jobs:
       with:
         username: ${{ secrets.DOCKER_USER }}
         password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+    - 
+      name: Set up variables
+      run: |
+        VER=$(cat /docker-build/VERSION)
+        echo "VERSION=$VER" >> $GITHUB_ENV
     -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+      name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
     -
       name: Build and push
       uses: docker/build-push-action@v2
@@ -27,4 +32,4 @@ jobs:
         file: ./Dockerfile
         platforms: linux/arm/v7,linux/arm64/v8,linux/amd64
         push: true
-        tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pihole-unbound-hyperlocal:`cat VERSION`,${{ secrets.DOCKER_HUB_USERNAME }}/pihole-unbound-hyperlocal:latest
+        tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pihole-unbound-hyperlocal:${{ env.VERSION }},${{ secrets.DOCKER_HUB_USERNAME }}/pihole-unbound-hyperlocal:latest