From 320829601cc1a06a04dea2cca29d690c5756b80c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Fri, 3 Dec 2021 13:57:09 +0100 Subject: [PATCH] base: update base images to Debian Bullseye --- Makefile | 2 +- base/Dockerfile | 4 ++-- jigasi/Dockerfile | 2 +- prosody/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 08ec3a9..a633481 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ clean: docker network prune prepare: - docker pull debian:buster-slim + docker pull debian:bullseye-slim FORCE_REBUILD=1 $(MAKE) .PHONY: all build tag push clean prepare release $(addprefix build_,$(JITSI_SERVICES)) diff --git a/base/Dockerfile b/base/Dockerfile index 7c355e1..53774a6 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim ARG JITSI_RELEASE=stable 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 /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 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 dist-upgrade -y && \ apt-cleanup && \ diff --git a/jigasi/Dockerfile b/jigasi/Dockerfile index 126d981..63c88f1 100644 --- a/jigasi/Dockerfile +++ b/jigasi/Dockerfile @@ -8,7 +8,7 @@ ENV GOOGLE_APPLICATION_CREDENTIALS /config/key.json 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 && \ - 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 install -y adoptopenjdk-8-hotspot-jre && \ apt-dpkg-wrap apt-get install -y jigasi jq && \ diff --git a/prosody/Dockerfile b/prosody/Dockerfile index 6dcdc0f..40d4275 100644 --- a/prosody/Dockerfile +++ b/prosody/Dockerfile @@ -21,7 +21,7 @@ FROM ${JITSI_REPO}/base:${BASE_TAG} ENV XMPP_CROSS_DOMAIN="false" 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 install -y \ prosody \