Merge branch 'develop' into develop

.github/workflows/publish-docker.yml

@@ -1,42 +1,43 @@
 name: Publish Docker
 
+
 on: 
   pull_request:
         branches: 
         - '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
+      - name: Checkout
         uses: actions/checkout@v2
-       -
-        name: Set up QEMU
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
-       -
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-       -
-        name: Login to DockerHub
-        uses: docker/login-action@v1 
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-       -
-        name: Build and push
+      - name: Build and push latest
+        if: github.base_ref == 'master'
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64, linux/arm64
+          push: true
+          tags: |
+            nusak/netmaker:latest
+      - name: Build and push develop
+        if: github.base_ref == 'develop'
         uses: docker/build-push-action@v2
         with:
           context: .
           platforms: linux/amd64, linux/arm64
           push: true
           tags: |
-              gravitl/netmaker:${{ env.CI_REF_NAME_SLUG }}
-              gravitl/netmaker:${{ env.BUILD_VER }}
-            
+            nusak/netmaker:develop