From 031f31e91eb3f934032d581989844c8e341042a9 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Wed, 20 Jan 2021 15:44:42 +0100 Subject: WIP modernize jitsi conf --- app/jitsi/build/jitsi-conference-focus/Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'app/jitsi/build/jitsi-conference-focus/Dockerfile') diff --git a/app/jitsi/build/jitsi-conference-focus/Dockerfile b/app/jitsi/build/jitsi-conference-focus/Dockerfile index e2c459c..f78cc78 100644 --- a/app/jitsi/build/jitsi-conference-focus/Dockerfile +++ b/app/jitsi/build/jitsi-conference-focus/Dockerfile @@ -18,10 +18,7 @@ FROM debian:buster RUN apt-get update && \ apt-get install -y openjdk-11-jre-headless ca-certificates -ENV JAVA_SYS_PROPS="-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/root -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=.sip-communicator -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi" - -COPY --from=builder /srv/build /srv/jicofo -COPY jicofo /usr/local/bin/jicofo -COPY sip-communicator.properties /root/.sip-communicator/sip-communicator.properties +COPY --from=builder /srv/build /usr/share/jicofo +COPY jicofo /usr/local/bin CMD ["/usr/local/bin/jicofo"] -- cgit v1.2.3 From 7b57ff72a918ca295e2b00e76da33eec700c6a2a Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Thu, 28 Jan 2021 17:52:41 +0100 Subject: Simplify prosody too --- app/jitsi/build/jitsi-conference-focus/Dockerfile | 1 + 1 file changed, 1 insertion(+) (limited to 'app/jitsi/build/jitsi-conference-focus/Dockerfile') diff --git a/app/jitsi/build/jitsi-conference-focus/Dockerfile b/app/jitsi/build/jitsi-conference-focus/Dockerfile index f78cc78..e67b3de 100644 --- a/app/jitsi/build/jitsi-conference-focus/Dockerfile +++ b/app/jitsi/build/jitsi-conference-focus/Dockerfile @@ -20,5 +20,6 @@ RUN apt-get update && \ COPY --from=builder /srv/build /usr/share/jicofo COPY jicofo /usr/local/bin +ENV JICOFO_SECRET=IAMDEPRECATED CMD ["/usr/local/bin/jicofo"] -- cgit v1.2.3 From 5b53cf1673d29a7b81d552c69295f3dc7c736635 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Thu, 28 Jan 2021 21:47:35 +0100 Subject: Trying to switch on a development version --- app/jitsi/build/jitsi-conference-focus/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'app/jitsi/build/jitsi-conference-focus/Dockerfile') diff --git a/app/jitsi/build/jitsi-conference-focus/Dockerfile b/app/jitsi/build/jitsi-conference-focus/Dockerfile index e67b3de..525bffb 100644 --- a/app/jitsi/build/jitsi-conference-focus/Dockerfile +++ b/app/jitsi/build/jitsi-conference-focus/Dockerfile @@ -3,9 +3,9 @@ FROM debian:buster AS builder ARG PREFIXV ARG VERSION RUN apt-get update && \ - apt-get install -y openjdk-11-jdk maven wget unzip && \ - wget https://github.com/jitsi/jicofo/archive/${PREFIXV}${VERSION}.zip -O jicofo.zip + apt-get install -y openjdk-11-jdk-headless maven wget unzip +RUN wget https://github.com/jitsi/jicofo/archive/${PREFIXV}${VERSION}.zip -O jicofo.zip RUN unzip jicofo.zip && \ mv jicofo*${VERSION} jicofo && \ cd jicofo && \ @@ -20,6 +20,5 @@ RUN apt-get update && \ COPY --from=builder /srv/build /usr/share/jicofo COPY jicofo /usr/local/bin -ENV JICOFO_SECRET=IAMDEPRECATED CMD ["/usr/local/bin/jicofo"] -- cgit v1.2.3 From 982efd1b49f7435f7c49c2099aabfc994d3901fb Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Thu, 28 Jan 2021 23:02:37 +0100 Subject: Still so broken... --- app/jitsi/build/jitsi-conference-focus/Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'app/jitsi/build/jitsi-conference-focus/Dockerfile') diff --git a/app/jitsi/build/jitsi-conference-focus/Dockerfile b/app/jitsi/build/jitsi-conference-focus/Dockerfile index 525bffb..db50746 100644 --- a/app/jitsi/build/jitsi-conference-focus/Dockerfile +++ b/app/jitsi/build/jitsi-conference-focus/Dockerfile @@ -1,10 +1,9 @@ -FROM debian:buster AS builder +FROM fedora:33 AS builder + +RUN dnf install -y java-latest-openjdk-headless maven wget unzip ARG PREFIXV ARG VERSION -RUN apt-get update && \ - apt-get install -y openjdk-11-jdk-headless maven wget unzip - RUN wget https://github.com/jitsi/jicofo/archive/${PREFIXV}${VERSION}.zip -O jicofo.zip RUN unzip jicofo.zip && \ mv jicofo*${VERSION} jicofo && \ @@ -13,7 +12,7 @@ RUN unzip jicofo.zip && \ unzip target/jicofo-1.1-SNAPSHOT-archive.zip && \ mv jicofo-1.1-SNAPSHOT /srv/build -FROM debian:buster +FROM debian:bullseye RUN apt-get update && \ apt-get install -y openjdk-11-jre-headless ca-certificates -- cgit v1.2.3