Fix

Signed-off-by: ZePan110 <ze.pan@intel.com>

Author: ZePan110

.github/workflows/_trivy-scan.yml

@@ -43,11 +43,7 @@ jobs:
           sudo rm -rf ${{github.workspace}}/* || true
           docker system prune -f
       - name: Checkout out Repo
-<<<<<<< HEAD
         uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2
-=======
-        uses: actions/checkout@sha256:1e31de5234b9f8995739874a8ce0492dc87873e2
->>>>>>> c7043a46317d46c39a90b9ad3efb18a91ac7f376
       - name: Install Dependencies
         run: |
           sudo apt-get update
@@ -95,11 +91,7 @@ jobs:
         shell: bash
 
       - name: Security Scan Container
-<<<<<<< HEAD
         uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8
-=======
-        uses: aquasecurity/trivy-action@sha256:6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8
->>>>>>> c7043a46317d46c39a90b9ad3efb18a91ac7f376
         if: ${{ inputs.trivy_scan }}
         with:
           image-ref: ${{ env.OPEA_IMAGE_REPO }}opea/${{ inputs.image }}:${{ inputs.tag }}

.github/workflows/docker/code-scan.dockerfile

@@ -2,8 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # ARG UBUNTU_VER=22.04
-ARG UBUNTU_VER=@sha256:4e0171b9275e12d375863f2b3ae9ce00a4c53ddda176bd55868df97ac6f21a6e
-FROM ubuntu:${UBUNTU_VER} as devel
+FROM ubuntu@sha256:4e0171b9275e12d375863f2b3ae9ce00a4c53ddda176bd55868df97ac6f21a6e as devel
 
 ENV LANG=C.UTF-8
 

.github/workflows/pr-link-path-scan.yml

@@ -19,11 +19,7 @@ jobs:
         run: sudo rm -rf ${{github.workspace}}/*
 
       - name: Checkout Repo GenAIExamples
-<<<<<<< HEAD
         uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2
-=======
-        uses: actions/checkout@sha256:1e31de5234b9f8995739874a8ce0492dc87873e2
->>>>>>> c7043a46317d46c39a90b9ad3efb18a91ac7f376
         with:
           fetch-depth: 0
 
@@ -88,11 +84,7 @@ jobs:
         run: sudo rm -rf ${{github.workspace}}/*
 
       - name: Checkout Repo GenAIExamples
-<<<<<<< HEAD
         uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2
-=======
-        uses: actions/checkout@sha256:1e31de5234b9f8995739874a8ce0492dc87873e2
->>>>>>> c7043a46317d46c39a90b9ad3efb18a91ac7f376
         with:
           fetch-depth: 0
 

ChatQnA/ui/docker/Dockerfile.openEuler

@@ -17,7 +17,7 @@ COPY svelte /home/user/svelte
 WORKDIR /home/user/svelte
 
 # Install front-end dependencies
-RUN npm ci
+RUN npm install
 
 # Build the front-end application
 RUN npm run build