Upgrade nginx to 1.24.0

jhampson-dbre · Jul 14, 2023 · b5c9bd8 · b5c9bd8
1 parent c763f97
commit b5c9bd8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/nginx_proxy/CHANGELOG.md b/nginx_proxy/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## 5.0.0
+
+BREAKING CHANGE: Nginx is updated to version 1.24.0
+
+Other noteworth changes:
+
+- Bump Alpine version to 3.18
+- Build ModSecurity from [2cb6344](https://github.com/SpiderLabs/ModSecurity/tree/2cb6344bf8a1f7d564d45d6d6a3745212abdd37f)
+- Build Core Rule Set from [ec00051](https://github.com/coreruleset/coreruleset/tree/ec0005183329f0241a31c8bd136598023d9aa8aa)
+
 ## 4.1.1
 
 Fix incorrect path to modsecurity rules inclusion file

diff --git a/nginx_proxy/Dockerfile b/nginx_proxy/Dockerfile
@@ -12,7 +12,8 @@ ARG PKG_RELEASE
 
 # Setup base
 RUN set -x \
-    && KEY_SHA512="e7fa8303923d9b95db37a77ad46c68fd4755ff935d0a534d26eba83de193c76166c68bfe7f65471bf8881004ef4aa6df3e34689c305662750c0172fca5d8552a *stdin" \
+    && KEY_SHA512="e09fa32f0a0eab2b879ccbbc4d0e4fb9751486eedda75e35fac65802cc9faa266425edf83e261137a2f4d16281ce2c1a5f4502930fe75154723da014214f0655" \
+    && apk upgrade --no-cache \
     && apk add --no-cache \
     geoip \
     libmaxminddb \
@@ -21,8 +22,10 @@ RUN set -x \
     lmdb \
     yajl \
     openssl \
+    pcre \
+    pcre2 \
     && wget -O /tmp/nginx_signing.rsa.pub https://nginx.org/keys/nginx_signing.rsa.pub \
-    && if [ "$(openssl rsa -pubin -in /tmp/nginx_signing.rsa.pub -text -noout | openssl sha512 -r)" = "$KEY_SHA512" ]; then \
+    && if echo "$KEY_SHA512 */tmp/nginx_signing.rsa.pub" | sha512sum -c -; then \
     echo "key verification succeeded!"; \
     mv /tmp/nginx_signing.rsa.pub /etc/apk/keys/; \
     else \

diff --git a/nginx_proxy/build.json b/nginx_proxy/build.json
@@ -1,11 +1,11 @@
 {
   "build_from": {
-    "aarch64": "ghcr.io/home-assistant/aarch64-base:3.14",
-    "amd64": "ghcr.io/home-assistant/amd64-base:3.14"
+    "aarch64": "ghcr.io/home-assistant/aarch64-base:3.18",
+    "amd64": "ghcr.io/home-assistant/amd64-base:3.18"
   },
   "args": {
-    "BUILD_MODSECURITY_VERSION": "1.0.1",
-    "NGINX_VERSION": "1.20.2",
+    "BUILD_MODSECURITY_VERSION": "2.0.0",
+    "NGINX_VERSION": "1.24.0",
     "PKG_RELEASE": "1"
   }
-}
+}