From 0a87d26e47646fb0a3e9a9399ea83b39640583b1 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Mon, 1 Feb 2021 08:40:59 +0100 Subject: Polish configuration --- app/jitsi/build/jitsi-conference-focus/Dockerfile | 7 ++++--- app/jitsi/build/jitsi-conference-focus/jicofo | 8 -------- 2 files changed, 4 insertions(+), 11 deletions(-) (limited to 'app/jitsi/build/jitsi-conference-focus') diff --git a/app/jitsi/build/jitsi-conference-focus/Dockerfile b/app/jitsi/build/jitsi-conference-focus/Dockerfile index 0e11df9..13e99be 100644 --- a/app/jitsi/build/jitsi-conference-focus/Dockerfile +++ b/app/jitsi/build/jitsi-conference-focus/Dockerfile @@ -1,7 +1,8 @@ -FROM fedora:33 AS builder +FROM debian:buster AS builder # unzip is required when executing the mvn package command -RUN dnf install -y java-latest-openjdk-headless maven git unzip +RUN apt-get update && \ + apt-get install -y openjdk-11-jdk-headless maven git unzip ARG JICOFO_TAG RUN git clone --depth 1 --branch $JICOFO_TAG https://github.com/jitsi/jicofo @@ -14,7 +15,7 @@ RUN mvn package -DskipTests -Dassembly.skipAssembly=false RUN unzip target/jicofo-1.1-SNAPSHOT-archive.zip && \ mv jicofo-1.1-SNAPSHOT /srv/build -FROM debian:bullseye +FROM debian:buster RUN apt-get update && \ apt-get install -y openjdk-11-jre-headless ca-certificates diff --git a/app/jitsi/build/jitsi-conference-focus/jicofo b/app/jitsi/build/jitsi-conference-focus/jicofo index 344b293..e307e9f 100755 --- a/app/jitsi/build/jitsi-conference-focus/jicofo +++ b/app/jitsi/build/jitsi-conference-focus/jicofo @@ -2,15 +2,7 @@ update-ca-certificates -f -if [ -z "${JICOFO_MEMORY}" ]; then - echo "You must set the env variable 'JICOFO_MEMORY'. eg. JICOFO_MEMORY=3072m" - exit 1 -fi - exec java \ - -Xmx${JICOFO_MEMORY} \ - -XX:+HeapDumpOnOutOfMemoryError \ - -XX:HeapDumpPath=/tmp \ -Djdk.tls.ephemeralDHKeySize=2048 \ -Djava.util.logging.config.file=/usr/share/jicofo/lib/logging.properties \ -Dconfig.file=/etc/jitsi/jicofo.conf \ -- cgit v1.2.3