Interanet/jitsi-meet-deployment
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

jibri: fix downloading new (>= 109) ChromeDriver

Browse Source
This commit is contained in:
Saúl Ibarra Corretgé
2023-01-31 10:52:34 +01:00
parent 8f40804839
commit 076dbf7d17
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jibri/Dockerfile
View File

@@ -18,7 +18,7 @@ ARG CHROMEDRIVER_MAJOR_RELEASE=109
COPY rootfs/ / COPY rootfs/ /
RUN apt-dpkg-wrap apt-get update && \ RUN apt-dpkg-wrap apt-get update && \
apt-dpkg-wrap apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" jibri libgl1-mesa-dri procps jitsi-upload-integrations jq pulseaudio dbus dbus-x11 rtkit && \ apt-dpkg-wrap apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" jibri libgl1-mesa-dri procps jitsi-upload-integrations jq pulseaudio dbus dbus-x11 rtkit unzip && \
/usr/bin/install-chrome.sh && \ /usr/bin/install-chrome.sh && \
apt-cleanup && \ apt-cleanup && \
adduser jibri rtkit adduser jibri rtkit

12
jibri/rootfs/usr/bin/install-chrome.sh
View File

@@ -13,8 +13,10 @@ else
apt-dpkg-wrap apt-get update apt-dpkg-wrap apt-get update
apt-dpkg-wrap apt-get install -y google-chrome-stable apt-dpkg-wrap apt-get install -y google-chrome-stable
else else
curl -4so "/tmp/google-chrome-stable_${CHROME_RELEASE}-1_amd64.deb" "http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_RELEASE}-1_amd64.deb" CHROME_DEB="/tmp/google-chrome-stable_${CHROME_RELEASE}-1_amd64.deb"
apt-dpkg-wrap apt-get install -y "/tmp/google-chrome-stable_${CHROME_RELEASE}-1_amd64.deb" curl -4so ${CHROME_DEB} "http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_RELEASE}-1_amd64.deb"
apt-dpkg-wrap apt-get install -y ${CHROME_DEB}
rm -f ${CHROME_DEB}
fi fi
google-chrome --version google-chrome --version
@@ -25,8 +27,12 @@ else
CHROMEDRIVER_RELEASE="$(curl -4Ls https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${CHROMEDRIVER_MAJOR_RELEASE})" CHROMEDRIVER_RELEASE="$(curl -4Ls https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${CHROMEDRIVER_MAJOR_RELEASE})"
fi fi
curl -4Ls "https://chromedriver.storage.googleapis.com/${CHROMEDRIVER_RELEASE}/chromedriver_linux64.zip" | zcat >> /usr/bin/chromedriver CHROMEDRIVER_ZIP="/tmp/chromedriver_linux64.zip"
curl -4Lso ${CHROMEDRIVER_ZIP} "https://chromedriver.storage.googleapis.com/${CHROMEDRIVER_RELEASE}/chromedriver_linux64.zip"
unzip ${CHROMEDRIVER_ZIP} -d /tmp/chromedriver
mv /tmp/chromedriver/chromedriver /usr/bin/
chmod +x /usr/bin/chromedriver chmod +x /usr/bin/chromedriver
rm -rf /tmp/chromedriver*
fi fi
chromedriver --version chromedriver --version