build jan-2025 scan-handler

.github/workflows/jan-2025-dev-release.yaml

@@ -119,8 +119,41 @@ jobs:
   #         sleep 2s
   #         oc tag ${{ env.TOOLS_NAMESPACE }}/tfrs-celery:${{ env.BUILD_SUFFIX }} ${{ env.DEV_NAMESPACE }}/tfrs-celery:${{ env.BUILD_SUFFIX }}
 
-  build-scan-coordinator:
-    name: Build TFRS scan-coordinator
+  # build-scan-coordinator:
+  #   name: Build TFRS scan-coordinator
+  #   runs-on: ubuntu-latest
+  #   timeout-minutes: 60
+
+  #   steps:
+  #     - name: Check out repository
+  #       uses: actions/[email protected]
+  #       with:
+  #         ref: ${{ env.GIT_REF }}
+
+  #     - name: Log in to Openshift
+  #       uses: redhat-actions/[email protected]
+  #       with:
+  #         openshift_server_url: ${{ secrets.OPENSHIFT_SERVER }}
+  #         openshift_token: ${{ secrets.OPENSHIFT_TOKEN }}
+  #         insecure_skip_tls_verify: true
+  #         namespace: ${{ env.TOOLS_NAMESPACE }}
+
+  #     - name: Build TFRS scan-coordinator
+  #       run: |
+  #         cd openshift-v4/templates/scan-coordinator
+  #         oc process -f ./scan-coordinator-bc.yaml NAME=tfrs SUFFIX=-${{ env.BUILD_SUFFIX }} VERSION=${{ env.BUILD_SUFFIX }} GIT_URL=${{ env.GIT_URL }} GIT_REF=${{ env.GIT_REF }} | oc apply --wait=true -f - -n ${{ env.TOOLS_NAMESPACE }}
+  #         sleep 2s
+  #         for build in $(oc -n ${{ env.TOOLS_NAMESPACE }} get builds -l buildconfig=tfrs-scan-coordinator-${{ env.BUILD_SUFFIX }} -o jsonpath='{.items[?(@.status.phase=="Running")].metadata.name}'); do
+  #           echo "canceling $build"
+  #           oc -n ${{ env.TOOLS_NAMESPACE }} cancel-build $build
+  #         done
+  #         sleep 2s
+  #         oc -n ${{ env.TOOLS_NAMESPACE }} start-build tfrs-scan-coordinator-${{ env.BUILD_SUFFIX }} --wait=true
+  #         sleep 2s
+  #         oc tag ${{ env.TOOLS_NAMESPACE }}/tfrs-scan-coordinator:${{ env.BUILD_SUFFIX }} ${{ env.DEV_NAMESPACE }}/tfrs-scan-coordinator:${{ env.BUILD_SUFFIX }}
+
+  build-scan-handler:
+    name: Build TFRS scan-handler
     runs-on: ubuntu-latest
     timeout-minutes: 60
 
@@ -138,16 +171,16 @@ jobs:
           insecure_skip_tls_verify: true
           namespace: ${{ env.TOOLS_NAMESPACE }}
 
-      - name: Build TFRS scan-coordinator
+      - name: Build TFRS scan-handler
         run: |
-          cd openshift-v4/templates/scan-coordinator
-          oc process -f ./scan-coordinator-bc.yaml NAME=tfrs SUFFIX=-${{ env.BUILD_SUFFIX }} VERSION=${{ env.BUILD_SUFFIX }} GIT_URL=${{ env.GIT_URL }} GIT_REF=${{ env.GIT_REF }} | oc apply --wait=true -f - -n ${{ env.TOOLS_NAMESPACE }}
+          cd openshift-v4/templates/scan-handler
+          oc process -f ./scan-handler-bc-docker.yaml NAME=tfrs SUFFIX=-${{ env.BUILD_SUFFIX }} VERSION=${{ env.BUILD_SUFFIX }} GIT_URL=${{ env.GIT_URL }} GIT_REF=${{ env.GIT_REF }} | oc apply --wait=true -f - -n ${{ env.TOOLS_NAMESPACE }}
           sleep 2s
-          for build in $(oc -n ${{ env.TOOLS_NAMESPACE }} get builds -l buildconfig=tfrs-scan-coordinator-${{ env.BUILD_SUFFIX }} -o jsonpath='{.items[?(@.status.phase=="Running")].metadata.name}'); do
+          for build in $(oc -n ${{ env.TOOLS_NAMESPACE }} get builds -l buildconfig=tfrs-scan-handler-${{ env.BUILD_SUFFIX }} -o jsonpath='{.items[?(@.status.phase=="Running")].metadata.name}'); do
             echo "canceling $build"
             oc -n ${{ env.TOOLS_NAMESPACE }} cancel-build $build
           done
           sleep 2s
-          oc -n ${{ env.TOOLS_NAMESPACE }} start-build tfrs-scan-coordinator-${{ env.BUILD_SUFFIX }} --wait=true
+          oc -n ${{ env.TOOLS_NAMESPACE }} start-build tfrs-scan-handler-${{ env.BUILD_SUFFIX }} --wait=true
           sleep 2s
-          oc tag ${{ env.TOOLS_NAMESPACE }}/tfrs-scan-coordinator:${{ env.BUILD_SUFFIX }} ${{ env.DEV_NAMESPACE }}/tfrs-scan-coordinator:${{ env.BUILD_SUFFIX }}
+          oc tag ${{ env.TOOLS_NAMESPACE }}/tfrs-scan-handler:${{ env.BUILD_SUFFIX }} ${{ env.DEV_NAMESPACE }}/tfrs-scan-handler:${{ env.BUILD_SUFFIX }}

openshift-v4/templates/scan-handler/Dockerfile

@@ -5,7 +5,7 @@ RUN apt-get update \
 WORKDIR /app/tfrs
 COPY . .
 COPY security-scan/scan-handler/scan-handler.conf /etc/supervisor/conf.d
-RUN pip install --upgrade pip \
+RUN pip install --upgrade pip==24.0 \
   && pip install -r backend/requirements.txt \
   && chgrp -R root /var/log/supervisor \
   && chmod -R g+w /var/log/supervisor \