Interanet/jitsi-meet-deployment
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

misc: cleanup Dockerfiles

Browse Source 
* Cleanup: Use spaces instead of tabulation

* Cleanup: Reduce layers

* Cleanup: Homogeneise wget syntax

* Cleanup: Use binary GPG key format
This commit is contained in:
Berbe
2021-09-17 09:49:49 +02:00
committed by GitHub
parent 09cf0a8951
commit be1da0e2be
8 changed files with 82 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
base-java/Dockerfile
View File

@@ -2,9 +2,8 @@ ARG JITSI_REPO=jitsi
ARG BASE_TAG=latest ARG BASE_TAG=latest
FROM ${JITSI_REPO}/base:${BASE_TAG} FROM ${JITSI_REPO}/base:${BASE_TAG}
RUN \ RUN mkdir -p /usr/share/man/man1 && \
mkdir -p /usr/share/man/man1 && \ wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | gpg --dearmour > /etc/apt/trusted.gpg.d/openjdk.gpg && \
wget -q https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public -O /etc/apt/trusted.gpg.d/openjdk.asc && \
echo "deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main" > /etc/apt/sources.list.d/openjdk.list && \ echo "deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main" > /etc/apt/sources.list.d/openjdk.list && \
apt-dpkg-wrap apt-get update && \ apt-dpkg-wrap apt-get update && \
apt-dpkg-wrap apt-get install -y adoptopenjdk-8-hotspot-jre && \ apt-dpkg-wrap apt-get install -y adoptopenjdk-8-hotspot-jre && \

10
base/Dockerfile
View File

@@ -7,12 +7,11 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
COPY rootfs / COPY rootfs /
RUN \ RUN apt-dpkg-wrap apt-get update && \
apt-dpkg-wrap apt-get update && \
apt-dpkg-wrap apt-get install -y apt-transport-https apt-utils ca-certificates gnupg wget && \ apt-dpkg-wrap apt-get install -y apt-transport-https apt-utils ca-certificates gnupg wget && \
wget -qO - https://github.com/just-containers/s6-overlay/releases/download/v1.22.1.0/s6-overlay-amd64.tar.gz | tar xfz - -C / && \ wget -qO - https://github.com/just-containers/s6-overlay/releases/download/v1.22.1.0/s6-overlay-amd64.tar.gz | tar xfz - -C / && \
wget -qO - https://download.jitsi.org/jitsi-key.gpg.key -O /etc/apt/trusted.gpg.d/jitsi.asc && \ wget -qO - https://download.jitsi.org/jitsi-key.gpg.key | gpg --dearmour > /etc/apt/trusted.gpg.d/jitsi.gpg && \
wget -q https://github.com/subchen/frep/releases/download/v$FREP_VERSION/frep-$FREP_VERSION-linux-amd64 -O /usr/bin/frep && \ wget -qO /usr/bin/frep https://github.com/subchen/frep/releases/download/v$FREP_VERSION/frep-$FREP_VERSION-linux-amd64 && \
echo "deb https://download.jitsi.org $JITSI_RELEASE/" > /etc/apt/sources.list.d/jitsi.list && \ echo "deb https://download.jitsi.org $JITSI_RELEASE/" > /etc/apt/sources.list.d/jitsi.list && \
echo "deb http://ftp.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list && \ echo "deb http://ftp.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list && \
apt-dpkg-wrap apt-get update && \ apt-dpkg-wrap apt-get update && \
@@ -20,8 +19,7 @@ RUN \
apt-cleanup && \ apt-cleanup && \
chmod +x /usr/bin/frep chmod +x /usr/bin/frep
RUN \ RUN [ "$JITSI_RELEASE" = "unstable" ] && \
[ "$JITSI_RELEASE" = "unstable" ] && \
apt-dpkg-wrap apt-get update && \ apt-dpkg-wrap apt-get update && \
apt-dpkg-wrap apt-get install -y jq procps curl vim iputils-ping net-tools && \ apt-dpkg-wrap apt-get install -y jq procps curl vim iputils-ping net-tools && \
apt-cleanup || \ apt-cleanup || \

60
jibri/Dockerfile
View File

@@ -9,43 +9,31 @@ ARG CHROMEDRIVER_MAJOR_RELEASE=90
SHELL ["/bin/bash", "-o", "pipefail", "-c"] 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 procps && \
&& apt-dpkg-wrap apt-get install -y jibri libgl1-mesa-dri procps \ apt-cleanup && \
&& apt-cleanup [ "${CHROME_RELEASE}" = "latest" ] && \
wget -qO - https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmour /etc/apt/trusted.gpg.d/google.gpg && \
RUN \ echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list && \
[ "${CHROME_RELEASE}" = "latest" ] \ apt-dpkg-wrap apt-get update && \
&& wget -q https://dl-ssl.google.com/linux/linux_signing_key.pub -O /etc/apt/trusted.gpg.d/google.asc \ apt-dpkg-wrap apt-get install -y google-chrome-stable && \
&& echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \ apt-cleanup || \
&& apt-dpkg-wrap apt-get update \ [ "${CHROME_RELEASE}" != "latest" ] && \
&& apt-dpkg-wrap apt-get install -y google-chrome-stable \ 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-cleanup \ apt-dpkg-wrap apt-get update && \
|| true apt-dpkg-wrap apt-get install -y "/tmp/google-chrome-stable_${CHROME_RELEASE}-1_amd64.deb" && \
apt-cleanup || \
RUN \ [ "${CHROMEDRIVER_MAJOR_RELEASE}" = "latest" ] && \
[ "${CHROME_RELEASE}" != "latest" ] \ CHROMEDRIVER_RELEASE="$(curl -4Ls https://chromedriver.storage.googleapis.com/LATEST_RELEASE)" || \
&& 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" \ CHROMEDRIVER_RELEASE="$(curl -4Ls https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${CHROMEDRIVER_MAJOR_RELEASE})" && \
&& apt-dpkg-wrap apt-get update \ curl -4Ls "https://chromedriver.storage.googleapis.com/${CHROMEDRIVER_RELEASE}/chromedriver_linux64.zip" \
&& apt-dpkg-wrap apt-get install -y "/tmp/google-chrome-stable_${CHROME_RELEASE}-1_amd64.deb" \ | zcat >> /usr/bin/chromedriver && \
&& apt-cleanup \ chmod +x /usr/bin/chromedriver && \
|| true chromedriver --version && \
apt-dpkg-wrap apt-get update && \
RUN \ apt-dpkg-wrap apt-get install -y jitsi-upload-integrations jq && \
[ "${CHROMEDRIVER_MAJOR_RELEASE}" = "latest" ] \ apt-cleanup
&& 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" \
| zcat >> /usr/bin/chromedriver \
&& chmod +x /usr/bin/chromedriver \
&& chromedriver --version
RUN \
apt-dpkg-wrap apt-get update \
&& apt-dpkg-wrap apt-get install -y jitsi-upload-integrations jq \
&& apt-cleanup
COPY rootfs/ / COPY rootfs/ /
VOLUME /config VOLUME /config

4
jicofo/Dockerfile
View File

@@ -2,12 +2,10 @@ ARG JITSI_REPO=jitsi
ARG BASE_TAG=latest ARG BASE_TAG=latest
FROM ${JITSI_REPO}/base-java:${BASE_TAG} FROM ${JITSI_REPO}/base-java:${BASE_TAG}
RUN \ RUN apt-dpkg-wrap apt-get update && \
apt-dpkg-wrap apt-get update && \
apt-dpkg-wrap apt-get install -y jicofo && \ apt-dpkg-wrap apt-get install -y jicofo && \
apt-cleanup apt-cleanup
COPY rootfs/ / COPY rootfs/ /
VOLUME /config VOLUME /config

3
jigasi/Dockerfile
View File

@@ -4,8 +4,7 @@ FROM ${JITSI_REPO}/base-java:${BASE_TAG}
ENV GOOGLE_APPLICATION_CREDENTIALS /config/key.json ENV GOOGLE_APPLICATION_CREDENTIALS /config/key.json
RUN \ RUN apt-dpkg-wrap apt-get update && \
apt-dpkg-wrap apt-get update && \
apt-dpkg-wrap apt-get install -y jigasi jq && \ apt-dpkg-wrap apt-get install -y jigasi jq && \
apt-cleanup apt-cleanup

3
jvb/Dockerfile
View File

@@ -2,8 +2,7 @@ ARG JITSI_REPO=jitsi
ARG BASE_TAG=latest ARG BASE_TAG=latest
FROM ${JITSI_REPO}/base-java:${BASE_TAG} FROM ${JITSI_REPO}/base-java:${BASE_TAG}
RUN \ RUN apt-dpkg-wrap apt-get update && \
apt-dpkg-wrap apt-get update && \
apt-dpkg-wrap apt-get install -y jitsi-videobridge2 jq curl iproute2 && \ apt-dpkg-wrap apt-get install -y jitsi-videobridge2 jq curl iproute2 && \
apt-cleanup apt-cleanup

45
prosody/Dockerfile
View File

@@ -3,29 +3,27 @@ ARG BASE_TAG=latest
FROM ${JITSI_REPO}/base:${BASE_TAG} as builder FROM ${JITSI_REPO}/base:${BASE_TAG} as builder
RUN \ RUN apt-dpkg-wrap apt-get update && \
apt-dpkg-wrap apt-get update \ apt-dpkg-wrap apt-get install -y \
&& apt-dpkg-wrap apt-get install -y \
lua5.2 \ lua5.2 \
liblua5.2-dev \ liblua5.2-dev \
libsasl2-dev \ libsasl2-dev \
libssl-dev \ libssl-dev \
luarocks \ luarocks \
git \ git \
gcc \ gcc && \
&& luarocks install cyrussasl 1.1.0-1 \ luarocks install cyrussasl 1.1.0-1 && \
&& luarocks install net-url 0.9-1 \ luarocks install net-url 0.9-1 && \
&& luarocks install luajwtjitsi 2.0-0 luarocks install luajwtjitsi 2.0-0
FROM ${JITSI_REPO}/base:${BASE_TAG} FROM ${JITSI_REPO}/base:${BASE_TAG}
ENV XMPP_CROSS_DOMAIN="false" ENV XMPP_CROSS_DOMAIN="false"
RUN \ RUN wget -qO /etc/apt/trusted.gpg.d/prosody.gpg https://prosody.im/files/prosody-debian-packages.key && \
wget -q https://prosody.im/files/prosody-debian-packages.key -O - | gpg --enarmor > /etc/apt/trusted.gpg.d/prosody.asc \ echo "deb http://packages.prosody.im/debian buster main" > /etc/apt/sources.list.d/prosody.list && \
&& echo "deb http://packages.prosody.im/debian buster main" > /etc/apt/sources.list.d/prosody.list \ apt-dpkg-wrap apt-get update && \
&& apt-dpkg-wrap apt-get update \ apt-dpkg-wrap apt-get install -y \
&& apt-dpkg-wrap apt-get install -y \
prosody \ prosody \
libssl1.1 \ libssl1.1 \
sasl2-bin \ sasl2-bin \
@@ -33,19 +31,16 @@ RUN \
lua-basexx \ lua-basexx \
lua-ldap \ lua-ldap \
lua-sec \ lua-sec \
patch \ patch && \
&& apt-cleanup \ apt-cleanup && \
&& rm -rf /etc/prosody rm -rf /etc/prosody && \
apt-dpkg-wrap apt-get update && \
RUN \ apt-dpkg-wrap apt-get -d install -y jitsi-meet-prosody && \
apt-dpkg-wrap apt-get update \ dpkg -x /var/cache/apt/archives/jitsi-meet-prosody*.deb /tmp/pkg && \
&& apt-dpkg-wrap apt-get -d install -y jitsi-meet-prosody \ mv /tmp/pkg/usr/share/jitsi-meet/prosody-plugins /prosody-plugins && \
&& dpkg -x /var/cache/apt/archives/jitsi-meet-prosody*.deb /tmp/pkg \ apt-cleanup && \
&& mv /tmp/pkg/usr/share/jitsi-meet/prosody-plugins /prosody-plugins \ rm -rf /tmp/pkg /var/cache/apt && \
&& apt-cleanup \ patch -d /usr/lib/prosody/modules/muc -p0 < /prosody-plugins/muc_owner_allow_kick.patch
&& rm -rf /tmp/pkg /var/cache/apt
RUN patch -d /usr/lib/prosody/modules/muc -p0 < /prosody-plugins/muc_owner_allow_kick.patch
COPY rootfs/ / COPY rootfs/ /

3
web/Dockerfile
View File

@@ -5,8 +5,7 @@ FROM ${JITSI_REPO}/base:${BASE_TAG}
ADD https://raw.githubusercontent.com/acmesh-official/acme.sh/2.8.8/acme.sh /opt ADD https://raw.githubusercontent.com/acmesh-official/acme.sh/2.8.8/acme.sh /opt
COPY rootfs/ / COPY rootfs/ /
RUN \ RUN apt-dpkg-wrap apt-get update && \
apt-dpkg-wrap apt-get update && \
apt-dpkg-wrap apt-get install -y cron nginx-extras jitsi-meet-web socat && \ apt-dpkg-wrap apt-get install -y cron nginx-extras jitsi-meet-web socat && \
apt-dpkg-wrap apt-get -d install -y jitsi-meet-web-config && \ apt-dpkg-wrap apt-get -d install -y jitsi-meet-web-config && \
dpkg -x /var/cache/apt/archives/jitsi-meet-web-config*.deb /tmp/pkg && \ dpkg -x /var/cache/apt/archives/jitsi-meet-web-config*.deb /tmp/pkg && \