Browse Source

Merge pull request #83 from gravitl/arm-docker

Simplify git action for dockerfile creation
Alex 4 years ago
parent
commit
fad2138d7e
2 changed files with 16 additions and 42 deletions
  1. 0 33
      .github/workflows/publish-docker-latest.yml
  2. 16 9
      .github/workflows/publish-docker.yml

+ 0 - 33
.github/workflows/publish-docker-latest.yml

@@ -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      

+ 16 - 9
.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 }}
+            
+