Merge with original branch, add sorting to oss in self-check tab

.github/workflows/deploy-demo.yml

@@ -0,0 +1,60 @@
+name: Build and Deploy demo
+
+on:
+  release:
+    types: [ published ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          cache: 'gradle'
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Build with Gradle
+        run: ./gradlew build --exclude-task test
+
+      - name: Rename package
+        run: mv build/libs/FOSSLight*.war FOSSLight.war
+
+      - name: Upload Release Asset
+        id: upload-release-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ./FOSSLight.war
+          asset_name: FOSSLight.war
+          asset_content_type: application/octet-stream
+
+  deploy-demo:
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Sleep for 30 seconds
+        uses: jakejarvis/wait-action@master
+        with:
+          time: '30s'
+
+      - name: Deploy
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.REMOTE_IP }}
+          username: ${{ secrets.REMOTE_SSH_ID }}
+          key: ${{ secrets.REMOTE_SSH_KEY }}
+          port: ${{ secrets.REMOTE_SSH_PORT }}
+          script: |
+            cd /service/deploy/fosslight/
+            bash /service/deploy/fosslight/deploy.sh

.github/workflows/release-publish.yml

@@ -41,13 +41,18 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           branch: ${{ matrix.ref }}
 
-  build:
-    needs: update-changelog
-    runs-on: ubuntu-18.04
+  deploy-image:
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v3
 
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
@@ -58,77 +63,9 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Build with Gradle
-        run: ./gradlew build --exclude-task test
-
-      - name: Rename package
-        run: mv build/libs/FOSSLight*.war FOSSLight.war
-
-      - name: Upload Release Asset
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ./FOSSLight.war
-          asset_name: FOSSLight.war
-          asset_content_type: application/octet-stream
-
-  deploy-demo:
-    needs: build
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Sleep for 30 seconds
-        uses: jakejarvis/wait-action@master
-        with:
-          time: '30s'
-
-      - name: Deploy
-        uses: appleboy/ssh-action@master
-        with:
-          host: ${{ secrets.REMOTE_IP }}
-          username: ${{ secrets.REMOTE_SSH_ID }}
-          key: ${{ secrets.REMOTE_SSH_KEY }}
-          port: ${{ secrets.REMOTE_SSH_PORT }}
-          script: |
-            cd /service/deploy/fosslight/
-            bash /service/deploy/fosslight/deploy.sh
-
-  deploy-image:
-    needs: deploy-demo
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: |
-            linux/arm64/v8
-            linux/arm/v7
-            linux/ppc64le
-            linux/s390x
-            linux/amd64
-          push: true
-          tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/fosslight:latest
-            ${{ secrets.DOCKERHUB_USERNAME }}/fosslight:${{ github.event.release.tag_name }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+      - name: JIB Build and push
+        run: >
+          ./gradlew jib 
+          -Djib.to.image='${{ secrets.DOCKERHUB_USERNAME }}/fosslight' 
+          -Djib.to.tags=${{ github.event.release.tag_name }},latest
+          -Pjib.multiplatform 

.gitignore

@@ -4,6 +4,8 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**
 !**/src/test/**
+.uuid
+.DS_Store
 
 ### STS ###
 .apt_generated