Skip to content

Commit 30c2793

Browse files
committed
Nginx 1.29.2 and BotBlocker V4.2025.10.5514
1 parent e8b95d7 commit 30c2793

File tree

7 files changed

+58
-94
lines changed

7 files changed

+58
-94
lines changed

.github/workflows/build_manual.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,19 @@ name: "MANUAL - Build all images"
33
on:
44
workflow_dispatch:
55
inputs:
6-
Manual Build:
6+
Manual_Build:
77
description: 'Manual Build'
88
required: false
99

1010
jobs:
1111
prepare:
1212
uses: nfrastack/gha/.github/workflows/artifacts-encrypt.yml@main
1313
secrets: inherit
14-
alpine:
14+
build:
1515
needs: prepare
16-
uses: ./.github/workflows/distro_alpine.yml
17-
secrets: inherit
18-
debian:
19-
needs: prepare
20-
uses: ./.github/workflows/distro_debian.yml
16+
uses: ./.github/workflows/image_build.yml
2117
secrets: inherit
2218
cleanup:
23-
needs: [alpine, debian]
19+
needs: [build]
2420
uses: nfrastack/gha/.github/workflows/artifacts-remove.yml@main
2521
secrets: inherit

.github/workflows/build_push.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,12 @@ jobs:
1212
prepare:
1313
uses: nfrastack/gha/.github/workflows/artifacts-encrypt.yml@main
1414
secrets: inherit
15-
alpine:
15+
build:
1616
needs: prepare
17-
uses: ./.github/workflows/distro_alpine.yml
18-
secrets: inherit
19-
debian:
20-
needs: prepare
21-
uses: ./.github/workflows/distro_debian.yml
17+
uses: ./.github/workflows/image_build.yml
2218
secrets: inherit
2319
cleanup:
24-
needs: [alpine, debian]
20+
needs: [build]
2521
uses: nfrastack/gha/.github/workflows/artifacts-remove.yml@main
2622
secrets: inherit
2723

.github/workflows/distro_alpine.yml

Lines changed: 0 additions & 36 deletions
This file was deleted.

.github/workflows/distro_debian.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

.github/workflows/image_build.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: alpine
2+
3+
on:
4+
workflow_call
5+
6+
jobs:
7+
build_alpine:
8+
runs-on: ubuntu-latest
9+
continue-on-error: true
10+
strategy:
11+
matrix:
12+
build:
13+
- { distro: "alpine", distro_variant: "3.22", latest: "true", distro_latest: "true", arch: "linux/amd64,linux/arm64" }
14+
- { distro: "alpine", distro_variant: "3.19", latest: "false", distro_latest: "false", arch: "linux/amd64,linux/arm64" }
15+
- { distro: "alpine", distro_variant: "3.16", latest: "false", distro_latest: "false", arch: "linux/amd64",linux/arm64" }
16+
- { distro: "alpine", distro_variant: "3.15", latest: "false", distro_latest: "false", arch: "linux/amd64",linux/arm64" }
17+
- { distro: "alpine", distro_variant: "3.12", latest: "false", distro_latest: "false", arch: "linux/amd64",linux/arm64" }
18+
- { distro: "debian", distro_variant: "trixie", latest: "false", distro_latest: "true", arch: "linux/amd64,linux/arm64" }
19+
- { distro: "debian", distro_variant: "bookworm", latest: "false", distro_latest: "false", arch: "linux/amd64,linux/arm64" }
20+
image_variant:
21+
- core
22+
- faflopza
23+
- faflopzaze
24+
env:
25+
BASE_IMAGE: "ghcr.io/nfrastack/container-base"
26+
DISTRO: ${{ matrix.build.distro }}
27+
DISTRO_VARIANT: ${{ matrix.build.distro_variant }}
28+
DISTRO_LATEST: ${{ matrix.build.distro_latest || 'false' }}
29+
IMAGE_VARIANT: ${{ matrix.image_variant }}
30+
ARCH: ${{ matrix.build.arch || 'linux/amd64,linux/arm64' }}
31+
steps:
32+
- name: Checkout Repository
33+
uses: actions/checkout@v5
34+
- name: Download Encrypted Files
35+
uses: actions/download-artifact@v4
36+
with:
37+
name: encrypted-artifacts
38+
path: ./
39+
- name: Build Image
40+
uses: nfrastack/gha/.github/actions/build_multi_image@main
41+
with:
42+
docker_username: ${{ secrets.DOCKER_USERNAME }}
43+
docker_password: ${{ secrets.DOCKER_PASSWORD }}
44+
github_token: ${{ secrets.GITHUB_TOKEN }}

Containerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5-
ARG BASE_IMAGE
6-
ARG DISTRO
7-
ARG DISTRO_VARIANT
5+
ARG \
6+
BASE_IMAGE \
7+
DISTRO \
8+
DISTRO_VARIANT
89

910
FROM ${BASE_IMAGE}:${DISTRO}_${DISTRO_VARIANT}
1011

@@ -19,12 +20,12 @@ LABEL \
1920
org.opencontainers.image.licenses="MIT"
2021

2122
ARG \
22-
NGINX_VERSION="release-1.29.1" \
23+
NGINX_VERSION="release-1.29.2" \
2324
NGINX_REPO_URL="https://github.com/nginx/nginx" \
2425
NGINX_MODULE_AUTH_LDAP_REPO_URL="https://github.com/kvspb/nginx-auth-ldap" \
2526
NGINX_MODULE_AUTH_LDAP_VERSION="241200eac8e4acae74d353291bd27f79e5ca3dc4" \
2627
NGINX_MODULE_BLOCK_BOTS_REPO_URL="https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker" \
27-
NGINX_MODULE_BLOCK_BOTS_VERSION="V4.2025.09.5442" \
28+
NGINX_MODULE_BLOCK_BOTS_VERSION="V4.2025.10.5514" \
2829
NGINX_MODULE_BROTLI_REPO_URL="https://github.com/google/ngx_brotli" \
2930
NGINX_MODULE_BROTLI_VERSION="a71f9312c2deb28875acc7bacfdd5695a111aa53" \
3031
NGINX_MODULE_COOKIE_FLAG_REPO_URL="https://github.com/AirisX/nginx_cookie_flag_module" \

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Example:
9393
`ghcr.io/nfrastack/container-nginx:alpine_3.22`
9494

9595
* `latest` will be the most recent commit
96-
* An otpional `tag` may exist that matches the [CHANGELOG](CHANGELOG.md) - These are the safest
96+
* An optional `tag` may exist that matches the [CHANGELOG](CHANGELOG.md) - These are the safest
9797
* If it is built for multiple distributions there may exist a value of `alpine` or `debian`
9898
* If there are multiple distribution variations it may include a version - see the registry for availability
9999

0 commit comments

Comments
 (0)