Merge branch 'master' into dry-run-start

artukryp · Mar 29, 2022 · 790acf3 · 790acf3
2 parents d253f6e + ec73c58
commit 790acf3
Show file tree

Hide file tree

Showing 41 changed files with 3,295 additions and 1,123 deletions.
diff --git a/.github/workflows/build-and-release-dde.yml b/.github/workflows/build-and-release-dde.yml
@@ -6,13 +6,21 @@ on:
   push:
     tags:
       - 'v*'  
-    branches:
-      - 'master'
+    # branches:
+    #   - 'master'
     paths-ignore:
       - 'docs/**'
-      - '.github/**'
+      # - '.github/**'
   workflow_dispatch:
-
+    inputs:
+      release-ver:
+          description: 'Stable Release Version'     
+          required: true
+          default: 'v'
+      stripped-release-ver:
+          description: 'Stripped Stable Release Version'     
+          required: true
+          default: ''
 jobs:
   docker:
     runs-on: ubuntu-latest
@@ -27,6 +35,7 @@ jobs:
               echo "RELEASE_CHANNEL=edge" >> $GITHUB_ENV
           fi
           echo "Release channel determined to be $RELEASE_CHANNEL"
+          echo "GIT_STRIPPED_VERSION=`echo ${{github.ref}} | cut -c 2-`" >> $GITHUB_ENV
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -44,10 +53,11 @@ jobs:
             prefix=${{env.RELEASE_CHANNEL}}-
           tags: |
             type=raw,value={{sha}}
+            type=semver,pattern={{version}},value=${{github.event.inputs.release-ver}}
+            type=raw,value=${{github.event.inputs.release-ver}}
             type=raw,value={{tag}},enable=${{ startsWith(github.ref, 'refs/tags/v') }}
             type=raw,value=latest
-            type=semver,pattern={{version}}
-
+          
       -
         name: Login to DockerHub
         uses: docker/login-action@v1 
@@ -59,15 +69,18 @@ jobs:
         name: Build and Push 
         uses: docker/build-push-action@v2
         with:
-          platforms: linux/amd64
           context: "{{defaultContext}}:install/docker-desktop-extension"
           push: true
+          build-args: |
+            GIT_STRIPPED_VERSION=${{github.event.inputs.stripped-release-ver}}
+            GIT_VERSION=${{github.event.inputs.release-ver}}
           tags: ${{ steps.meta.outputs.tags }}     
 
-      - 
-        name: Docker Hub Description
-        uses: peter-evans/dockerhub-description@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: meshery/meshery-docker-desktop-extension   
+      # - 
+      #   name: Docker Hub Description
+      #   uses: peter-evans/dockerhub-description@v3
+      #   with:
+      #     username: ${{ secrets.DOCKER_USERNAME }}
+      #     password: ${{ secrets.DOCKER_PASSWORD }}
+      #     repository: meshery/meshery-docker-desktop-extension  
+      #     readme-filepath: /install/docker-desktop-extension/README.md 
diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
@@ -32,7 +32,7 @@ jobs:
           docker push ${{ secrets.IMAGE_NAME }}:stable-${GITHUB_REF/refs\/tags\//}
           docker push ${{ secrets.IMAGE_NAME }}:stable-${GITHUB_SHA::8}
       - name: Docker Hub Description
-        uses: peter-evans/dockerhub-description@v2.4.3
+        uses: peter-evans/dockerhub-description@v3
         env:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}