From 5fd46eb4fc5461b6ce155a368f43f724f233c348 Mon Sep 17 00:00:00 2001
From: Michael N <michael.nikitochkin@gmx.net>
Date: Thu, 25 Apr 2024 14:16:39 +0200
Subject: [PATCH] Build modules for NGINX 1.25.5 (#606)

* Build modules for NGINX 1.25.5 1.25.5.
* Update docker build to use debian bookworm with a new GPG path.
* Specify same nginx base image for debian and alpine.
---
 .github/workflows/ci.yml |  1 +
 Dockerfile               | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3811c3ce..57c31b43 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,6 +54,7 @@ jobs:
             1.25.2,
             1.25.3,
             1.25.4,
+            1.25.5,
           ]
     steps:
       - name: Checkout Repository
diff --git a/Dockerfile b/Dockerfile
index 28d53751..1b9be954 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
 # syntax=docker/dockerfile:1.3
 ARG BUILD_OS=debian
+ARG BUILD_NGINX_VERSION=1.25.5
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.4.0 AS xx
 
 ### Build base image for debian
@@ -201,15 +202,15 @@ RUN xx-info env && git clone --depth 1 -b $DATADOG_VERSION https://github.com/Da
 
 
 ### Base build image for debian
-FROM nginx:1.25.5 as build-nginx-debian
+FROM nginx:${BUILD_NGINX_VERSION}-bookworm as build-nginx-debian
 
-RUN echo "deb-src [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list \
+RUN echo "deb-src [signed-by=/etc/apt/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/mainline/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \
     && apt-get update \
     && apt-get build-dep -y nginx
 
 
 ### Base build image for alpine
-FROM nginx:1.25.5-alpine AS build-nginx-alpine
+FROM nginx:${BUILD_NGINX_VERSION}-alpine AS build-nginx-alpine
 RUN apk add --no-cache \
     build-base \
     pcre2-dev \
@@ -236,12 +237,12 @@ RUN curl -fsSL -O https://github.com/nginx/nginx/archive/release-${NGINX_VERSION
 
 
 ### Base image for alpine
-FROM nginx:1.25.5-alpine as nginx-alpine
+FROM nginx:${BUILD_NGINX_VERSION}-alpine as nginx-alpine
 RUN apk add --no-cache libstdc++
 
 
 ### Base image for debian
-FROM nginx:1.25.5 as nginx-debian
+FROM nginx:${BUILD_NGINX_VERSION}-bookworm as nginx-debian
 
 
 ### Build final image