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

jibri: simplify Dockerfile

Browse Source 
Slightly reduce layer count by running everything in a single RUN.

Also reduce build time by skipping some unneeded apt update / cleanups.
This commit is contained in:
Saúl Ibarra Corretgé
2022-06-13 21:59:02 +02:00
parent 7e743086fb
commit e7533f8639
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jibri/Dockerfile
View File

@@ -8,20 +8,18 @@ LABEL org.opencontainers.image.url="https://github.com/jitsi/jibri"
LABEL org.opencontainers.image.source="https://github.com/jitsi/docker-jitsi-meet" LABEL org.opencontainers.image.source="https://github.com/jitsi/docker-jitsi-meet"
LABEL org.opencontainers.image.documentation="https://jitsi.github.io/handbook/" LABEL org.opencontainers.image.documentation="https://jitsi.github.io/handbook/"
RUN apt-dpkg-wrap apt-get update && \
apt-dpkg-wrap apt-get install -y jibri libgl1-mesa-dri procps jitsi-upload-integrations jq && \
apt-cleanup
ARG TARGETPLATFORM ARG TARGETPLATFORM
ARG USE_CHROMIUM=0 ARG USE_CHROMIUM=0
#ARG CHROME_RELEASE=latest #ARG CHROME_RELEASE=latest
#ARG CHROMEDRIVER_MAJOR_RELEASE=latest #ARG CHROMEDRIVER_MAJOR_RELEASE=latest
ARG CHROME_RELEASE=102.0.5005.61 ARG CHROME_RELEASE=102.0.5005.61
ARG CHROMEDRIVER_MAJOR_RELEASE=102 ARG CHROMEDRIVER_MAJOR_RELEASE=102
COPY build/install-chrome.sh /install-chrome.sh
RUN /install-chrome.sh && \
rm /install-chrome.sh
COPY rootfs/ / COPY rootfs/ /
RUN apt-dpkg-wrap apt-get update && \
apt-dpkg-wrap apt-get install -y jibri libgl1-mesa-dri procps jitsi-upload-integrations jq && \
/usr/bin/install-chrome.sh && \
apt-cleanup
VOLUME /config VOLUME /config

5
jibri/build/install-chrome.sh → jibri/rootfs/usr/bin/install-chrome.sh
View File

@@ -4,9 +4,7 @@ set -o pipefail -xeu
if [ "${USE_CHROMIUM}" = 1 -o "${TARGETPLATFORM}" = "linux/arm64" ]; then if [ "${USE_CHROMIUM}" = 1 -o "${TARGETPLATFORM}" = "linux/arm64" ]; then
echo "Using Debian's Chromium" echo "Using Debian's Chromium"
apt-dpkg-wrap apt-get update
apt-dpkg-wrap apt-get install -y chromium chromium-driver chromium-sandbox apt-dpkg-wrap apt-get install -y chromium chromium-driver chromium-sandbox
apt-cleanup
chromium --version chromium --version
else else
if [ "${CHROME_RELEASE}" = "latest" ]; then if [ "${CHROME_RELEASE}" = "latest" ]; then
@@ -14,12 +12,9 @@ else
echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list
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
apt-cleanup
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" 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"
apt-dpkg-wrap apt-get update
apt-dpkg-wrap apt-get install -y "/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"
apt-cleanup
fi fi
google-chrome --version google-chrome --version