diff --git a/jibri/Dockerfile b/jibri/Dockerfile index 379840a..e5926ec 100644 --- a/jibri/Dockerfile +++ b/jibri/Dockerfile @@ -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 diff --git a/jibri/build/install-chrome.sh b/jibri/rootfs/usr/bin/install-chrome.sh similarity index 92% rename from jibri/build/install-chrome.sh rename to jibri/rootfs/usr/bin/install-chrome.sh index 2f3ce9b..b6ac30a 100755 --- a/jibri/build/install-chrome.sh +++ b/jibri/rootfs/usr/bin/install-chrome.sh @@ -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