Merge branch 'automation' into develop

.gitea/workflows/build-develop.yaml

@@ -75,7 +75,7 @@ jobs:
 
   "Notify":
     runs-on: [ubuntu-docker-latest, linux/amd64]
-    needs: ["Build Image", "Validate Image"]
+    needs: ["Validate Image", "Publish Image"]
     steps:
       - name: Notify of success
         uses: rjstone/discord-webhook-notify@v1

.gitea/workflows/build-main.yaml

@@ -75,7 +75,11 @@ jobs:
 
   "Notify":
     runs-on: [ubuntu-docker-latest, linux/amd64]
+<<<<<<< HEAD
     needs: ["Build Image", "Validate Image"]
+=======
+    needs: ["Validate Image", "Publish Image"]
+>>>>>>> automation
     steps:
       - name: Notify of success
         uses: rjstone/discord-webhook-notify@v1

.goreleaser-gitea.yaml

@@ -1,14 +1,21 @@
 
 dist: dist-gitea
 
-build:
+builds:
-  skip: true
+- 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:latest as base
+FROM alpine:3.19.1 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.5.0
+ARG S6_OVERLAY_VERSION="3.1.6.2"
 
 # Core variables
 ENV PUID=1000
@@ -57,10 +57,11 @@ 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 certbot certbot-dns-cloudflare && \
+    /app/certbot/bin/pip install -r /app/certbot/requirements.txt && \
     ln -s /app/certbot/bin/certbot /usr/bin/certbot &&\
     apk del .deps
 

README.md

@@ -1,7 +1,5 @@
 # Certbot Cron Docker
 
-![Drone (self-hosted) with branch](https://img.shields.io/drone/build/MrMeeb/certbot-cron-docker/master?label=latest&server=https%3A%2F%2Fdrone.mrmeeb.stream&style=for-the-badge) ![Drone (self-hosted) with branch](https://img.shields.io/drone/build/MrMeeb/certbot-cron-docker/develop?label=develop&server=https%3A%2F%2Fdrone.mrmeeb.stream&style=for-the-badge)
-
 Dockerised Certbot that utilises cron to schedule creating and renewing SSL certificates. Supports standalone, webroot or Cloudflare methods. Automatic renewal attempt happens every 6 hours by default.
 
 ## Tags

renovate.json

@@ -0,0 +1,28 @@
+{
+    "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

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