Merge branch 'main' into ngf-release-2.0

Author: ADubhlaoich

.github/CODEOWNERS

@@ -15,19 +15,31 @@
 
 # DocOps Writers
 *                           @nginx/nginx-docs
+
 # DocOps Engineers
 .github/*                   @nginx/docs-engineering
-# NGINX Plus
-content/nginx/*             @nginx/plus-docs-approvers
+
 # NGINX Agent
-content/nginx/nms/agent/*   @nginx/agent-docs-approvers
-# NGINX One
-content/nginx-one/*         @nginx/one-docs-approvers
-# NGINX Instance Manager
-content/nms/nim/*           @nginx/nim-docs-approvers
-content/nim/*               @nginx/nim-docs-approvers
+content/nginx/nms/agent/*   @nginx/nginx-agent 
+
+# NGINX App Protect DoS
+content/nap-dos/*           @nginx/dos-docs-approvers
+
 # NGINX App Protect WAF
 content/nap-waf/*           @nginx/nap-docs-approvers
 data/nap-waf/*              @nginx/nap-docs-approvers
-# NGINX App Protect DoS
-content/nap-dos/*           @nginx/dos-docs-approvers
+
+# NGINX Gateway Fabric
+content/ngf/*               @nginx/nginx-gateway-fabric
+content/includes/ngf/*      @nginx/nginx-gateway-fabric
+
+# NGINX Instance Manager
+content/nms/nim/*           @nginx/nim-docs-approvers
+content/nim/*               @nginx/nim-docs-approvers
+
+# NGINX Plus
+content/nginx/*             @nginx/plus-docs-approvers
+
+# NGINX One
+content/nginx-one/*         @nginx/one-docs-approvers
+

.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

@@ -84,14 +84,15 @@ issue lifecycle:
 - The owner assigns one or more [labels](https://github.com/nginxinc/oss-docs/issues/labels) to the issue
 - The owner, in collaboration with the community member, determines what milestone to attach to an issue. They may be milestones correspond to product releases
 
-## Content edited elsewhere
+## Additional NGINX documentation
 
-This repository does not include all documentation available at https://docs.nginx.com. Other relevant repositories include:
+This repository does not include all of the source content for the NGINX documentation. Other relevant repositories include:
 
-- [NGINX Open Source](https://github.com/nginx/nginx)
-- [NGINX Unit](https://github.com/nginx/unit)
-- [NGINX Ingress Controller](https://github.com/nginxinc/kubernetes-ingress/)
-- [NGINX Gateway Fabric](https://github.com/nginxinc/nginx-gateway-fabric)
+- [NGINX Open Source](https://github.com/nginx/nginx) - source for [NGINX changelog](https://nginx.org/en/CHANGES)
+- [nginx.org](https://github.com/nginx/nginx.org) - source for https://nginx.org
+- [NGINX Unit](https://github.com/nginx/unit) - source for https://unit.nginx.org
+- [NGINX Ingress Controller](https://github.com/nginxinc/kubernetes-ingress/) - source for https://docs.nginx.com/nginx-ingress-controller
+- [NGINX Agent](https://github.com/nginx/agent) - source for https://docs.nginx.com/nginx-agent
 
 In those repositories, you can find documentation source code in the `docs` or `site` subdirectories.
 

CONTRIBUTING.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}

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}