Merge branch 'master' into master

Author: LePresidente

.jenkins/Jenkinsfile

@@ -1,6 +1,6 @@
 pipeline {
 	triggers {
-		cron('H 3 * * *')
+		cron( env.BRANCH_NAME.equals('master') ? 'H 3 * * *' : '')
 	}
 	agent {
 		label 'docker-multiarch'
@@ -15,8 +15,9 @@ pipeline {
 		BUILDX_NAME  = "${IMAGE}_${GIT_BRANCH}"
 		BRANCH_LOWER = "${BRANCH_NAME.toLowerCase().replaceAll('/', '-')}"
 		// Software versions; OpenResty does not support Lua >= 5.2
-		OPENRESTY_VERSION = '1.19.9.1'
+		OPENRESTY_VERSION = '1.21.4.1'
 		CROWDSEC_OPENRESTY_BOUNCER_VERSION = '0.1.11'
+
 		LUA_VERSION       = '5.1.5'
 		LUAROCKS_VERSION  = '3.3.1'
 	}
@@ -36,6 +37,7 @@ pipeline {
 							env.BUILDX_PUSH_TAGS_ACMESH_GOLANG = "-t docker.io/nginxproxymanager/${IMAGE}:acmesh-golang"
 							env.BUILDX_PUSH_TAGS_CERTBOT_NODE  = "-t docker.io/nginxproxymanager/${IMAGE}:certbot-node"
 						}
+						sh 'env'
 					}
 				}
 				stage('Other') {

README.md

@@ -1,7 +1,7 @@
 # nginx-full
 
 <p>
-  <img src="https://img.shields.io/badge/openresty-1.19.9.1-green.svg?style=for-the-badge">
+  <img src="https://img.shields.io/badge/openresty-1.21.4.1-green.svg?style=for-the-badge">
   <img src="https://img.shields.io/badge/lua-5.1.5-green.svg?style=for-the-badge">
   <img src="https://img.shields.io/badge/luarocks-3.3.1-green.svg?style=for-the-badge">
   <a href="https://hub.docker.com/repository/docker/nginxproxymanager/nginx-full">

docker/Dockerfile.acmesh-golang

@@ -33,6 +33,7 @@ COPY ./files/.bashrc.acmesh-golang /root/.bashrc
 RUN cd /usr && wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.50.1
 RUN go install github.com/kyoh86/richgo@latest \
 	&& go install github.com/sonatype-nexus-community/nancy@latest \
+	&& go install github.com/mfridman/tparse@latest \
 	&& rm -rf /root/.cache/go-build
 
 LABEL org.label-schema.cmd="docker run --rm -ti nginxproxymanager/nginx-full:acmesh-golang"

local-build.sh

@@ -8,7 +8,7 @@ RESET='\E[0m'
 
 DOCKER_IMAGE=nginxproxymanager/nginx-full
 
-export OPENRESTY_VERSION=1.19.9.1
+export OPENRESTY_VERSION=1.21.4.1
 export CROWDSEC_OPENRESTY_BOUNCER_VERSION=0.1.11
 export LUA_VERSION=5.1.5
 export LUAROCKS_VERSION=3.3.1