action: use commit as image tag

kubeovn · Jun 28, 2020 · c93f0d8 · c93f0d8
1 parent 6e36950
commit c93f0d8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/build-arm64-image.yaml b/.github/workflows/build-arm64-image.yaml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
     - master
+    - release-*
     paths-ignore:
     - 'docs/**'
     - 'yamls/**'
@@ -26,13 +27,15 @@ jobs:
           go get -u github.com/securego/gosec/cmd/gosec
           make release-arm
       - name: Push
-        if: ${{ github.ref == 'refs/heads/master' }}
+        if: ${{ github.ref == 'refs/heads/master' || contains(github.ref, 'release') }}
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
         run: |
           TAG=$(cat VERSION)
           echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-          docker images
           docker tag kubeovn/kube-ovn:$TAG kubeovn/kube-ovn:$TAG-arm
+          docker tag kubeovn/kube-ovn:$TAG kubeovn/kube-ovn:$COMMIT-arm
+          docker images
           docker push kubeovn/kube-ovn:$TAG-arm
+          docker push kubeovn/kube-ovn:$COMMIT-arm
diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml
@@ -10,6 +10,7 @@ on:
   push:
     branches:
     - master
+    - release-*
     paths-ignore:
     - 'docs/**'
     - 'yamls/**'
@@ -62,15 +63,16 @@ jobs:
           make e2e
 
       - name: Push
-        if: ${{ github.ref == 'refs/heads/master' }}
+        if: ${{ github.ref == 'refs/heads/master' || contains(github.ref, 'release') }}
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-          ALAUDA_USERNAME: ${{ secrets.ALAUDA_USERNAME }}
-          ALAUDA_PASSWORD: ${{ secrets.ALAUDA_PASSWORD }}
+          COMMIT: ${{ github.sha }}
         run: |
           cat VERSION
           TAG=$(cat VERSION)
           echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+          docker tag kubeovn/kube-ovn:$TAG kubeovn/kube-ovn:$COMMIT
           docker images
           docker push kubeovn/kube-ovn:$TAG
+          docker push kubeovn/kube-ovn:$COMMIT