Install and build openssl

Updated golang to 1.19.7

docker/Dockerfile

@@ -2,11 +2,12 @@
 # Nginx Builder
 #############
 
-FROM debian:buster-slim as nginxbuilder
+FROM debian:bullseye-slim as nginxbuilder
 
 ARG OPENRESTY_VERSION
 ARG LUA_VERSION
 ARG LUAROCKS_VERSION
+ARG OPENSSL_VERSION
 
 RUN apt-get update \
 	&& apt-get install -y \
@@ -16,7 +17,7 @@ RUN apt-get update \
 	libpcre3-dev \
 	libreadline-dev \
 	libssl-dev \
-	openssl unzip \
+	unzip \
 	wget \
 	zlib1g-dev \
 	git
@@ -25,7 +26,9 @@ RUN apt-get update \
 COPY ./scripts/build-lua /tmp/build-lua
 RUN /tmp/build-lua
 
-# Nginx build
+# Build packages
+COPY ./scripts/install-openssl /tmp/install-openssl
+RUN /tmp/install-openssl
 COPY ./scripts/build-openresty /tmp/build-openresty
 RUN /tmp/build-openresty
 
@@ -33,13 +36,13 @@ RUN /tmp/build-openresty
 # Final Image
 #############
 
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 LABEL maintainer="Jamie Curnow <jc@jc21.com>"
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 ARG TARGETPLATFORM
-RUN echo "Base: debian:buster-slim, ${TARGETPLATFORM:-linux/amd64}" > /built-for-arch
+RUN echo "Base: debian:bullseye-slim, ${TARGETPLATFORM:-linux/amd64}" > /built-for-arch
 
 # OpenResty uses LuaJIT which has a dependency on GCC
 RUN apt-get update \
@@ -48,11 +51,13 @@ RUN apt-get update \
 	ca-certificates \
 	curl \
 	figlet \
+	gcc \
 	jq \
 	libncurses6 \
 	libpcre3 \
-	libreadline7 \
-	openssl \
+	libreadline8 \
+	libc6-dev \
+	make \
 	perl \
 	tzdata \
 	unzip \
@@ -66,6 +71,11 @@ 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
@@ -80,16 +90,17 @@ 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 \
+	&& apt-get remove -y make gcc git wget gettext libc6-dev \
 	&& 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.6 as go
+FROM golang:1.19.7 as go
 FROM nginxproxymanager/nginx-full:${ACMESH_BASE_TAG:-acmesh}
 LABEL maintainer="Jamie Curnow <jc@jc21.com>"
 

docker/Dockerfile.certbot

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