Merge branch 'main' into mkingst-simplify-helm-instructions

Author: mjang

.github/workflows/build-push.yml

@@ -34,7 +34,7 @@ on:
       - "*"
   push:
     branches:
-      - "nim-release-2.18.0"
+      - "main"
 
 env:
   FRONT_DOOR_USERNAME: ${{ secrets.FRONT_DOOR_USERNAME }}
@@ -65,8 +65,8 @@ jobs:
       doc_type: "hugo"
       environment: ${{inputs.environment}}
       force_hugo_theme_version: ${{inputs.hugo_theme_override}}
-      auto_deploy_branch: "nim-release-2.18.0"
-      auto_deploy_env: "staging"
+      auto_deploy_branch: "main"
+      auto_deploy_env: "prod"
     secrets:
       AZURE_CREDENTIALS: ${{secrets.AZURE_CREDENTIALS_DOCS}}
       AZURE_KEY_VAULT: ${{secrets.AZURE_KEY_VAULT_DOCS}}

.github/workflows/daily-deploy.yml

@@ -56,6 +56,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: Upload SARIF results to code scanning
-        uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
+        uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
         with:
           sarif_file: results.sarif

.github/workflows/ossf_scorecard.yml

@@ -1,8 +1,8 @@
 ```dockerfile
 # syntax=docker/dockerfile:1
 
-# Supported OS_VER's are 3.16/3.17
-ARG OS_VER="3.17"
+# Supported OS_VER's are 3.16/3.17/3.19
+ARG OS_VER="3.19"
 
 # Base image
 FROM alpine:${OS_VER}

content/includes/nap-waf/config/v5/build-nginx-image-oss/build-alpine.md

@@ -1,8 +1,8 @@
 ```dockerfile
 # syntax=docker/dockerfile:1
 
-# Supported OS_VER's are 3.16/3.17
-ARG OS_VER="3.17"
+# Supported OS_VER's are 3.16/3.17/3.19
+ARG OS_VER="3.19"
 
 # Base image
 FROM alpine:${OS_VER}