Merge pull request '1.1.0' (#5) from develop into master

Reviewed-on: #5

.goreleaser-gitea.yaml

@@ -1,21 +1,14 @@
 
 dist: dist-gitea
 
-builds:
-- skip: true
+build:
+  skip: true
 
 archives:
 - format: binary
 
 release:
   draft: true
-
-  header: |
-    # Certbot Cron v{{ .Tag }}
-
-    ## Docker Image:
-    `git.mrmeeb.stream/mrmeeb/certbot-cron:{{ .Tag }}`
-
   gitea:
     owner: MrMeeb
     name: certbot-cron-docker

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.19.1 as base
+FROM alpine:latest as base
 ARG TARGETARCH
 
 FROM base AS base-amd64
@@ -9,7 +9,7 @@ ENV S6_OVERLAY_ARCH=aarch64
 
 FROM base-${TARGETARCH}${TARGETVARIANT}
 
-ARG S6_OVERLAY_VERSION="3.1.6.2"
+ARG S6_OVERLAY_VERSION=3.1.5.0
 
 # Core variables
 ENV PUID=1000
@@ -17,7 +17,6 @@ ENV PGID=1000
 ENV TZ=UTC
 ENV GENERATE_DHPARAM=true
 ENV INTERVAL="0 */6 * * *"
-ENV ONE_SHOT=false
 
 # Single domain
 ENV DOMAINS=
@@ -56,12 +55,8 @@ 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
 
 #Get required packages for building, build, then cleanup
-#Added additional pip steps to fix cython 3.0.0 issue - https://github.com/yaml/pyyaml/issues/601
-COPY requirements.txt /app/certbot/requirements.txt
 RUN apk add --no-cache --virtual .deps gcc python3-dev libc-dev libffi-dev && \
-    /app/certbot/bin/pip install wheel && \
-    /app/certbot/bin/pip install "Cython<3.0" pyyaml --no-build-isolation && \
-    /app/certbot/bin/pip install -r /app/certbot/requirements.txt && \
+    /app/certbot/bin/pip install certbot certbot-dns-cloudflare && \
     ln -s /app/certbot/bin/certbot /usr/bin/certbot &&\
     apk del .deps
 
@@ -70,7 +65,6 @@ COPY root /
 RUN chmod +x /container-init.sh && \
     chmod +x /certbot-prepare.sh && \
     chmod +x /certbot-renew.sh && \
-    chmod +x /check-one-shot.sh && \
     chown -R ${PUID}:${PGID} /app /config
 
 ENTRYPOINT [ "/init" ]

README.md

@@ -52,10 +52,9 @@ Core options to the container
 |PUID    |int    |1000   |Sets the UID of the user certbot runs under |
 |PGID    |int    |1000   |Sets the GID of the user certbot runs under |
 |TZ      |[List of valid TZs](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List)    |UTC    |Sets the timezone of the container |
-| ONE_SHOT | false | Whether container exits after first run of certbot, or starts cron-based auto-renewal |
 | GENERATE_DHPARAM | true (case-sensitive) | Generate Diffie-Hellman keys in /config/letsencrypt/keys |
 | INTERVAL | 0 */6 * * * | How often certbot attempts to renew the certificate. Cron syntax |
-| CERT_COUNT | 1 | How many certificates certbot will try to issue. [Details here](https://git.mrmeeb.stream/MrMeeb/certbot-cron-docker#multiple-certificates) |
+| CERT_COUNT | 1 | How many certificates certbot will try to issue (more than 1 not yet implemented) |
 
 ### Certificate Options
 

renovate.json

@@ -1,28 +0,0 @@
-{
-    "extends": [":automergeMinor", ":automergePr", ":automergeRequireAllStatusChecks", ":dependencyDashboard", ":disableRateLimiting", ":rebaseStalePrs"],
-    "baseBranches": ["main"],
-    "major": {
-        "dependencyDashboardApproval": true
-    },
-    "customManagers": [
-        {
-        "customType": "regex",
-        "fileMatch": ["Dockerfile"],
-        "matchStrings": ["ARG S6_OVERLAY_VERSION=[\"](?<currentValue>.*)[\"]"],
-        "datasourceTemplate": "github-releases",
-        "depNameTemplate": "just-containers/s6-overlay"
-        }
-    ],
-    "packageRules": [
-        {
-        "matchDatasources": ["github-releases"],
-        "matchDepNames": ["just-containers/s6-overlay"],
-        "extractVersion": "^v(?<version>.*)$",
-        "versioning": "loose"
-        },
-        {
-        "matchPackagePatterns": ["certbot"],
-        "groupName": "certbot"
-        }
-    ]
-}

requirements.txt

@@ -1,4 +0,0 @@
-# For pinning Certbot packages to then be parsed by Renovate
-
-certbot ==2.9.0
-certbot-dns-cloudflare ==2.9.0

root/certbot-prepare.sh

@@ -756,24 +756,13 @@ fi
 
 if [ $GENERATE_DHPARAM = true ] && [ ! -s /config/letsencrypt/keys/ssl-dhparams.pem ]
 then
-    echo ""
     echo "Generating Diffie-Hellman keys, saved to /config/letsencrypt/keys. This can take a long time!"
     openssl dhparam -out /config/letsencrypt/keys/ssl-dhparams.pem 4096
 fi
 
-if [ $ONE_SHOT == "true" ]; then
+echo "$INTERVAL /certbot-renew.sh >> /config/logs/renew.log" > /config/.crontab.txt
 
-    echo ""
+echo ""
 
-    echo "ONE_SHOT is true - exiting container"
-
-elif [ $ONE_SHOT == "false" ]; then
-
-    echo "$INTERVAL /certbot-renew.sh >> /config/logs/renew.log" > /config/.crontab.txt
-
-    echo ""
-
-    echo "Starting automatic renewal job. Schedule is $INTERVAL"
-    crontab /config/.crontab.txt
-
-fi
+echo "Starting automatic renewal job. Schedule is $INTERVAL"
+crontab /config/.crontab.txt

root/check-one-shot.sh

@@ -1,9 +0,0 @@
-#!/command/with-contenv bash
-# shellcheck shell=bash
-
-if [ $ONE_SHOT == "true" ]; then
-
-    # Cleanly kill container by sending kill signal to supervisor process
-    kill 1
-
-fi

root/container-init.sh

@@ -28,7 +28,6 @@ echo \
 "PUID=${PUID}
 PGID=${PGID}
 TZ=${TZ}
-ONE_SHOT=${ONE_SHOT}
 INTERVAL=${INTERVAL}
 GENERATE_DHPARAM=${GENERATE_DHPARAM}
 CERT_COUNT=${CERT_COUNT}"

root/etc/s6-overlay/s6-rc.d/check-one-shot/type

@@ -1 +0,0 @@
-oneshot

root/etc/s6-overlay/s6-rc.d/check-one-shot/up

@@ -1 +0,0 @@
-exec /check-one-shot.sh