Skip to content

Commit 7397155

Browse files
committed
base-java: update to Java 11
Jigasi will remain wiith Java 8 for the moment.
1 parent 41c3c6d commit 7397155

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

base-java/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ ARG BASE_TAG=latest
33
FROM ${JITSI_REPO}/base:${BASE_TAG}
44

55
RUN mkdir -p /usr/share/man/man1 && \
6-
wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | gpg --dearmour > /etc/apt/trusted.gpg.d/openjdk.gpg && \
7-
echo "deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main" > /etc/apt/sources.list.d/openjdk.list && \
86
apt-dpkg-wrap apt-get update && \
9-
apt-dpkg-wrap apt-get install -y adoptopenjdk-8-hotspot-jre && \
7+
apt-dpkg-wrap apt-get install -y openjdk-11-jre-headless && \
108
apt-cleanup

jigasi/Dockerfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
ARG JITSI_REPO=jitsi
22
ARG BASE_TAG=latest
3-
FROM ${JITSI_REPO}/base-java:${BASE_TAG}
3+
FROM ${JITSI_REPO}/base:${BASE_TAG}
44

55
ENV GOOGLE_APPLICATION_CREDENTIALS /config/key.json
66

7-
RUN apt-dpkg-wrap apt-get update && \
7+
# Jigasi doesn't yet work well with Java 11, let's ccontinue to use 8.
8+
9+
RUN mkdir -p /usr/share/man/man1 && \
10+
wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | gpg --dearmour > /etc/apt/trusted.gpg.d/openjdk.gpg && \
11+
echo "deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main" > /etc/apt/sources.list.d/openjdk.list && \
12+
apt-dpkg-wrap apt-get update && \
13+
apt-dpkg-wrap apt-get install -y adoptopenjdk-8-hotspot-jre && \
814
apt-dpkg-wrap apt-get install -y jigasi jq && \
915
apt-cleanup
1016

0 commit comments

Comments
 (0)