misc: minor Dockerfile Improvements
This commit is contained in:
parent
a754519364
commit
b78c89e6e8
|
@ -1,5 +1,5 @@
|
||||||
FROM etherpad/etherpad:1.8.4
|
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
|
EXPOSE 9001
|
||||||
|
|
|
@ -6,6 +6,8 @@ FROM ${JITSI_REPO}/base-java
|
||||||
ARG CHROME_RELEASE=78.0.3904.97
|
ARG CHROME_RELEASE=78.0.3904.97
|
||||||
ARG CHROMEDRIVER_MAJOR_RELEASE=78
|
ARG CHROMEDRIVER_MAJOR_RELEASE=78
|
||||||
|
|
||||||
|
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
apt-dpkg-wrap apt-get update \
|
apt-dpkg-wrap apt-get update \
|
||||||
&& apt-dpkg-wrap apt-get install -y jibri libgl1-mesa-dri \
|
&& apt-dpkg-wrap apt-get install -y jibri libgl1-mesa-dri \
|
||||||
|
@ -22,9 +24,9 @@ RUN \
|
||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
[ "${CHROME_RELEASE}" != "latest" ] \
|
[ "${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 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 \
|
&& apt-cleanup \
|
||||||
|| true
|
|| true
|
||||||
|
|
||||||
|
@ -32,7 +34,7 @@ RUN \
|
||||||
[ "${CHROMEDRIVER_MAJOR_RELEASE}" = "latest" ] \
|
[ "${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_RELEASE="$(curl -4Ls https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${CHROMEDRIVER_MAJOR_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 \
|
| zcat >> /usr/bin/chromedriver \
|
||||||
&& chmod +x /usr/bin/chromedriver \
|
&& chmod +x /usr/bin/chromedriver \
|
||||||
&& chromedriver --version
|
&& chromedriver --version
|
||||||
|
|
Loading…
Reference in New Issue