|
@@ -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
|
|
|
|