Skip to content

Commit 86ab449

Browse files
authored
Merge branch 'main' into chisomngixopencource
2 parents 323fe6c + ffe8d34 commit 86ab449

Some content is hidden

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

72 files changed

+2798
-606
lines changed

.github/workflows/build-push.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ on:
3434
- "*"
3535
push:
3636
branches:
37-
- "nim-release-2.18.0"
37+
- "main"
3838

3939
env:
4040
FRONT_DOOR_USERNAME: ${{ secrets.FRONT_DOOR_USERNAME }}
@@ -65,8 +65,8 @@ jobs:
6565
doc_type: "hugo"
6666
environment: ${{inputs.environment}}
6767
force_hugo_theme_version: ${{inputs.hugo_theme_override}}
68-
auto_deploy_branch: "nim-release-2.18.0"
69-
auto_deploy_env: "staging"
68+
auto_deploy_branch: "main"
69+
auto_deploy_env: "prod"
7070
secrets:
7171
AZURE_CREDENTIALS: ${{secrets.AZURE_CREDENTIALS_DOCS}}
7272
AZURE_KEY_VAULT: ${{secrets.AZURE_KEY_VAULT_DOCS}}

.github/workflows/daily-deploy.yml

-16
This file was deleted.

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

+2-2
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

+2-2
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)