diff options
| -rw-r--r-- | app_build/docker-compose.yml | 3 | ||||
| -rw-r--r-- | app_build/jitsi-conference-focus/Dockerfile | 5 | ||||
| -rw-r--r-- | app_build/jitsi-meet/Dockerfile | 13 | ||||
| -rw-r--r-- | app_build/jitsi-videobridge/Dockerfile | 9 | ||||
| -rw-r--r-- | app_integration/jitsi/01_gen_certs.yml | 2 | ||||
| -rw-r--r-- | app_integration/jitsi/02_run.yml | 21 |
6 files changed, 21 insertions, 32 deletions
diff --git a/app_build/docker-compose.yml b/app_build/docker-compose.yml index afe363d..b7c17c1 100644 --- a/app_build/docker-compose.yml +++ b/app_build/docker-compose.yml @@ -33,6 +33,7 @@ services: context: ./jitsi-meet args: # https://github.com/jitsi/jitsi-meet + PREFIXV: stable/jitsi-meet_ VERSION: 4966 image: superboum/amd64_jitsi_meet:v1 @@ -41,6 +42,7 @@ services: context: ./jitsi-conference-focus args: # https://github.com/jitsi/jicofo + PREFIXV: stable/jitsi-meet_ VERSION: 4966 image: superboum/amd64_jitsi_conference_focus:v3 @@ -49,6 +51,7 @@ services: context: ./jitsi-videobridge args: # https://github.com/jitsi/jitsi-videobridge + PREFIXV: stable/jitsi-meet_ VERSION: 4966 image: superboum/amd64_jitsi_videobridge:v10 diff --git a/app_build/jitsi-conference-focus/Dockerfile b/app_build/jitsi-conference-focus/Dockerfile index 8999966..efb3010 100644 --- a/app_build/jitsi-conference-focus/Dockerfile +++ b/app_build/jitsi-conference-focus/Dockerfile @@ -1,9 +1,10 @@ FROM debian:buster AS builder -#ENV VERSION=4510 +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/jitsi-meet_${VERSION}.zip -O jicofo.zip && \ + wget https://github.com/jitsi/jicofo/archive/${PREFIXV}${VERSION}.zip -O jicofo.zip && \ unzip jicofo.zip && \ mv jicofo-jitsi-meet_${VERSION} jicofo && \ cd jicofo && \ diff --git a/app_build/jitsi-meet/Dockerfile b/app_build/jitsi-meet/Dockerfile index 0d908eb..7f84d9d 100644 --- a/app_build/jitsi-meet/Dockerfile +++ b/app_build/jitsi-meet/Dockerfile @@ -1,20 +1,15 @@ FROM debian:buster AS builder -#ENV VERSION=4048 +ARG PREFIXV +ARG VERSION RUN apt-get update && \ apt-get install -y npm git nodejs make wget unzip && \ - wget https://github.com/jitsi/jitsi-meet/archive/${VERSION}.zip -O jitsi-meet.zip && \ + wget https://github.com/jitsi/jitsi-meet/archive/${PREFIXV}${VERSION}.zip -O jitsi-meet.zip && \ unzip jitsi-meet.zip && \ mv jitsi-meet-${VERSION} jitsi-meet && \ cd jitsi-meet && \ npm install && \ - make && \ - sed -i \ - "s/OPTIMAL_BROWSERS: \[.*\],/ OPTIMAL_BROWSERS: [ 'chrome', 'chromium', 'nwjs', 'electron' ],/g" \ - interface_config.js && \ - sed -i \ - "s/UNSUPPORTED_BROWSERS: \[.*\],/ UNSUPPORTED_BROWSERS: [ 'firefox' ],/g" \ - interface_config.js + make FROM debian:buster diff --git a/app_build/jitsi-videobridge/Dockerfile b/app_build/jitsi-videobridge/Dockerfile index c144e34..f18c156 100644 --- a/app_build/jitsi-videobridge/Dockerfile +++ b/app_build/jitsi-videobridge/Dockerfile @@ -1,10 +1,11 @@ FROM debian:buster AS builder -RUN apt-get update && \ - apt-get install -y wget unzip maven openjdk-11-jdk +ARG PREFIXV +ARG VERSION -#ENV VERSION=4468 -RUN wget https://github.com/jitsi/jitsi-videobridge/archive/stable/jitsi-meet_${VERSION}.zip -O jvb.zip && \ +RUN apt-get update && \ + apt-get install -y wget unzip maven openjdk-11-jdk && \ + wget https://github.com/jitsi/jitsi-videobridge/archive/${PREFIXV}${VERSION}.zip -O jvb.zip && \ unzip jvb.zip && \ mv jitsi-videobridge-stable-jitsi-meet_${VERSION} jvb && \ cd jvb && \ diff --git a/app_integration/jitsi/01_gen_certs.yml b/app_integration/jitsi/01_gen_certs.yml index 8c97384..c283f53 100644 --- a/app_integration/jitsi/01_gen_certs.yml +++ b/app_integration/jitsi/01_gen_certs.yml @@ -1,7 +1,7 @@ version: '3' services: jitsi-xmpp: - build: ./jitsi-xmpp + image: ./jitsi-xmpp command: ["/usr/local/bin/xmpp_gen"] volumes: [ './jitsi-certs/:/certs:rw' ] env_file: [ 'dev.env' ] diff --git a/app_integration/jitsi/02_run.yml b/app_integration/jitsi/02_run.yml index 3fc0e26..79127cb 100644 --- a/app_integration/jitsi/02_run.yml +++ b/app_integration/jitsi/02_run.yml @@ -1,8 +1,7 @@ version: '3.4' services: jitsi-xmpp: - build: ./jitsi-xmpp - image: superboum/amd64_jitsi_xmpp:v1 + image: superboum/amd64_jitsi_xmpp:v2 network_mode: host ports: - "5222:5222" @@ -10,28 +9,18 @@ services: - "5280:5280" env_file: [ 'dev.env' ] volumes: [ './jitsi-certs/:/certs:ro' ] - jitsi-front: - build: - context: ./jitsi-front - network: host - #^-- I have some DNS problems on Fedora 32 in Docker - image: superboum/amd64_jitsi_front:v5 + jitsi-meet: + image: superboum/amd64_jitsi_meet:v1 ports: - "443:443" env_file: [ 'dev.env' ] volumes: [ './jitsi-certs/:/certs:ro' ] jitsi-conference-focus: - build: - context: ./jitsi-conference-focus - network: host - image: superboum/amd64_jitsi_conference_focus:v2 + image: superboum/amd64_jitsi_conference_focus:v3 env_file: [ 'dev.env' ] volumes: [ './jitsi-certs/:/certs:ro' ] jitsi-videobridge: - build: - context: ./jitsi-videobridge - network: host - image: superboum/amd64_jitsi_videobridge:v9 + image: superboum/amd64_jitsi_videobridge:v10 network_mode: host ports: - "8080:8080/tcp" |