From f1e7c536d1dc76a26688aa215358101f594ad3cb Mon Sep 17 00:00:00 2001
From: Michael Nikitochkin <michael.nikitochkin@gmx.net>
Date: Thu, 25 Apr 2024 13:25:05 +0200
Subject: [PATCH 1/3] Add nginx 1.25.5

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

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

From 7e2ed3e9beccc76012882f318b418cad46719901 Mon Sep 17 00:00:00 2001
From: Michael Nikitochkin <michael.nikitochkin@gmx.net>
Date: Thu, 25 Apr 2024 13:36:52 +0200
Subject: [PATCH 2/3] Update docker build for Debian with a new GPG path

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 28d53751..99394219 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -201,9 +201,9 @@ 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:1.25.5-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
 

From e962e98db56ef937185b0d7fd32dba54dc11f65f Mon Sep 17 00:00:00 2001
From: Michael Nikitochkin <michael.nikitochkin@gmx.net>
Date: Thu, 25 Apr 2024 13:41:28 +0200
Subject: [PATCH 3/3] Specify same bae image for debian and alpine

---
 Dockerfile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 99394219..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,7 +202,7 @@ 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-bookworm as build-nginx-debian
+FROM nginx:${BUILD_NGINX_VERSION}-bookworm as build-nginx-debian
 
 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 \
@@ -209,7 +210,7 @@ RUN echo "deb-src [signed-by=/etc/apt/keyrings/nginx-archive-keyring.gpg] http:/
 
 
 ### 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