From 1c1eff43775450882952b615a4f24e55bcc642aa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Nov 2021 02:16:21 +0000
Subject: [PATCH 1/2] Bump nginx from 1.21.3 to 1.21.4

Bumps nginx from 1.21.3 to 1.21.4.

---
updated-dependencies:
- dependency-name: nginx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 42554043..2b7060e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -201,7 +201,7 @@ RUN xx-info env && git clone --depth 1 -b $DATADOG_VERSION https://github.com/Da
 
 
 ### Base build image for debian
-FROM nginx:1.21.3 as build-nginx-debian
+FROM nginx:1.21.4 as build-nginx-debian
 
 RUN echo "deb-src http://nginx.org/packages/mainline/debian/ stretch nginx" >> /etc/apt/sources.list \
     && apt-get update \
@@ -237,12 +237,12 @@ RUN curl -sSL -O https://github.com/nginx/nginx/archive/release-${NGINX_VERSION}
 
 
 ### Base image for alpine
-FROM nginx:1.21.3-alpine as nginx-alpine
+FROM nginx:1.21.4 as nginx-alpine
 RUN apk add --no-cache libstdc++
 
 
 ### Base image for debian
-FROM nginx:1.21.3 as nginx-debian
+FROM nginx:1.21.4 as nginx-debian
 
 
 ### Build final image

From 326ebb2054715ecbb7303ef729f27cdf0bd81b61 Mon Sep 17 00:00:00 2001
From: Luca Comellini <luca.com@gmail.com>
Date: Tue, 9 Nov 2021 19:55:37 -0800
Subject: [PATCH 2/2] Update to Debian Bullseye

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

diff --git a/Dockerfile b/Dockerfile
index 2b7060e7..a70f3732 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ ARG BUILD_OS=debian
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.0.0 AS xx
 
 ### Build base image for debian
-FROM --platform=$BUILDPLATFORM debian:buster as build-base-debian
+FROM --platform=$BUILDPLATFORM debian:bullseye as build-base-debian
 
 RUN apt-get update \
     && apt-get install --no-install-recommends --no-install-suggests -y \
@@ -203,7 +203,7 @@ RUN xx-info env && git clone --depth 1 -b $DATADOG_VERSION https://github.com/Da
 ### Base build image for debian
 FROM nginx:1.21.4 as build-nginx-debian
 
-RUN echo "deb-src http://nginx.org/packages/mainline/debian/ stretch nginx" >> /etc/apt/sources.list \
+RUN echo "deb-src http://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list \
     && apt-get update \
     && apt-get build-dep -y nginx
 
@@ -237,7 +237,8 @@ RUN curl -sSL -O https://github.com/nginx/nginx/archive/release-${NGINX_VERSION}
 
 
 ### Base image for alpine
-FROM nginx:1.21.4 as nginx-alpine
+# docker.io/library/nginx is a temporary workaround for Dependabot to see this as different from the one used in Debian
+FROM docker.io/library/nginx:1.21.3-alpine as nginx-alpine
 RUN apk add --no-cache libstdc++