Pin comskip to commit and enable renovate (#42)

# Proposed Changes Pin comskip and enable renovate for it
dfigus · Dec 29, 2023 · 25baa1f · 25baa1f
2 parents 2f583ba + 757d767
commit 25baa1f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/renovate.json b/renovate.json
@@ -34,6 +34,15 @@
       "packageNameTemplate": "https://github.com/tvheadend/tvheadend/",
       "datasourceTemplate": "git-refs"
     },
+    {
+      "fileMatch": ["/Dockerfile$"],
+      "matchStringsStrategy": "any",
+      "matchStrings": ["ARG COMSKIP_COMMIT=\"(?<currentDigest>.*?)\"\\n"],
+      "currentValueTemplate": "master",
+      "depNameTemplate": "comskip",
+      "packageNameTemplate": "https://github.com/erikkaashoek/Comskip/",
+      "datasourceTemplate": "git-refs"
+    },
     {
       "fileMatch": ["/Dockerfile$"],
       "matchStringsStrategy": "any",
@@ -47,6 +56,10 @@
       "matchDepNames": ["tvheadend"],
       "automerge": false
     },
+    {
+      "matchDepNames": ["comskip"],
+      "automerge": false
+    },
     {
       "matchDatasources": ["github-releases"],
       "automerge": false,

diff --git a/tvheadend/Dockerfile b/tvheadend/Dockerfile
@@ -5,10 +5,12 @@ FROM alpine:3.19 AS builder
 
 # package versions
 ARG ARGTABLE_VER="2.13"
+ARG TVHEADEND_COMMIT="fd8b9e8ba21600d0bf6cdb20a7cc153482a2efa5"
+ARG COMSKIP_COMMIT="d0cc422362e188fbbdb3b079fea8ce8dc2a7f7dd"
 
 # environment settings
 ARG TZ="Etc/UTC"
-ARG TVHEADEND_COMMIT="fd8b9e8ba21600d0bf6cdb20a7cc153482a2efa5"
+
 ENV HOME="/config"
 
 COPY argtable2_config/ /tmp/argtable2_config/
@@ -134,6 +136,7 @@ RUN \
     echo "***** compile comskip ****" && \
     git clone https://github.com/erikkaashoek/Comskip /tmp/comskip && \
     cd /tmp/comskip && \
+    git checkout "${COMSKIP_COMMIT}" && \
     ./autogen.sh && \
     ./configure \
     --bindir=/usr/bin \