From 880b9b0e91a9770aa1d387ea15d081241043b42c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Wed, 27 May 2020 23:40:59 +0200
Subject: [PATCH] core: update base image to Debian Buster

---
 Makefile             |  2 +-
 base-java/Dockerfile |  5 +++--
 base/Dockerfile      |  8 +++-----
 prosody/Dockerfile   | 19 +++++++------------
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index e8f0622..8b3de05 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ clean:
 	docker network prune
 
 prepare:
-	docker pull debian:stretch-slim
+	docker pull debian:buster-slim
 	FORCE_REBUILD=1 $(MAKE)
 
 .PHONY: all build tag push clean prepare release
diff --git a/base-java/Dockerfile b/base-java/Dockerfile
index ae3d481..8d7be4c 100644
--- a/base-java/Dockerfile
+++ b/base-java/Dockerfile
@@ -3,7 +3,8 @@ FROM ${JITSI_REPO}/base
 
 RUN	\
 	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 install -y openjdk-8-jre-headless && \
+	apt-dpkg-wrap apt-get install -y adoptopenjdk-8-hotspot-jre && \
 	apt-cleanup
-
diff --git a/base/Dockerfile b/base/Dockerfile
index 812e996..92c085b 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch-slim
+FROM debian:buster-slim
 
 ARG JITSI_RELEASE=stable
 ARG FREP_VERSION=1.3.11
@@ -9,14 +9,12 @@ COPY rootfs /
 
 RUN \
 	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 wget && \
+	apt-dpkg-wrap apt-get install -y apt-transport-https apt-utils ca-certificates gnupg 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://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 && \
-	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 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 dist-upgrade -y && \
 	apt-cleanup && \
diff --git a/prosody/Dockerfile b/prosody/Dockerfile
index e6a37bc..0820c36 100644
--- a/prosody/Dockerfile
+++ b/prosody/Dockerfile
@@ -8,34 +8,29 @@ RUN \
       lua5.2 \
       liblua5.2-dev \
       libsasl2-dev \
-      libssl1.0-dev \
+      libssl-dev \
       luarocks \
       git \
       gcc \
     && luarocks install cyrussasl 1.1.0-1 \
-    && luarocks install lua-cjson 2.1.0-1 \
-    && luarocks install luajwtjitsi 1.3-7 \
-    && luarocks install net-url 0.9-1
+    && luarocks install net-url 0.9-1 \
+    && luarocks install luajwtjitsi 2.0-0
 
 FROM ${JITSI_REPO}/base
 
-ADD https://prosody.im/files/prosody-debian-packages.key /tmp/prosody.key
-
 RUN \
-    apt-key add /tmp/prosody.key \
-    && rm -f /tmp/prosody.key \
-    && echo "deb http://packages.prosody.im/debian stretch main" > /etc/apt/sources.list.d/prosody.list \
+    wget -qO - https://prosody.im/files/prosody-debian-packages.key | apt-key add - \
+    && 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.0.2 \
+      libssl1.1 \
       sasl2-bin \
       libsasl2-modules-ldap \
       lua-basexx \
-      patch \
-    && apt-dpkg-wrap apt-get install -t stretch-backports -y \
       lua-ldap \
       lua-sec \
+      patch \
     && apt-cleanup \
     && rm -rf /etc/prosody