mirror of
https://github.com/jitsi/docker-jitsi-meet.git
synced 2026-04-02 15:51:05 +02:00
jibri: simplify Dockerfile
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:
parent
7e743086fb
commit
e7533f8639
@ -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.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 USE_CHROMIUM=0
|
||||
#ARG CHROME_RELEASE=latest
|
||||
#ARG CHROMEDRIVER_MAJOR_RELEASE=latest
|
||||
ARG CHROME_RELEASE=102.0.5005.61
|
||||
ARG CHROMEDRIVER_MAJOR_RELEASE=102
|
||||
COPY build/install-chrome.sh /install-chrome.sh
|
||||
RUN /install-chrome.sh && \
|
||||
rm /install-chrome.sh
|
||||
|
||||
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
|
||||
|
||||
@ -4,9 +4,7 @@ set -o pipefail -xeu
|
||||
|
||||
if [ "${USE_CHROMIUM}" = 1 -o "${TARGETPLATFORM}" = "linux/arm64" ]; then
|
||||
echo "Using Debian's Chromium"
|
||||
apt-dpkg-wrap apt-get update
|
||||
apt-dpkg-wrap apt-get install -y chromium chromium-driver chromium-sandbox
|
||||
apt-cleanup
|
||||
chromium --version
|
||||
else
|
||||
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
|
||||
apt-dpkg-wrap apt-get update
|
||||
apt-dpkg-wrap apt-get install -y google-chrome-stable
|
||||
apt-cleanup
|
||||
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"
|
||||
apt-dpkg-wrap apt-get update
|
||||
apt-dpkg-wrap apt-get install -y "/tmp/google-chrome-stable_${CHROME_RELEASE}-1_amd64.deb"
|
||||
apt-cleanup
|
||||
fi
|
||||
|
||||
google-chrome --version
|
||||
Loading…
x
Reference in New Issue
Block a user