Interanet/jitsi-meet-deployment
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

base-java: update to Java 11

Browse Source 
Jigasi will remain wiith Java 8 for the moment.
This commit is contained in:
Saúl Ibarra Corretgé
2021-10-12 20:45:06 +02:00
parent 2061b869fe
commit b858b37ad1
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
base-java/Dockerfile
View File

@@ -3,8 +3,6 @@ ARG BASE_TAG=latest
FROM ${JITSI_REPO}/base:${BASE_TAG} FROM ${JITSI_REPO}/base:${BASE_TAG}
RUN mkdir -p /usr/share/man/man1 && \ 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 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 apt-cleanup

10
jigasi/Dockerfile
View File

@@ -1,10 +1,16 @@
ARG JITSI_REPO=jitsi ARG JITSI_REPO=jitsi
ARG BASE_TAG=latest ARG BASE_TAG=latest
FROM ${JITSI_REPO}/base-java:${BASE_TAG} FROM ${JITSI_REPO}/base:${BASE_TAG}
ENV GOOGLE_APPLICATION_CREDENTIALS /config/key.json 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-dpkg-wrap apt-get install -y jigasi jq && \
apt-cleanup apt-cleanup