From c983febf78051626a9ce0e570eb274b738316758 Mon Sep 17 00:00:00 2001
From: Johannes Metzner <jm@jometzner.de>
Date: Fri, 17 Jun 2022 08:58:18 +0200
Subject: [PATCH] fix: pin nginx version to 1.21.6 instead of using latest
 (#1188)

(cherry picked from commit 2ba3d94ca30b2a81e93880a20fdd31eab3293dbd)
---
 nginx/Dockerfile    | 2 +-
 nginx/entrypoint.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index 7c0ae33762..b86984dd9a 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:focal as buildstep
 RUN apt-get update
 RUN apt-get install -y curl build-essential zlib1g-dev libpcre3-dev unzip wget uuid-dev sudo openssl libssl-dev
 RUN curl -kfL -sS https://ngxpagespeed.com/install > install.sh
-RUN bash install.sh --nginx-version latest --additional-nginx-configure-arguments '--with-http_ssl_module --with-http_stub_status_module'
+RUN bash install.sh --ngx-pagespeed-version v1.13.35.2-stable --nginx-version 1.21.6 --additional-nginx-configure-arguments '--with-http_ssl_module --with-http_stub_status_module'
 
 FROM scratch as configstep
 COPY --from=nginx:mainline /etc/nginx /etc/nginx
diff --git a/nginx/entrypoint.sh b/nginx/entrypoint.sh
index cb2e9bf113..697bff7b0a 100644
--- a/nginx/entrypoint.sh
+++ b/nginx/entrypoint.sh
@@ -67,6 +67,7 @@ fi
 
 if [ -z "$*" ]
 then
+  /usr/local/nginx/sbin/nginx -V
   /usr/local/nginx/sbin/nginx -c /etc/nginx/nginx.conf -g "daemon off;"
 else
   exec "$@"