Merge pull request '1.0.0' (#4) from develop into master

Reviewed-on: #4

Dockerfile

@@ -20,6 +20,7 @@ ENV GENERATE_DHPARAM=true
 ENV TZ=UTC
 ENV PUID=1000
 ENV PGID=1000
+ENV CLOUDFLARE_TOKEN=
 
 #Get required packages
 RUN apk update && apk add curl bash python3 py3-virtualenv procps tzdata nano shadow xz busybox-suid openssl
@@ -40,8 +41,11 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 S6_VERBOSI
 
 RUN python3 -m venv /app/certbot/ && /app/certbot/bin/pip install --upgrade pip
 
-RUN /app/certbot/bin/pip install certbot certbot-dns-cloudflare && \
+#Get required packages for building, build, then cleanup
-    ln -s /app/certbot/bin/certbot /usr/bin/certbot
+RUN apk add --no-cache --virtual .deps gcc python3-dev libc-dev libffi-dev && \
+    /app/certbot/bin/pip install certbot certbot-dns-cloudflare && \
+    ln -s /app/certbot/bin/certbot /usr/bin/certbot &&\
+    apk del .deps
 
 COPY root /
 

README.md

@@ -18,6 +18,7 @@ Dockerised Certbot that utilises cron to schedule creating and renewing SSL cert
 docker run -d --name certbot \
     -e EMAIL=admin@domain.com \
     -e DOMAINS=domain.com \
+    -e CLOUDFLARE_TOKEN=123abc
     -v /docker/certbot-cron:/config \
     git.mrmeeb.stream/mrmeeb/certbot-cron:latest
 ```
@@ -35,6 +36,7 @@ services:
     environment:
       - EMAIL=admin@domain.com
       - DOMAINS=domain.com,*.domain.com
+      - CLOUDFLARE_TOKEN=123abc
 ```
 
 ## Environment Variables:

root/certbot-prepare.sh

@@ -41,7 +41,7 @@ if [ -n "$CLOUDFLARE_TOKEN" ]
 then
     echo "Cloudflare token is present"
 
-    echo "dns_cloudflare_api_token = $CLOUDFLARE_TOKEN" >> /config/.secrets/cloudflare.ini
+    echo "dns_cloudflare_api_token = $CLOUDFLARE_TOKEN" > /config/.secrets/cloudflare.ini
 
 fi
 

root/container-init.sh

@@ -26,6 +26,7 @@ INTERVAL=${INTERVAL}
 STAGING=${STAGING}
 PROPOGATION_TIME=${PROPOGATION_TIME}
 GENERATE_DHPARAM=${GENERATE_DHPARAM}
+CLOUDFLARE_TOKEN=${CLOUDFLARE_TOKEN}
 ----------------------------------------------------------------------
 "