Merge branch 'main' into OPS-310/3100_CAN_funding_received_form

.github/workflows/dev_be_build_and_deploy.yml

@@ -47,7 +47,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           context: ${{ github.workspace }}/${{ env.WORKING_DIR }}
           dockerfile: ${{ github.workspace }}/${{ env.WORKING_DIR }}/${{ env.BE_DOCKER_FILE }}
-          image_tags: "unstable,${{ github.sha }}"
+          image_tags: "${{ env.ENVIRONMENT }},${{ github.sha }}"
 
   deploy-data-tools:
     needs: build-data-tools

.github/workflows/nightly_scans.yml

@@ -25,7 +25,7 @@ jobs:
           target: 'https://stg.ops.opre.acf.gov/'
           allow_issue_writing: false
           fail_action: false
-          cmd_options: '-I'
+          cmd_options: '-I -l FAIL'
 
       ## Manually reviewed the action, and validated it performs basic
       ## conversion from zap.json to zap.sarif.

.github/workflows/prod_be_build_and_deploy.yml

@@ -42,7 +42,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           context: ${{ github.workspace }}/${{ env.WORKING_DIR }}
           dockerfile: ${{ github.workspace }}/${{ env.WORKING_DIR }}/${{ env.BE_DOCKER_FILE }}
-          image_tags: "${{ github.sha }}"
+          image_tags: "${{ env.ENVIRONMENT }},${{ github.sha }}"
 
   deploy-data-tools:
     needs: build-data-tools

.github/workflows/stg_be_build_and_deploy.yml

@@ -47,7 +47,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           context: ${{ github.workspace }}/${{ env.WORKING_DIR }}
           dockerfile: ${{ github.workspace }}/${{ env.WORKING_DIR }}/${{ env.BE_DOCKER_FILE }}
-          image_tags: "${{ github.sha }}"
+          image_tags: "${{ env.ENVIRONMENT }},${{ github.sha }}"
 
   deploy-data-tools:
     needs: build-data-tools

frontend/Dockerfile

@@ -1,4 +1,4 @@
-FROM oven/bun@sha256:c69984f2e6b7860a9ab9cd5762e59a51aa3e62b5b12d109a1fcbc04857dc4f5b
+FROM oven/bun@sha256:c644717831b531f8fba049ddde9bb34f452bd75c4184f1e9a643ec4537be16de
 # hadolint ignore=DL3008
 RUN apt-get update && apt-get -y --no-install-recommends install unzip && apt-get clean && rm -rf /var/lib/apt/lists/*
 RUN useradd -ms /bin/bash app

frontend/Dockerfile.azure

@@ -1,6 +1,6 @@
 # ---- Build Stage ----
 # alpine
-FROM oven/bun@sha256:c69984f2e6b7860a9ab9cd5762e59a51aa3e62b5b12d109a1fcbc04857dc4f5b as build
+FROM oven/bun@sha256:c644717831b531f8fba049ddde9bb34f452bd75c4184f1e9a643ec4537be16de as build
 RUN apt-get update && apt-get -y install unzip=6.0-26+deb11u1 --no-install-recommends && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /home/bun/app

frontend/package.json

@@ -57,7 +57,7 @@
     "vite-plugin-svgr": "4.3.0"
   },
   "overrides": {
-    "rollup": "4.29.1"
+    "rollup": "4.30.0"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "6.6.3",