Merge branch 'main' into chore/add-docs-owner

Author: lucacome

.github/workflows/ci.yml

@@ -313,7 +313,7 @@ jobs:
             NGINX_CONF_DIR=internal/mode/static/nginx/conf
 
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@2b6a709cf9c4025c5438138008beaddbb02086f0 # 0.14.0
+        uses: aquasecurity/trivy-action@22d2755f774d925b191a185b74e782a4b0638a41 # 0.15.0
         continue-on-error: true
         with:
           image-ref: ghcr.io/nginxinc/nginx-gateway-fabric${{ matrix.container == 'nginx' && '/nginx' || '' }}:${{ steps.meta.outputs.version }}

.github/workflows/update-docker-images.yml

@@ -123,7 +123,7 @@ jobs:
             NGINX_CONF_DIR=internal/mode/static/nginx/conf
 
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@2b6a709cf9c4025c5438138008beaddbb02086f0 # 0.14.0
+        uses: aquasecurity/trivy-action@22d2755f774d925b191a185b74e782a4b0638a41 # 0.15.0
         continue-on-error: true
         with:
           image-ref: ghcr.io/nginxinc/nginx-gateway-fabric/nginx:${{ needs.variables.outputs.ngf_tag }}

site/Makefile

@@ -89,4 +89,4 @@ build-dev:
 	hugo --gc -e development
 
 deploy-preview: hugo-mod
-	hugo --gc -b ${NETLIFY_DEPLOY_URL}
+	hugo --gc -b ${NETLIFY_DEPLOY_URL}/nginx-gateway-fabric/

site/config/_default/config.toml

@@ -1,7 +1,6 @@
 title = "NGINX Gateway Fabric"
 enableGitInfo = false
 baseURL = "/"
-publishDir = "public/nginx-gateway-fabric"
 staticDir = ["static"]
 languageCode = "en-us"
 description = "NGINX Gateway Fabric."

site/config/development/config.toml

@@ -1,3 +1,4 @@
 baseURL = "https://docs-dev.nginx.com/nginx-gateway-fabric"
 title = "DEV -- NGINX Gateway Fabric"
+publishDir = "public/nginx-gateway-fabric"
 canonifyURLs = false

site/config/production/config.toml

@@ -1,3 +1,4 @@
 baseURL = "/nginx-gateway-fabric"
 title = "NGINX Gateway Fabric"
+publishDir = "public/nginx-gateway-fabric"
 canonifyURLs = false

site/config/staging/config.toml

@@ -1,3 +1,4 @@
 baseURL = "https://docs-staging.nginx.com/nginx-gateway-fabric"
 title = "STAGING -- NGINX Gateway Fabric"
+publishDir = "public/nginx-gateway-fabric"
 canonifyURLs = false

site/netlify.toml

@@ -1,6 +1,7 @@
 [build]
   base = "site/"
   publish = "public"
+  command = "hugo --gc -b $DEPLOY_PRIME_URL/nginx-gateway-fabric"
 
 [context.production]
   command = "make all"