Skip to content

Commit b78c89e

Browse files
authored
misc: minor Dockerfile Improvements
1 parent a754519 commit b78c89e

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

etherpad/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM etherpad/etherpad:1.8.4
22

3-
ADD ./rootfs/defaults/settings.json /opt/etherpad-lite/settings.json
3+
COPY ./rootfs/defaults/settings.json /opt/etherpad-lite/settings.json
44

55
EXPOSE 9001

jibri/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ FROM ${JITSI_REPO}/base-java
66
ARG CHROME_RELEASE=78.0.3904.97
77
ARG CHROMEDRIVER_MAJOR_RELEASE=78
88

9+
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
10+
911
RUN \
1012
apt-dpkg-wrap apt-get update \
1113
&& apt-dpkg-wrap apt-get install -y jibri libgl1-mesa-dri \
@@ -22,17 +24,17 @@ RUN \
2224

2325
RUN \
2426
[ "${CHROME_RELEASE}" != "latest" ] \
25-
&& 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 \
27+
&& 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" \
2628
&& apt-dpkg-wrap apt-get update \
27-
&& apt-dpkg-wrap apt-get install -y /tmp/google-chrome-stable_${CHROME_RELEASE}-1_amd64.deb \
29+
&& apt-dpkg-wrap apt-get install -y "/tmp/google-chrome-stable_${CHROME_RELEASE}-1_amd64.deb" \
2830
&& apt-cleanup \
2931
|| true
3032

3133
RUN \
3234
[ "${CHROMEDRIVER_MAJOR_RELEASE}" = "latest" ] \
3335
&& CHROMEDRIVER_RELEASE="$(curl -4Ls https://chromedriver.storage.googleapis.com/LATEST_RELEASE)" \
3436
|| CHROMEDRIVER_RELEASE="$(curl -4Ls https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${CHROMEDRIVER_MAJOR_RELEASE})" \
35-
&& curl -4Ls https://chromedriver.storage.googleapis.com/${CHROMEDRIVER_RELEASE}/chromedriver_linux64.zip \
37+
&& curl -4Ls "https://chromedriver.storage.googleapis.com/${CHROMEDRIVER_RELEASE}/chromedriver_linux64.zip" \
3638
| zcat >> /usr/bin/chromedriver \
3739
&& chmod +x /usr/bin/chromedriver \
3840
&& chromedriver --version

0 commit comments

Comments
 (0)