Browse Source

Merge pull request #16 from mattkasun/arm-docker

fixed github actions
Matthew R Kasun 4 years ago
parent
commit
a638e6a7d8
1 changed files with 2 additions and 2 deletions
  1. 2 2
      .github/workflows/publish-docker.yml

+ 2 - 2
.github/workflows/publish-docker.yml

@@ -22,7 +22,7 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push latest
       - name: Build and push latest
-        if: ${{ github.head_ref }} = "master"
+        if: github.base_ref == 'master'
         uses: docker/build-push-action@v2
         uses: docker/build-push-action@v2
         with:
         with:
           context: .
           context: .
@@ -31,7 +31,7 @@ jobs:
           tags: |
           tags: |
             nusak/netmaker:latest
             nusak/netmaker:latest
       - name: Build and push develop
       - name: Build and push develop
-        if: ${{ github.head_ref }} = "develop"
+        if: github.base_ref == 'develop'
         uses: docker/build-push-action@v2
         uses: docker/build-push-action@v2
         with:
         with:
           context: .
           context: .