mirrors/docker-jitsi-meet
1
0
Fork 0
mirror of https://github.com/jitsi/docker-jitsi-meet.git synced 2025-10-14 13:40:58 +02:00
Code Issues Projects Releases Wiki Activity

core: update base image to Debian Buster

Browse Source
This commit is contained in:
Saúl Ibarra Corretgé 2020-05-27 23:40:59 +02:00
parent ba011900fb
commit 880b9b0e91
4 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -33,7 +33,7 @@ clean:
docker network prune docker network prune
prepare: prepare:
docker pull debian:stretch-slim docker pull debian:buster-slim
FORCE_REBUILD=1 $(MAKE) FORCE_REBUILD=1 $(MAKE)
.PHONY: all build tag push clean prepare release .PHONY: all build tag push clean prepare release

5
base-java/Dockerfile
View File

@ -3,7 +3,8 @@ FROM ${JITSI_REPO}/base
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 | apt-key add - && \
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 openjdk-8-jre-headless && \ apt-dpkg-wrap apt-get install -y adoptopenjdk-8-hotspot-jre && \
apt-cleanup apt-cleanup

8
base/Dockerfile
View File

@ -1,4 +1,4 @@
FROM debian:stretch-slim FROM debian:buster-slim
ARG JITSI_RELEASE=stable ARG JITSI_RELEASE=stable
ARG FREP_VERSION=1.3.11 ARG FREP_VERSION=1.3.11
@ -9,14 +9,12 @@ 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 && \ apt-dpkg-wrap apt-get install -y apt-transport-https apt-utils ca-certificates gnupg wget && \
apt-dpkg-wrap apt-get install -y 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 | apt-key add - && \ wget -qO - https://download.jitsi.org/jitsi-key.gpg.key | apt-key add - && \
wget -q https://github.com/subchen/frep/releases/download/v$FREP_VERSION/frep-$FREP_VERSION-linux-amd64 -O /usr/bin/frep && \ wget -q https://github.com/subchen/frep/releases/download/v$FREP_VERSION/frep-$FREP_VERSION-linux-amd64 -O /usr/bin/frep && \
apt-dpkg-wrap apt-get --purge remove -y wget && \
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 stretch-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 && \
apt-dpkg-wrap apt-get dist-upgrade -y && \ apt-dpkg-wrap apt-get dist-upgrade -y && \
apt-cleanup && \ apt-cleanup && \

19
prosody/Dockerfile
View File

@ -8,34 +8,29 @@ RUN \
lua5.2 \ lua5.2 \
liblua5.2-dev \ liblua5.2-dev \
libsasl2-dev \ libsasl2-dev \
libssl1.0-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 lua-cjson 2.1.0-1 \ && luarocks install net-url 0.9-1 \
&& luarocks install luajwtjitsi 1.3-7 \ && luarocks install luajwtjitsi 2.0-0
&& luarocks install net-url 0.9-1
FROM ${JITSI_REPO}/base FROM ${JITSI_REPO}/base
ADD https://prosody.im/files/prosody-debian-packages.key /tmp/prosody.key
RUN \ RUN \
apt-key add /tmp/prosody.key \ wget -qO - https://prosody.im/files/prosody-debian-packages.key | apt-key add - \
&& rm -f /tmp/prosody.key \ && echo "deb http://packages.prosody.im/debian buster main" > /etc/apt/sources.list.d/prosody.list \
&& echo "deb http://packages.prosody.im/debian stretch 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.0.2 \ libssl1.1 \
sasl2-bin \ sasl2-bin \
libsasl2-modules-ldap \ libsasl2-modules-ldap \
lua-basexx \ lua-basexx \
patch \
&& apt-dpkg-wrap apt-get install -t stretch-backports -y \
lua-ldap \ lua-ldap \
lua-sec \ lua-sec \
patch \
&& apt-cleanup \ && apt-cleanup \
&& rm -rf /etc/prosody && rm -rf /etc/prosody