File tree 2 files changed +9
-5
lines changed 2 files changed +9
-5
lines changed Original file line number Diff line number Diff line change @@ -3,8 +3,6 @@ ARG BASE_TAG=latest
3
3
FROM ${JITSI_REPO}/base:${BASE_TAG}
4
4
5
5
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 && \
8
6
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 && \
10
8
apt-cleanup
Original file line number Diff line number Diff line change 1
1
ARG JITSI_REPO=jitsi
2
2
ARG BASE_TAG=latest
3
- FROM ${JITSI_REPO}/base-java :${BASE_TAG}
3
+ FROM ${JITSI_REPO}/base:${BASE_TAG}
4
4
5
5
ENV GOOGLE_APPLICATION_CREDENTIALS /config/key.json
6
6
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 && \
8
14
apt-dpkg-wrap apt-get install -y jigasi jq && \
9
15
apt-cleanup
10
16
You can’t perform that action at this time.
0 commit comments