From a76b1f4b4a1c525d5b175815bcd1983ac542579e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Tue, 12 Sep 2023 09:24:05 +0200
Subject: [PATCH] jibri: simplify ChromeDriver download

---
 jibri/Dockerfile                       | 3 +--
 jibri/rootfs/usr/bin/install-chrome.sh | 9 ++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/jibri/Dockerfile b/jibri/Dockerfile
index e8da8cf..52f8698 100644
--- a/jibri/Dockerfile
+++ b/jibri/Dockerfile
@@ -11,9 +11,8 @@ LABEL org.opencontainers.image.documentation="https://jitsi.github.io/handbook/"
 ARG TARGETPLATFORM
 ARG USE_CHROMIUM=0
 #ARG CHROME_RELEASE=latest
-#ARG CHROMEDRIVER_MAJOR_RELEASE=latest
+# https://googlechromelabs.github.io/chrome-for-testing/
 ARG CHROME_RELEASE=116.0.5845.96
-ARG CHROMEDRIVER_MAJOR_RELEASE=116
 
 COPY rootfs/ /
 
diff --git a/jibri/rootfs/usr/bin/install-chrome.sh b/jibri/rootfs/usr/bin/install-chrome.sh
index 0fb6564..6665d06 100755
--- a/jibri/rootfs/usr/bin/install-chrome.sh
+++ b/jibri/rootfs/usr/bin/install-chrome.sh
@@ -21,10 +21,13 @@ else
 
     google-chrome --version
 
-    if [ "${CHROMEDRIVER_MAJOR_RELEASE}" = "latest" ]; then
-        CHROMEDRIVER_RELEASE="$(curl -4Ls https://googlechromelabs.github.io/chrome-for-testing/LATEST_RELEASE_STABLE)"
+    BASE_URL=https://googlechromelabs.github.io/chrome-for-testing
+
+    if [ "${CHROME_RELEASE}" = "latest" ]; then
+        CHROMEDRIVER_RELEASE="$(curl -4Ls ${BASE_URL}/LATEST_RELEASE_STABLE)"
     else
-        CHROMEDRIVER_RELEASE="$(curl -4Ls https://googlechromelabs.github.io/chrome-for-testing/LATEST_RELEASE_${CHROMEDRIVER_MAJOR_RELEASE})"
+        CHROMEDRIVER_MAJOR_RELEASE=$(echo $CHROME_RELEASE | cut -d. -f1)
+        CHROMEDRIVER_RELEASE="$(curl -4Ls ${BASE_URL}/LATEST_RELEASE_${CHROMEDRIVER_MAJOR_RELEASE})"
     fi
 
     CHROMEDRIVER_ZIP="/tmp/chromedriver_linux64.zip"