Merge Develop into Master (v1.31)

.circleci/config.yml

@@ -1,4 +1,4 @@
-version: 2
+version: 2.1
 
 jobs:
   test:
@@ -92,7 +92,6 @@ jobs:
           path: dockerLogs/
 
 workflows:
-  version: 2
   build_and_test:
     jobs:
       - test

.github/workflows/build_cw_image-prod.yml

@@ -1,5 +1,6 @@
 name: build_CW_docker_image_master
 on:
+  workflow_dispatch:
   push:
     tags:
       - '*'
@@ -13,7 +14,7 @@ jobs:
     steps:
       - name: Check out repository code
         uses: actions/checkout@v5
-      - name: Build Image
+      - name: Build Image with Codabench Version as tag
         run: docker build -t codalab/codabench-compute-worker:${{ github.ref_name }} -f packaging/container/Containerfile.compute_worker .
       - name: Login to Docker Hub
         uses: docker/login-action@v3
@@ -22,7 +23,12 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Push image with prod release tag
         run: docker push codalab/codabench-compute-worker:${{ github.ref_name }}
-      - name: Change tag to latest
+      - name: Change tag to latest and push
         run: |
           docker tag codalab/codabench-compute-worker:${{ github.ref_name }} codalab/codabench-compute-worker:latest
           docker push codalab/codabench-compute-worker:latest
+      - name: Change tag to prod release tag + date for CVEs versioning and push
+        run: |
+          NOW=$(date "+%Y-%m-%dT%H-%M-%S")
+          docker tag codalab/codabench-compute-worker:latest codalab/codabench-compute-worker:${{ github.ref_name }}-${NOW}
+          docker push codalab/codabench-compute-worker:${{ github.ref_name }}-${NOW}

.github/workflows/image_scan.yml

@@ -1,8 +1,10 @@
 name: scan_image_for_CVE
 on:
+  workflow_dispatch:
   # Every day at  00:00
   schedule:
-   - cron: "0 0 * * *"
+    - cron: "0 0 * * *"
+
 jobs:
   scan_image:
     name: Scan compute worker image with Trivy
@@ -14,6 +16,6 @@ jobs:
           image-ref: 'codalab/codabench-compute-worker:latest'
           format: 'table'
           exit-code: '1'
-          pkg-types: 'os,library'
+          vuln-type: 'os,library'
           severity: 'CRITICAL,HIGH'
           scanners: 'vuln'