forked from Deuxfleurs/nixcfg
upgrade the building logic
This commit is contained in:
parent
6445d55e3e
commit
2d6616195f
7 changed files with 60 additions and 33 deletions
|
@ -3,33 +3,33 @@ services:
|
||||||
# VoIP
|
# VoIP
|
||||||
jitsi-meet:
|
jitsi-meet:
|
||||||
build:
|
build:
|
||||||
context: ./jitsi/build/jitsi-meet
|
context: ./jitsi-meet
|
||||||
args:
|
args:
|
||||||
# https://github.com/jitsi/jitsi-meet
|
# https://github.com/jitsi/jitsi-meet
|
||||||
MEET_TAG: stable/jitsi-meet_6826
|
MEET_TAG: stable/jitsi-meet_8252
|
||||||
image: superboum/amd64_jitsi_meet:v5
|
image: superboum/amd64_jitsi_meet:v6
|
||||||
|
|
||||||
jitsi-conference-focus:
|
jitsi-conference-focus:
|
||||||
build:
|
build:
|
||||||
context: ./jitsi/build/jitsi-conference-focus
|
context: ./jitsi-conference-focus
|
||||||
args:
|
args:
|
||||||
# https://github.com/jitsi/jicofo
|
# https://github.com/jitsi/jicofo
|
||||||
JICOFO_TAG: stable/jitsi-meet_6826
|
JICOFO_TAG: stable/jitsi-meet_8252
|
||||||
image: superboum/amd64_jitsi_conference_focus:v9
|
image: superboum/amd64_jitsi_conference_focus:v10
|
||||||
|
|
||||||
jitsi-videobridge:
|
jitsi-videobridge:
|
||||||
build:
|
build:
|
||||||
context: ./jitsi/build/jitsi-videobridge
|
context: ./jitsi-videobridge
|
||||||
args:
|
args:
|
||||||
# https://github.com/jitsi/jitsi-videobridge
|
# https://github.com/jitsi/jitsi-videobridge
|
||||||
# note: JVB is not tagged with non-stable tags
|
# note: JVB is not tagged with non-stable tags
|
||||||
JVB_TAG: stable/jitsi-meet_6826
|
JVB_TAG: stable/jitsi-meet_8252
|
||||||
image: superboum/amd64_jitsi_videobridge:v20
|
image: superboum/amd64_jitsi_videobridge:v21
|
||||||
|
|
||||||
jitsi-xmpp:
|
jitsi-xmpp:
|
||||||
build:
|
build:
|
||||||
context: ./jitsi/build/jitsi-xmpp
|
context: ./jitsi-xmpp
|
||||||
args:
|
args:
|
||||||
MEET_TAG: stable/jitsi-meet_6826
|
MEET_TAG: stable/jitsi-meet_8252
|
||||||
PROSODY_VERSION: 0.11.12-1
|
PROSODY_VERSION: 1nightly191-1~bookworm
|
||||||
image: superboum/amd64_jitsi_xmpp:v10
|
image: superboum/amd64_jitsi_xmpp:v11
|
||||||
|
|
|
@ -2,23 +2,23 @@ FROM debian:bookworm AS builder
|
||||||
|
|
||||||
# unzip is required when executing the mvn package command
|
# unzip is required when executing the mvn package command
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y openjdk-11-jdk-headless maven git unzip
|
apt-get install -y openjdk-17-jdk-headless maven git unzip
|
||||||
|
|
||||||
ARG JICOFO_TAG
|
ARG JICOFO_TAG
|
||||||
RUN git clone --depth 1 --branch $JICOFO_TAG https://github.com/jitsi/jicofo
|
RUN git clone --depth 1 --branch $JICOFO_TAG https://github.com/jitsi/jicofo
|
||||||
|
|
||||||
WORKDIR jicofo
|
WORKDIR jicofo
|
||||||
COPY *.patch .
|
#COPY *.patch .
|
||||||
RUN git apply 0001-Remove-broken-command-line-args-parameters-setting.patch
|
#RUN git apply 0001-Remove-broken-command-line-args-parameters-setting.patch
|
||||||
RUN mvn package -DskipTests -Dassembly.skipAssembly=false
|
RUN mvn package -DskipTests -Dassembly.skipAssembly=false
|
||||||
|
|
||||||
RUN unzip target/jicofo-1.1-SNAPSHOT-archive.zip && \
|
RUN unzip jicofo/target/jicofo-1.1-SNAPSHOT-archive.zip && \
|
||||||
mv jicofo-1.1-SNAPSHOT /srv/build
|
mv jicofo-1.1-SNAPSHOT /srv/build
|
||||||
|
|
||||||
FROM debian:bookworm
|
FROM debian:bookworm
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y openjdk-11-jre-headless ca-certificates
|
apt-get install -y openjdk-17-jre-headless ca-certificates
|
||||||
|
|
||||||
COPY --from=builder /srv/build /usr/share/jicofo
|
COPY --from=builder /srv/build /usr/share/jicofo
|
||||||
COPY jicofo /usr/local/bin
|
COPY jicofo /usr/local/bin
|
||||||
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
From 5e890bd4dd378913a2dabaf4468ce1839b84ec4f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Quentin Dufour <quentin@deuxfleurs.fr>
|
||||||
|
Date: Thu, 2 Feb 2023 13:51:27 +0100
|
||||||
|
Subject: [PATCH] allow broken openssl routines
|
||||||
|
|
||||||
|
---
|
||||||
|
Makefile | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index 040f8c977..bcbf82658 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -27,7 +27,7 @@ endif
|
||||||
|
all: compile deploy clean
|
||||||
|
|
||||||
|
compile:
|
||||||
|
- NODE_OPTIONS=--max-old-space-size=8192 \
|
||||||
|
+ NODE_OPTIONS="--max-old-space-size=8192 --openssl-legacy-provider" \
|
||||||
|
$(WEBPACK)
|
||||||
|
|
||||||
|
clean:
|
||||||
|
--
|
||||||
|
2.38.1
|
||||||
|
|
|
@ -2,13 +2,17 @@ FROM debian:bookworm AS builder
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y curl && \
|
apt-get install -y curl && \
|
||||||
curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
|
curl -sL https://deb.nodesource.com/setup_19.x | bash - && \
|
||||||
apt-get install -y git nodejs make git unzip
|
apt-get install -y git nodejs make git unzip
|
||||||
|
|
||||||
ARG MEET_TAG
|
ARG MEET_TAG
|
||||||
RUN git clone --depth 1 --branch ${MEET_TAG} https://github.com/jitsi/jitsi-meet
|
RUN git clone --depth 1 --branch ${MEET_TAG} https://github.com/jitsi/jitsi-meet
|
||||||
|
|
||||||
WORKDIR jitsi-meet
|
WORKDIR jitsi-meet
|
||||||
|
# @FIXME read the following SO post to understand why we declare this option
|
||||||
|
# https://stackoverflow.com/a/73027407
|
||||||
|
COPY *.patch .
|
||||||
|
RUN git apply 0001-allow-broken-openssl-routines.patch
|
||||||
RUN npm install && \
|
RUN npm install && \
|
||||||
make
|
make
|
||||||
|
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
FROM debian:bookworm AS builder
|
FROM debian:bookworm AS builder
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y git unzip maven openjdk-11-jdk-headless
|
apt-get install -y git unzip maven openjdk-17-jdk-headless
|
||||||
|
|
||||||
ARG JVB_TAG
|
ARG JVB_TAG
|
||||||
RUN git clone --depth 1 --branch ${JVB_TAG} https://github.com/jitsi/jitsi-videobridge
|
RUN git clone --depth 1 --branch ${JVB_TAG} https://github.com/jitsi/jitsi-videobridge
|
||||||
|
|
||||||
WORKDIR jitsi-videobridge
|
WORKDIR jitsi-videobridge
|
||||||
COPY *.patch .
|
#COPY *.patch .
|
||||||
RUN git apply 0001-Remove-deprecated-argument.patch
|
#RUN git apply 0001-Remove-deprecated-argument.patch
|
||||||
RUN mvn package -DskipTests
|
RUN mvn package -DskipTests
|
||||||
RUN unzip jvb/target/jitsi-videobridge*.zip && \
|
RUN unzip jvb/target/jitsi-videobridge*.zip && \
|
||||||
mv jitsi-videobridge-*-SNAPSHOT build
|
mv jitsi-videobridge-*-SNAPSHOT build
|
||||||
|
@ -16,7 +16,7 @@ RUN unzip jvb/target/jitsi-videobridge*.zip && \
|
||||||
FROM debian:bookworm
|
FROM debian:bookworm
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y openjdk-11-jre-headless curl iproute2
|
apt-get install -y openjdk-17-jre-headless curl iproute2
|
||||||
|
|
||||||
COPY --from=builder /jitsi-videobridge/build /usr/share/jvb
|
COPY --from=builder /jitsi-videobridge/build /usr/share/jvb
|
||||||
COPY jvb_run /usr/local/bin/jvb_run
|
COPY jvb_run /usr/local/bin/jvb_run
|
||||||
|
|
|
@ -10,13 +10,11 @@ FROM debian:bookworm
|
||||||
|
|
||||||
ARG PROSODY_VERSION
|
ARG PROSODY_VERSION
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y wget gnupg2 && \
|
apt-get install -y wget gnupg2 extrepo && \
|
||||||
echo deb http://packages.prosody.im/debian buster main \
|
extrepo enable prosody && \
|
||||||
| tee -a /etc/apt/sources.list && \
|
|
||||||
wget https://prosody.im/files/prosody-debian-packages.key -O - \
|
|
||||||
| apt-key add - && \
|
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
apt-get install -y prosody=${PROSODY_VERSION} lua-event
|
apt-cache show prosody-0.12 && \
|
||||||
|
apt-get install -y prosody-0.12=${PROSODY_VERSION} lua-event
|
||||||
|
|
||||||
RUN mkdir -p /usr/local/share/ca-certificates/ && \
|
RUN mkdir -p /usr/local/share/ca-certificates/ && \
|
||||||
ln -sf \
|
ln -sf \
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
version: '3.4'
|
version: '3.4'
|
||||||
services:
|
services:
|
||||||
jitsi-xmpp:
|
jitsi-xmpp:
|
||||||
image: superboum/amd64_jitsi_xmpp:v9
|
image: superboum/amd64_jitsi_xmpp:v11
|
||||||
volumes:
|
volumes:
|
||||||
- "./prosody/prosody.cfg.lua:/etc/prosody/prosody.cfg.lua:ro"
|
- "./prosody/prosody.cfg.lua:/etc/prosody/prosody.cfg.lua:ro"
|
||||||
- "./prosody/certs/jitsi.crt:/var/lib/prosody/jitsi.crt:ro"
|
- "./prosody/certs/jitsi.crt:/var/lib/prosody/jitsi.crt:ro"
|
||||||
|
@ -13,14 +13,14 @@ services:
|
||||||
- JVB_AUTH_PASSWORD=jvbpass
|
- JVB_AUTH_PASSWORD=jvbpass
|
||||||
|
|
||||||
jitsi-conference-focus:
|
jitsi-conference-focus:
|
||||||
image: superboum/amd64_jitsi_conference_focus:v7
|
image: superboum/amd64_jitsi_conference_focus:v10
|
||||||
volumes:
|
volumes:
|
||||||
- "./prosody/certs/jitsi.crt:/usr/local/share/ca-certificates/jitsi.crt:ro"
|
- "./prosody/certs/jitsi.crt:/usr/local/share/ca-certificates/jitsi.crt:ro"
|
||||||
- "./prosody/certs/auth.jitsi.crt:/usr/local/share/ca-certificates/auth.jitsi.crt:ro"
|
- "./prosody/certs/auth.jitsi.crt:/usr/local/share/ca-certificates/auth.jitsi.crt:ro"
|
||||||
- "./jicofo/jicofo.conf:/etc/jitsi/jicofo.conf:ro"
|
- "./jicofo/jicofo.conf:/etc/jitsi/jicofo.conf:ro"
|
||||||
|
|
||||||
jitsi-videobridge:
|
jitsi-videobridge:
|
||||||
image: superboum/amd64_jitsi_videobridge:v17
|
image: superboum/amd64_jitsi_videobridge:v21
|
||||||
volumes:
|
volumes:
|
||||||
- "./prosody/certs/jitsi.crt:/usr/local/share/ca-certificates/jitsi.crt:ro"
|
- "./prosody/certs/jitsi.crt:/usr/local/share/ca-certificates/jitsi.crt:ro"
|
||||||
- "./prosody/certs/auth.jitsi.crt:/usr/local/share/ca-certificates/auth.jitsi.crt:ro"
|
- "./prosody/certs/auth.jitsi.crt:/usr/local/share/ca-certificates/auth.jitsi.crt:ro"
|
||||||
|
@ -31,7 +31,7 @@ services:
|
||||||
- "10000:10000/udp"
|
- "10000:10000/udp"
|
||||||
|
|
||||||
jitsi-meet:
|
jitsi-meet:
|
||||||
image: superboum/amd64_jitsi_meet:v4
|
image: superboum/amd64_jitsi_meet:v6
|
||||||
volumes:
|
volumes:
|
||||||
- "./prosody/certs/jitsi.crt:/etc/nginx/jitsi.crt:ro"
|
- "./prosody/certs/jitsi.crt:/etc/nginx/jitsi.crt:ro"
|
||||||
- "./prosody/certs/jitsi.key:/etc/nginx/jitsi.key:ro"
|
- "./prosody/certs/jitsi.key:/etc/nginx/jitsi.key:ro"
|
||||||
|
|
Loading…
Reference in a new issue