From f618bdf5bd3612671019cc528ee1202143909141 Mon Sep 17 00:00:00 2001
From: Luan Estradioto <luanestradioto@gmail.com>
Date: Thu, 31 Oct 2024 23:32:52 -0300
Subject: [PATCH] removed env

---
 templates/compose/jitsi.env  |  8 --------
 templates/compose/jitsi.yaml | 19 ++++++++++++-------
 2 files changed, 12 insertions(+), 15 deletions(-)
 delete mode 100644 templates/compose/jitsi.env

diff --git a/templates/compose/jitsi.env b/templates/compose/jitsi.env
deleted file mode 100644
index 46816cb73..000000000
--- a/templates/compose/jitsi.env
+++ /dev/null
@@ -1,8 +0,0 @@
-JITSI_IMAGE_VERSION=unstable
-JIBRI_RECORDER_PASSWORD=$SERVICE_PASSWORD_JITSI
-JIBRI_XMPP_PASSWORD=$SERVICE_PASSWORD_JITSI
-JICOFO_AUTH_PASSWORD=$SERVICE_PASSWORD_JITSI
-JIGASI_XMPP_PASSWORD=$SERVICE_PASSWORD_JITSI
-JVB_AUTH_PASSWORD=$SERVICE_PASSWORD_JITSI
-PUBLIC_URL=
-TZ=UTC
\ No newline at end of file
diff --git a/templates/compose/jitsi.yaml b/templates/compose/jitsi.yaml
index 34155701a..957661c1d 100644
--- a/templates/compose/jitsi.yaml
+++ b/templates/compose/jitsi.yaml
@@ -1,12 +1,11 @@
 # documentation: https://jitsi.github.io/handbook/docs/intro
 # slogan: World's easiest way to add meetings to your apps
-# env_file: jitsi.env
 # logo: svgs/jitsi.svg
 # tags: video, conferencing, meetings, communication, open-source
 
 services:
   jitsi-web:
-    image: "jitsi/web:${JITSI_IMAGE_VERSION}"
+    image: "jitsi/web:${JITSI_IMAGE_VERSION:-unstable}"
     container_name: jitsi-web
     restart: unless-stopped
     ports:
@@ -19,7 +18,13 @@ services:
     environment:
       - SERVICE_FQDN_JITSI
       - PUBLIC_URL=$SERVICE_FQDN_JITSI
-      - TZ
+      - JITSI_IMAGE_VERSION=unstable
+      - JIBRI_RECORDER_PASSWORD=$SERVICE_PASSWORD_JITSI
+      - JIBRI_XMPP_PASSWORD=$SERVICE_PASSWORD_JITSI
+      - JICOFO_AUTH_PASSWORD=$SERVICE_PASSWORD_JITSI
+      - JIGASI_XMPP_PASSWORD=$SERVICE_PASSWORD_JITSI
+      - JVB_AUTH_PASSWORD=$SERVICE_PASSWORD_JITSI
+      - TZ=UTC
     networks:
       meet.jitsi:
         aliases:
@@ -33,7 +38,7 @@ services:
       retries: 15
 
   prosody:
-    image: "jitsi/prosody:${JITSI_IMAGE_VERSION}"
+    image: "jitsi/prosody:${JITSI_IMAGE_VERSION:-unstable}"
     expose:
       - '5222'
       - '5347'
@@ -59,7 +64,7 @@ services:
       retries: 15
 
   jicofo:
-    image: "jitsi/jicofo:${JITSI_IMAGE_VERSION}"
+    image: "jitsi/jicofo:${JITSI_IMAGE_VERSION:-unstable}"
     container_name: jitsi-jicofo
     restart: unless-stopped
     volumes:
@@ -80,7 +85,7 @@ services:
       retries: 15
 
   jvb:
-    image: "jitsi/jvb:${JITSI_IMAGE_VERSION}"
+    image: "jitsi/jvb:${JITSI_IMAGE_VERSION:-unstable}"
     container_name: jitsi-jvb
     restart: unless-stopped
     expose:
@@ -117,4 +122,4 @@ volumes:
   jitsi-web:
   jitsi-xmpp:
   jitsi-jicofo:
-  jitsi-jvb:
\ No newline at end of file
+  jitsi-jvb: