Revert "Install and build openssl"

This reverts commit 8da6844.

Author: jc21

.jenkins/Jenkinsfile

@@ -19,7 +19,6 @@ pipeline {
 		CROWDSEC_OPENRESTY_BOUNCER_VERSION = '0.1.7'
 		LUA_VERSION       = '5.1.5'
 		LUAROCKS_VERSION  = '3.3.1'
-		OPENSSL_VERSION   = '1.1.1t'
 	}
 	stages {
 		stage('Environment') {

docker/Dockerfile

@@ -2,12 +2,11 @@
 # Nginx Builder
 #############
 
-FROM debian:bullseye-slim as nginxbuilder
+FROM debian:buster-slim as nginxbuilder
 
 ARG OPENRESTY_VERSION
 ARG LUA_VERSION
 ARG LUAROCKS_VERSION
-ARG OPENSSL_VERSION
 
 RUN apt-get update \
 	&& apt-get install -y \
@@ -17,7 +16,7 @@ RUN apt-get update \
 	libpcre3-dev \
 	libreadline-dev \
 	libssl-dev \
-	unzip \
+	openssl unzip \
 	wget \
 	zlib1g-dev \
 	git
@@ -26,23 +25,21 @@ RUN apt-get update \
 COPY ./scripts/build-lua /tmp/build-lua
 RUN /tmp/build-lua
 
-# Build packages
-COPY ./scripts/install-openssl /tmp/install-openssl
-RUN /tmp/install-openssl
+# Nginx build
 COPY ./scripts/build-openresty /tmp/build-openresty
 RUN /tmp/build-openresty
 
 #############
 # Final Image
 #############
 
-FROM debian:bullseye-slim
+FROM debian:buster-slim
 LABEL maintainer="Jamie Curnow <[email protected]>"
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 ARG TARGETPLATFORM
-RUN echo "Base: debian:bullseye-slim, ${TARGETPLATFORM:-linux/amd64}" > /built-for-arch
+RUN echo "Base: debian:buster-slim, ${TARGETPLATFORM:-linux/amd64}" > /built-for-arch
 
 # OpenResty uses LuaJIT which has a dependency on GCC
 RUN apt-get update \
@@ -51,13 +48,11 @@ RUN apt-get update \
 	ca-certificates \
 	curl \
 	figlet \
-	gcc \
 	jq \
 	libncurses6 \
 	libpcre3 \
-	libreadline8 \
-	libc6-dev \
-	make \
+	libreadline7 \
+	openssl \
 	perl \
 	tzdata \
 	unzip \
@@ -71,11 +66,6 @@ RUN apt-get update \
 
 COPY ./files/.bashrc /root/.bashrc
 
-# build and install openssl
-ARG OPENSSL_VERSION
-COPY ./scripts/install-openssl /tmp/install-openssl
-RUN /tmp/install-openssl
-
 # Copy lua and luarocks builds from first image
 COPY --from=nginxbuilder /tmp/lua /tmp/lua
 COPY --from=nginxbuilder /tmp/luarocks /tmp/luarocks
@@ -90,17 +80,16 @@ COPY ./scripts/install-crowdsec_openresty_bouncer /tmp/install-crowdsec_openrest
 
 ARG OPENRESTY_VERSION
 ARG CROWDSEC_OPENRESTY_BOUNCER_VERSION
-
 ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt \
 	OPENRESTY_VERSION=${OPENRESTY_VERSION} \
-	OPENSSL_VERSION=${OPENSSL_VERSION} \
 	CROWDSEC_OPENRESTY_BOUNCER_VERSION=${CROWDSEC_OPENRESTY_BOUNCER_VERSION}
 
 # Install openresty, lua, then clean up file system
 RUN apt-get update \
+	&& apt-get install -y gcc make socat git \
 	&& /tmp/install-lua \
 	&& /tmp/install-openresty \
-	&& apt-get remove -y make gcc git wget gettext libc6-dev \
+	&& apt-get remove -y make gcc git wget gettext \
 	&& apt-get autoremove -y \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/* \

docker/Dockerfile.acmesh-golang

@@ -1,4 +1,4 @@
-FROM golang:1.19.7 as go
+FROM golang:1.19.6 as go
 FROM nginxproxymanager/nginx-full:${ACMESH_BASE_TAG:-acmesh}
 LABEL maintainer="Jamie Curnow <[email protected]>"
 

docker/Dockerfile.certbot

@@ -2,7 +2,7 @@
 # Certbot Builder
 #############
 
-FROM debian:bullseye-slim as certbotbuilder
+FROM debian:buster-slim as certbotbuilder
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 

local-build.sh

@@ -0,0 +1,57 @@
+#!/bin/bash -e
+
+BLUE='\E[1;34m'
+CYAN='\E[1;36m'
+YELLOW='\E[1;33m'
+GREEN='\E[1;32m'
+RESET='\E[0m'
+
+DOCKER_IMAGE=nginxproxymanager/nginx-full
+
+export OPENRESTY_VERSION=1.21.4.1
+export CROWDSEC_OPENRESTY_BOUNCER_VERSION=0.1.7
+export LUA_VERSION=5.1.5
+export LUAROCKS_VERSION=3.3.1
+
+# Builds
+
+echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}latest ${CYAN}...${RESET}"
+docker build \
+	--pull \
+	--build-arg OPENRESTY_VERSION \
+	--build-arg CROWDSEC_OPENRESTY_BOUNCER_VERSION \
+	--build-arg LUA_VERSION \
+	--build-arg LUAROCKS_VERSION \
+	-t ${DOCKER_IMAGE}:latest \
+	-f docker/Dockerfile \
+	.
+
+echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}acmesh ${CYAN}...${RESET}"
+docker build \
+	--build-arg BASE_TAG=latest \
+	-t ${DOCKER_IMAGE}:acmesh \
+	-f docker/Dockerfile.acmesh \
+	.
+
+echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}certbot ${CYAN}...${RESET}"
+docker build \
+	--build-arg BASE_TAG=latest \
+	-t ${DOCKER_IMAGE}:certbot \
+	-f docker/Dockerfile.certbot \
+	.
+
+echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}acmesh-golang ${CYAN}...${RESET}"
+docker build \
+	--build-arg BASE_TAG=acmesh \
+	-t ${DOCKER_IMAGE}:acmesh-golang \
+	-f docker/Dockerfile.acmesh-golang \
+	.
+
+echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}certbot-node ${CYAN}...${RESET}"
+docker build \
+	--build-arg BASE_TAG=certbot \
+	-t ${DOCKER_IMAGE}:certbot-node \
+	-f docker/Dockerfile.certbot-node \
+	.
+
+echo -e "${BLUE}❯ ${GREEN}All done!${RESET}"

scripts/buildx

@@ -19,15 +19,13 @@ docker buildx build \
 	--platform linux/amd64,linux/arm64,linux/arm/7 \
 	--progress plain \
 	--pull \
-	--no-cache \
 	--build-arg BASE_TAG \
 	--build-arg ACMESH_BASE_TAG \
 	--build-arg CERTBOT_BASE_TAG \
 	--build-arg OPENRESTY_VERSION \
 	--build-arg LUA_VERSION \
 	--build-arg LUAROCKS_VERSION \
 	--build-arg CROWDSEC_OPENRESTY_BOUNCER_VERSION \
-	--build-arg OPENSSL_VERSION \
 	$@ \
 	.