From b78c89e6e8784a8f9b113b7e8538a60fe010710a Mon Sep 17 00:00:00 2001 From: Amin Vakil Date: Wed, 22 Jul 2020 15:18:26 +0430 Subject: [PATCH] misc: minor Dockerfile Improvements --- etherpad/Dockerfile | 2 +- jibri/Dockerfile | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/etherpad/Dockerfile b/etherpad/Dockerfile index 3d20931..3e6bb8d 100644 --- a/etherpad/Dockerfile +++ b/etherpad/Dockerfile @@ -1,5 +1,5 @@ FROM etherpad/etherpad:1.8.4 -ADD ./rootfs/defaults/settings.json /opt/etherpad-lite/settings.json +COPY ./rootfs/defaults/settings.json /opt/etherpad-lite/settings.json EXPOSE 9001 diff --git a/jibri/Dockerfile b/jibri/Dockerfile index 9aebc76..a13cfdd 100644 --- a/jibri/Dockerfile +++ b/jibri/Dockerfile @@ -6,6 +6,8 @@ FROM ${JITSI_REPO}/base-java ARG CHROME_RELEASE=78.0.3904.97 ARG CHROMEDRIVER_MAJOR_RELEASE=78 +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + RUN \ apt-dpkg-wrap apt-get update \ && apt-dpkg-wrap apt-get install -y jibri libgl1-mesa-dri \ @@ -22,9 +24,9 @@ RUN \ RUN \ [ "${CHROME_RELEASE}" != "latest" ] \ - && 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 \ || true @@ -32,7 +34,7 @@ RUN \ [ "${CHROMEDRIVER_MAJOR_RELEASE}" = "latest" ] \ && CHROMEDRIVER_RELEASE="$(curl -4Ls https://chromedriver.storage.googleapis.com/LATEST_RELEASE)" \ || CHROMEDRIVER_RELEASE="$(curl -4Ls https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${CHROMEDRIVER_MAJOR_RELEASE})" \ - && curl -4Ls https://chromedriver.storage.googleapis.com/${CHROMEDRIVER_RELEASE}/chromedriver_linux64.zip \ + && curl -4Ls "https://chromedriver.storage.googleapis.com/${CHROMEDRIVER_RELEASE}/chromedriver_linux64.zip" \ | zcat >> /usr/bin/chromedriver \ && chmod +x /usr/bin/chromedriver \ && chromedriver --version