From b858b37ad195eff1348c5697b64878af5307b01e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Tue, 12 Oct 2021 20:45:06 +0200 Subject: [PATCH] base-java: update to Java 11 Jigasi will remain wiith Java 8 for the moment. --- base-java/Dockerfile | 4 +--- jigasi/Dockerfile | 10 ++++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/base-java/Dockerfile b/base-java/Dockerfile index c847fd6..fc69468 100644 --- a/base-java/Dockerfile +++ b/base-java/Dockerfile @@ -3,8 +3,6 @@ ARG BASE_TAG=latest FROM ${JITSI_REPO}/base:${BASE_TAG} 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 && \ apt-dpkg-wrap apt-get update && \ - apt-dpkg-wrap apt-get install -y adoptopenjdk-8-hotspot-jre && \ + apt-dpkg-wrap apt-get install -y openjdk-11-jre-headless && \ apt-cleanup diff --git a/jigasi/Dockerfile b/jigasi/Dockerfile index 62743a5..126d981 100644 --- a/jigasi/Dockerfile +++ b/jigasi/Dockerfile @@ -1,10 +1,16 @@ ARG JITSI_REPO=jitsi ARG BASE_TAG=latest -FROM ${JITSI_REPO}/base-java:${BASE_TAG} +FROM ${JITSI_REPO}/base:${BASE_TAG} ENV GOOGLE_APPLICATION_CREDENTIALS /config/key.json -RUN apt-dpkg-wrap apt-get update && \ +# Jigasi doesn't yet work well with Java 11, let's ccontinue to use 8. + +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 && \ + 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 && \ apt-cleanup