Matthew R Kasun 4 years ago
parent
commit
893777b627
1 changed files with 44 additions and 39 deletions
  1. 44 39
      .github/workflows/publish-docker.yml

+ 44 - 39
.github/workflows/publish-docker.yml

@@ -1,43 +1,48 @@
 name: Publish Docker
 
-on: 
+on:
   pull_request:
-        branches: 
-        - 'develop'
-        - 'master' 
+    branches:
+      - 'develop'
+      - 'master'
+  push:
+
 jobs:
-    docker:
-        runs-on: ubuntu-latest
-        steps:
-            -
-                name: Set Environment Variables
-                run: |
-                    echo "BUILD_VER=v0.0.$GITHUB_RUN_NUMBER" >> $GITHUB_ENV
-                    if ${{ github.head_ref }} = "master" ]
-                        echo "TAG=latest" >>$GITHUB_ENV
-                    if ${{ github.head_ref }} = "master" ]
-                        echo "TAG=develop" >> $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: false
-                    tags: |
-                        nusak/netmaker:${{ env.TAG }}
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set Environment Variables
+        run: |
+          echo "BUILD_VER=v0.0.$GITHUB_RUN_NUMBER" >> $GITHUB_ENV
+          if ${{ github.head_ref }} = "master"
+            echo "TAG=latest" >>$GITHUB_ENV
+          if ${{ github.head_ref }} = "develop"
+           echo "TAG=develop" >> $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: false
+          tags: |
+            nusak/netmaker:${{ env.TAG }}
+            if ${{ github.head_ref }} = "master"
+              nusak/netmaker:latest
+            if ${{ github.head_ref }} = "develop"
+              nusak/netmaker:latest