From 8e5bdb4da00809473d2567b5e3cc21ed2795031d Mon Sep 17 00:00:00 2001
From: Matthew R Kasun <mkasun@nusak.ca>
Date: Wed, 7 Apr 2021 10:57:46 -0400
Subject: [PATCH 1/2] consolidate actions

---
 .github/workflows/publish-docker-latest.yml | 33 ---------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 .github/workflows/publish-docker-latest.yml

diff --git a/.github/workflows/publish-docker-latest.yml b/.github/workflows/publish-docker-latest.yml
deleted file mode 100644
index 2aae2ce7..00000000
--- a/.github/workflows/publish-docker-latest.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Publish Docker
-
-on: 
-  push:
-        branches: 
-        - 'master'
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v1 
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          platforms: linux/amd64, linux/arm64
-          push: true
-          tags: gravitl/netmaker:latest      

From 44952c11f7dee7ab293d0c11146e246b784aa71f Mon Sep 17 00:00:00 2001
From: Matthew R Kasun <mkasun@nusak.ca>
Date: Wed, 7 Apr 2021 11:30:04 -0400
Subject: [PATCH 2/2] simplify git action

---
 .github/workflows/publish-docker.yml | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 5942bf11..b6e1f64e 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -1,35 +1,42 @@
 name: Publish Docker
 
 on: 
-  push:
+  pull_request:
         branches: 
-        - 'arm-docker'
         - 'develop'
-        - 
+        - 'master' 
 jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      -
+       - uses: FranzDiebold/github-env-vars-action@v2
+       - name: Set Environment Variables
+         run: |
+             echo "BUILD_VER=v0.0.$GITHUB_RUN_NUMBER" >> $GITHUB_ENV
+       -
         name: Checkout
         uses: actions/checkout@v2
-      -
+       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
-      -
+       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-      -
+       -
         name: Login to DockerHub
         uses: docker/login-action@v1 
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
+       -
         name: Build and push
         uses: docker/build-push-action@v2
         with:
           context: .
           platforms: linux/amd64, linux/arm64
           push: true
-          tags: gravitl/netmaker:dev      
+          tags: |
+              gravitl/netmaker:${{ env.CI_REF_NAME_SLUG }}
+              gravitl/netmaker:${{ env.BUILD_VER }}
+            
+