feat: upgrade nginx
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
This commit is contained in:
parent
ddb5c152b2
commit
53b1edf291
2 changed files with 10 additions and 6 deletions
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue