base: update base images to Debian Bullseye

pull/1088/head
Saúl Ibarra Corretgé 3 years ago
parent b02a689d8e
commit 320829601c
  1. 2
      Makefile
  2. 4
      base/Dockerfile
  3. 2
      jigasi/Dockerfile
  4. 2
      prosody/Dockerfile

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

@ -1,4 +1,4 @@
FROM debian:buster-slim FROM debian:bullseye-slim
ARG JITSI_RELEASE=stable ARG JITSI_RELEASE=stable
ARG FREP_VERSION=1.3.11 ARG FREP_VERSION=1.3.11
@ -13,7 +13,7 @@ RUN apt-dpkg-wrap apt-get update && \
wget -qO - https://download.jitsi.org/jitsi-key.gpg.key | gpg --dearmour > /etc/apt/trusted.gpg.d/jitsi.gpg && \ wget -qO - https://download.jitsi.org/jitsi-key.gpg.key | gpg --dearmour > /etc/apt/trusted.gpg.d/jitsi.gpg && \
wget -qO /usr/bin/frep https://github.com/subchen/frep/releases/download/v$FREP_VERSION/frep-$FREP_VERSION-linux-amd64 && \ 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 bullseye-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 && \

@ -8,7 +8,7 @@ ENV GOOGLE_APPLICATION_CREDENTIALS /config/key.json
RUN mkdir -p /usr/share/man/man1 && \ RUN 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 -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | gpg --dearmour > /etc/apt/trusted.gpg.d/openjdk.gpg && \
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/ bullseye 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 && \
apt-dpkg-wrap apt-get install -y jigasi jq && \ apt-dpkg-wrap apt-get install -y jigasi jq && \

@ -21,7 +21,7 @@ FROM ${JITSI_REPO}/base:${BASE_TAG}
ENV XMPP_CROSS_DOMAIN="false" ENV XMPP_CROSS_DOMAIN="false"
RUN wget -qO /etc/apt/trusted.gpg.d/prosody.gpg https://prosody.im/files/prosody-debian-packages.key && \ 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 && \ echo "deb http://packages.prosody.im/debian bullseye 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 \

Loading…
Cancel
Save