Sutty/containers-nginx
5
0
Fork 0
Code Issues Pull requests 1 Projects Releases Wiki Activity

feat: upgrade nginx
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details

Browse source
This commit is contained in:
f 2023-10-17 11:16:37 -03:00
parent ddb5c152b2
commit 53b1edf291
No known key found for this signature in database
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.woodpecker.yml
View file

@ -11,6 +11,7 @@ pipeline:
build_args: build_args:
- "ALPINE_VERSION=${ALPINE_VERSION}" - "ALPINE_VERSION=${ALPINE_VERSION}"
- "ACCESS_LOG_VERSION=${ACCESS_LOG_VERSION}" - "ACCESS_LOG_VERSION=${ACCESS_LOG_VERSION}"
- "NGINX_VERSION=${NGINX_VERSION}"
- "BASE_IMAGE=gitea.nulo.in/sutty/monit" - "BASE_IMAGE=gitea.nulo.in/sutty/monit"
secrets: secrets:
- "DOCKER_PASSWORD" - "DOCKER_PASSWORD"
@ -18,8 +19,10 @@ pipeline:
branch: "antifascista" branch: "antifascista"
event: "push" event: "push"
matrix: matrix:
ALPINE_VERSION: include:
- "3.18.4" - ALPINE_VERSION: "3.18.4"
- "3.17.5" ACCESS_LOG_VERSION: "0.5.5"
ACCESS_LOG_VERSION: NGINX_VERSION: "1.24.0-r7"
- "0.5.5" - ALPINE_VERSION: "3.17.5"
ACCESS_LOG_VERSION: "0.5.5"
NGINX_VERSION: "1.22.1-r1"

3
Dockerfile
View file

@ -3,13 +3,14 @@ ARG BASE_IMAGE=gitea.nulo.in/sutty/monit
FROM ${BASE_IMAGE}:${ALPINE_VERSION} FROM ${BASE_IMAGE}:${ALPINE_VERSION}
MAINTAINER "f <f@sutty.nl>" 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_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" ARG ACCESS_LOG_VERSION="0.5.1"
ENV ACCESS_LOGS_FLAGS=${ACCESS_LOGS_FLAGS} ENV ACCESS_LOGS_FLAGS=${ACCESS_LOGS_FLAGS}
# Install nginx and remove default config # 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 && rm -rf /etc/nginx
# Add ssl group so nginx has access to certificates # Add ssl group so nginx has access to certificates