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

45
prosody/Dockerfile
View File

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