From e0f53c9601e49b8c7eaeac95ea4952bd92441641 Mon Sep 17 00:00:00 2001
From: Robrecht Cannoodt <rcannood@gmail.com>
Date: Mon, 29 Mar 2021 04:56:20 +0200
Subject: [PATCH] attempt to fix docker action

---
 .github/workflows/docker_build.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
index 563ca605..1c99411e 100644
--- a/.github/workflows/docker_build.yml
+++ b/.github/workflows/docker_build.yml
@@ -16,11 +16,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-
-      - name: Build
+      
+      - name: Configure environment variables
         run: |
           VERSION=`cat DESCRIPTION | grep Version | sed 's#.*: ##'`
           BRANCH="${GITHUB_REF#refs/heads/}"
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "BRANCH=$BRANCH" >> $GITHUB_ENV
+
+      - name: Build
+        run: |
           docker build -t $GITHUB_REPOSITORY:$BRANCH -f docker/Dockerfile .
           if [[ $BRANCH == "master" ]] ; then
             docker tag $GITHUB_REPOSITORY:$BRANCH $GITHUB_REPOSITORY:$VERSION
@@ -30,7 +35,6 @@ jobs:
       - name: Push
         run: |
           docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-          BRANCH="${GITHUB_REF#refs/heads/}"
           docker push $GITHUB_REPOSITORY:$BRANCH
           if [[ $BRANCH == "master" ]] ; then
             docker push $GITHUB_REPOSITORY:$VERSION