Skip to content

Commit 41eccf9

Browse files
authored
Merge branch 'main' into shaynes/config-revert-changelog
2 parents 7215e3f + ffe8d34 commit 41eccf9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1858
-555
lines changed

.github/workflows/build-push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
environment: ${{inputs.environment}}
6767
force_hugo_theme_version: ${{inputs.hugo_theme_override}}
6868
auto_deploy_branch: "main"
69-
auto_deploy_env: "staging"
69+
auto_deploy_env: "prod"
7070
secrets:
7171
AZURE_CREDENTIALS: ${{secrets.AZURE_CREDENTIALS_DOCS}}
7272
AZURE_KEY_VAULT: ${{secrets.AZURE_KEY_VAULT_DOCS}}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
```dockerfile
22
# syntax=docker/dockerfile:1
33

4-
# Supported OS_VER's are 3.16/3.17
5-
ARG OS_VER="3.17"
4+
# Supported OS_VER's are 3.16/3.17/3.19
5+
ARG OS_VER="3.19"
66

77
# Base image
88
FROM alpine:${OS_VER}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
```dockerfile
22
# syntax=docker/dockerfile:1
33

4-
# Supported OS_VER's are 3.16/3.17
5-
ARG OS_VER="3.17"
4+
# Supported OS_VER's are 3.16/3.17/3.19
5+
ARG OS_VER="3.19"
66

77
# Base image
88
FROM alpine:${OS_VER}

0 commit comments

Comments
 (0)