Browse Source

base: update base images to Debian Bullseye

Saúl Ibarra Corretgé 3 năm trước cách đây
mục cha
commit
320829601c
4 tập tin đã thay đổi với 5 bổ sung5 xóa
  1. 1 1
      Makefile
  2. 2 2
      base/Dockerfile
  3. 1 1
      jigasi/Dockerfile
  4. 1 1
      prosody/Dockerfile

+ 1 - 1
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))

+ 2 - 2
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 && \

+ 1 - 1
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 && \

+ 1 - 1
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 \