aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2020-04-27 19:02:00 +0200
committerQuentin Dufour <quentin@deuxfleurs.fr>2020-04-27 19:02:00 +0200
commit6060d05c200a74096fcbe2bc563ef5bf425f508d (patch)
tree97accb9429744bf8c996474f5a7272e0171c8a8b
parent7a5a701bbf8abcfec6f6364687696581186bb8a3 (diff)
downloadinfrastructure-6060d05c200a74096fcbe2bc563ef5bf425f508d.tar.gz
infrastructure-6060d05c200a74096fcbe2bc563ef5bf425f508d.zip
Fix front version
-rw-r--r--docker/jitsi/02_run.yml4
-rw-r--r--docker/jitsi/jitsi-front/Dockerfile11
-rw-r--r--nomad/jitsi.hcl2
3 files changed, 9 insertions, 8 deletions
diff --git a/docker/jitsi/02_run.yml b/docker/jitsi/02_run.yml
index 8d0fe75..3fc0e26 100644
--- a/docker/jitsi/02_run.yml
+++ b/docker/jitsi/02_run.yml
@@ -13,9 +13,9 @@ services:
jitsi-front:
build:
context: ./jitsi-front
- #network: host
+ network: host
#^-- I have some DNS problems on Fedora 32 in Docker
- image: superboum/amd64_jitsi_front:v4
+ image: superboum/amd64_jitsi_front:v5
ports:
- "443:443"
env_file: [ 'dev.env' ]
diff --git a/docker/jitsi/jitsi-front/Dockerfile b/docker/jitsi/jitsi-front/Dockerfile
index 62fa166..d30682c 100644
--- a/docker/jitsi/jitsi-front/Dockerfile
+++ b/docker/jitsi/jitsi-front/Dockerfile
@@ -1,13 +1,14 @@
FROM debian:buster AS builder
+ENV VERSION=4048
RUN apt-get update && \
- apt-get install -y npm git nodejs make && \
- git clone --depth=1 https://github.com/jitsi/jitsi-meet.git && \
+ apt-get install -y npm git nodejs make wget unzip && \
+ wget https://github.com/jitsi/jitsi-meet/archive/${VERSION}.zip -O jitsi-meet.zip && \
+ unzip jitsi-meet.zip && \
+ mv jitsi-meet-${VERSION} jitsi-meet && \
cd jitsi-meet && \
npm install && \
- make
-
-RUN cd jitsi-meet && \
+ make && \
sed -i \
"s/OPTIMAL_BROWSERS: \[.*\],/ OPTIMAL_BROWSERS: [ 'chrome', 'chromium', 'nwjs', 'electron' ],/g" \
interface_config.js && \
diff --git a/nomad/jitsi.hcl b/nomad/jitsi.hcl
index b0ccb3a..e037fe1 100644
--- a/nomad/jitsi.hcl
+++ b/nomad/jitsi.hcl
@@ -93,7 +93,7 @@ job "jitsi" {
task "front" {
driver = "docker"
config {
- image = "superboum/amd64_jitsi_front:v4"
+ image = "superboum/amd64_jitsi_front:v5"
network_mode = "host"
port_map {
https_port = 443