From 0c05730a5df3fa7f5e9884f265f4903453dfffb2 Mon Sep 17 00:00:00 2001
From: Quentin <quentin@deuxfleurs.fr>
Date: Sat, 12 Sep 2020 11:27:32 +0200
Subject: Rationalize container building

---
 app_build/jitsi-conference-focus/Dockerfile | 7 ++++---
 app_build/jitsi-meet/Dockerfile             | 8 +++++---
 app_build/jitsi-videobridge/Dockerfile      | 7 ++++---
 3 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'app_build')

diff --git a/app_build/jitsi-conference-focus/Dockerfile b/app_build/jitsi-conference-focus/Dockerfile
index efb3010..7fde9b0 100644
--- a/app_build/jitsi-conference-focus/Dockerfile
+++ b/app_build/jitsi-conference-focus/Dockerfile
@@ -4,9 +4,10 @@ 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 && \
-    unzip jicofo.zip && \
-    mv jicofo-jitsi-meet_${VERSION} jicofo && \
+    wget https://github.com/jitsi/jicofo/archive/${PREFIXV}${VERSION}.zip -O jicofo.zip
+
+RUN unzip jicofo.zip && \
+    mv jicofo-jitsi-meet_*${VERSION} jicofo && \
     cd jicofo && \
     mvn package -DskipTests -Dassembly.skipAssembly=false && \
     unzip target/jicofo-1.1-SNAPSHOT-archive.zip && \
diff --git a/app_build/jitsi-meet/Dockerfile b/app_build/jitsi-meet/Dockerfile
index 7f84d9d..16b6557 100644
--- a/app_build/jitsi-meet/Dockerfile
+++ b/app_build/jitsi-meet/Dockerfile
@@ -2,11 +2,13 @@ FROM debian:buster AS builder
 
 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/${PREFIXV}${VERSION}.zip -O jitsi-meet.zip && \
-    unzip jitsi-meet.zip && \
-    mv jitsi-meet-${VERSION} jitsi-meet && \
+    wget https://github.com/jitsi/jitsi-meet/archive/${PREFIXV}${VERSION}.zip -O jitsi-meet.zip
+
+RUN unzip jitsi-meet.zip && \
+    mv jitsi-meet-*${VERSION} jitsi-meet && \
     cd jitsi-meet && \
     npm install && \
     make
diff --git a/app_build/jitsi-videobridge/Dockerfile b/app_build/jitsi-videobridge/Dockerfile
index f18c156..530dc59 100644
--- a/app_build/jitsi-videobridge/Dockerfile
+++ b/app_build/jitsi-videobridge/Dockerfile
@@ -5,9 +5,10 @@ ARG VERSION
 
 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 && \
+    wget https://github.com/jitsi/jitsi-videobridge/archive/${PREFIXV}${VERSION}.zip -O jvb.zip
+
+RUN unzip jvb.zip && \
+    mv jitsi-videobridge-*${VERSION} jvb && \
     cd jvb && \
     mvn package  -DskipTests && \
     unzip target/jitsi-videobridge-*.zip && \
-- 
cgit v1.2.3