From 53b1edf29164654481249fdd45ced34d2d1e736a Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Tue, 17 Oct 2023 11:16:37 -0300
Subject: [PATCH] feat: upgrade nginx

---
 .woodpecker.yml | 13 ++++++++-----
 Dockerfile      |  3 ++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 830adbc..a8a78da 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -11,6 +11,7 @@ pipeline:
       build_args:
       - "ALPINE_VERSION=${ALPINE_VERSION}"
       - "ACCESS_LOG_VERSION=${ACCESS_LOG_VERSION}"
+      - "NGINX_VERSION=${NGINX_VERSION}"
       - "BASE_IMAGE=gitea.nulo.in/sutty/monit"
     secrets:
     - "DOCKER_PASSWORD"
@@ -18,8 +19,10 @@ pipeline:
       branch: "antifascista"
       event: "push"
 matrix:
-  ALPINE_VERSION:
-  - "3.18.4"
-  - "3.17.5"
-  ACCESS_LOG_VERSION:
-  - "0.5.5"
+  include:
+  - ALPINE_VERSION: "3.18.4"
+    ACCESS_LOG_VERSION: "0.5.5"
+    NGINX_VERSION: "1.24.0-r7"
+  - ALPINE_VERSION: "3.17.5"
+    ACCESS_LOG_VERSION: "0.5.5"
+    NGINX_VERSION: "1.22.1-r1"
diff --git a/Dockerfile b/Dockerfile
index 791dd88..f2545f2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,13 +3,14 @@ ARG BASE_IMAGE=gitea.nulo.in/sutty/monit
 FROM ${BASE_IMAGE}:${ALPINE_VERSION}
 MAINTAINER "f <f@sutty.nl>"
 
+ARG NGINX_VERSION="1.24.0-r7"
 ARG ACCESS_LOGS_FLAGS="--database=sqlite3:///var/log/access_log.sqlite3 -c /usr/share/crawler-user-agents/crawler-user-agents.json"
 ARG ACCESS_LOG_VERSION="0.5.1"
 
 ENV ACCESS_LOGS_FLAGS=${ACCESS_LOGS_FLAGS}
 
 # Install nginx and remove default config
-RUN apk add --no-cache nginx daemonize access_log~${ACCESS_LOG_VERSION} nginx-prometheus-exporter geoip2-database-country geoip2-database-city crawler-user-agents \
+RUN apk add --no-cache nginx~${NGINX_VERSION} daemonize access_log~${ACCESS_LOG_VERSION} nginx-prometheus-exporter geoip2-database-country geoip2-database-city crawler-user-agents \
     && rm -rf /etc/nginx
 
 # Add ssl group so nginx has access to certificates