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

Compare commits

base: Sutty:a051c852370087cebb11bf9698f46851c28acf8a
Branches Tags
Sutty:antifascista
Sutty:qualified
Sutty:args-default-actualizados
..
compare: Sutty:66e10a7635ec1cfb776af6dd7e364941e12ef7ae
Branches Tags
Sutty:antifascista
Sutty:qualified
Sutty:args-default-actualizados

No commits in common. "a051c852370087cebb11bf9698f46851c28acf8a" and "66e10a7635ec1cfb776af6dd7e364941e12ef7ae" have entirely different histories.
a051c85237 ... 66e10a7635

2 changed files with 1 additions and 5 deletions
Show stats Expand all files Collapse all files

2
.woodpecker.yml
View file

@ -13,7 +13,6 @@ steps:
- "ACCESS_LOG_VERSION=${ACCESS_LOG_VERSION}" - "ACCESS_LOG_VERSION=${ACCESS_LOG_VERSION}"
- "NGINX_VERSION=${NGINX_VERSION}" - "NGINX_VERSION=${NGINX_VERSION}"
- "BASE_IMAGE=gitea.nulo.in/sutty/monit" - "BASE_IMAGE=gitea.nulo.in/sutty/monit"
- "EXTRA_PACKAGES="
password: password:
from_secret: "DOCKER_PASSWORD" from_secret: "DOCKER_PASSWORD"
when: when:
@ -24,7 +23,6 @@ matrix:
- ALPINE_VERSION: "3.20.3" - ALPINE_VERSION: "3.20.3"
ACCESS_LOG_VERSION: "0.5.8" ACCESS_LOG_VERSION: "0.5.8"
NGINX_VERSION: "1.26.2-r0" NGINX_VERSION: "1.26.2-r0"
EXTRA_PACKAGES: "nginx-mod-http-modsecurity coreruleset"
- ALPINE_VERSION: "3.19.4" - ALPINE_VERSION: "3.19.4"
ACCESS_LOG_VERSION: "0.5.8" ACCESS_LOG_VERSION: "0.5.8"
NGINX_VERSION: "1.24.0-r16" NGINX_VERSION: "1.24.0-r16"

4
Dockerfile
View file

@ -6,7 +6,6 @@ LABEL org.opencontainers.image.authors="f@sutty.nl"
ARG NGINX_VERSION="1.24.0-r7" 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.6" ARG ACCESS_LOG_VERSION="0.5.6"
ARG EXTRA_PACKAGES
ENV ACCESS_LOGS_FLAGS=${ACCESS_LOGS_FLAGS} ENV ACCESS_LOGS_FLAGS=${ACCESS_LOGS_FLAGS}
@ -25,7 +24,7 @@ COPY --chown=nginx:nginx ./nginx /etc/nginx
COPY ./access_log.sqlite3 /var/lib/access_log.sqlite3 COPY ./access_log.sqlite3 /var/lib/access_log.sqlite3
# Install modules after rewriting /etc/nginx # Install modules after rewriting /etc/nginx
RUN apk add --no-cache nginx-mod-http-brotli nginx-mod-http-geoip2 ${EXTRA_PACKAGES} RUN apk add --no-cache nginx-mod-http-brotli nginx-mod-http-geoip2 nginx-mod-http-naxsi
# Add support for request_uri parsing if access_log >= 0.3.0 # Add support for request_uri parsing if access_log >= 0.3.0
RUN mv /etc/nginx/access_logd_`access_log -v`.conf /etc/nginx/access_logd.conf RUN mv /etc/nginx/access_logd_`access_log -v`.conf /etc/nginx/access_logd.conf
@ -37,7 +36,6 @@ RUN chown nginx:nginx /var/lib/access_log.sqlite3
VOLUME /etc/nginx/sites VOLUME /etc/nginx/sites
VOLUME /etc/letsencrypt VOLUME /etc/letsencrypt
VOLUME /var/lib/letsencrypt VOLUME /var/lib/letsencrypt
VOLUME /var/log
EXPOSE 80 EXPOSE 80
EXPOSE 443 EXPOSE 443