From a02d4ec46fcea5a9e80c0ba64550292a863256d4 Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Thu, 6 May 2021 19:10:40 +1000
Subject: [PATCH] Use certbot from pip instead of apt

---
 docker/Dockerfile          | 8 +++++++-
 docker/rootfs/root/.bashrc | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3e92d10c..b05d4b64 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -20,10 +20,16 @@ ENV SUPPRESS_NO_CONFIG_WARNING=1 \
 
 RUN echo "fs.file-max = 65535" > /etc/sysctl.conf \
 	&& apt-get update \
-	&& apt-get install -y --no-install-recommends certbot jq python3-pip \
+	&& apt-get install -y --no-install-recommends jq python3 python3-pip python3-setuptools libaugeas0 \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/*
 
+# Certbot
+RUN pip3 install --upgrade pip \
+	&& pip install certbot \
+	&& ln -s /usr/local/bin/certbot /usr/bin/certbot \
+	&& echo "Certbot version: $(certbot --version)"
+
 # s6 overlay
 COPY scripts/install-s6 /tmp/install-s6
 RUN /tmp/install-s6 "${TARGETPLATFORM}" && rm -f /tmp/install-s6
diff --git a/docker/rootfs/root/.bashrc b/docker/rootfs/root/.bashrc
index aec8e8f9..0dd0d2d2 100644
--- a/docker/rootfs/root/.bashrc
+++ b/docker/rootfs/root/.bashrc
@@ -16,5 +16,5 @@ alias h='cd ~;clear;'
 
 echo -e -n '\E[1;34m'
 figlet -w 120 "NginxProxyManager"
-echo -e "\E[1;36mVersion \E[1;32m${NPM_BUILD_VERSION:-2.0.0-dev} (${NPM_BUILD_COMMIT:-dev}) ${NPM_BUILD_DATE:-0000-00-00}\E[1;36m, OpenResty \E[1;32m${OPENRESTY_VERSION:-unknown}\E[1;36m, Alpine \E[1;32m${VERSION_ID:-unknown}\E[1;36m, Kernel \E[1;32m$(uname -r)\E[0m"
+echo -e "\E[1;36mVersion \E[1;32m${NPM_BUILD_VERSION:-2.0.0-dev} (${NPM_BUILD_COMMIT:-dev}) ${NPM_BUILD_DATE:-0000-00-00}\E[1;36m, OpenResty \E[1;32m${OPENRESTY_VERSION:-unknown}\E[1;36m, ${ID:-debian} \E[1;32m${VERSION:-unknown}\E[1;36m, Certbot \E[1;32m$(certbot --version)\E[0m"
 echo