feature/latest-upstream-docker-compose #2

Merged
jotbe merged 9 commits from feature/latest-upstream-docker-compose into master 2022-10-03 00:59:35 +02:00
Showing only changes of commit fb6cb0c52d - Show all commits

View file

@ -10,17 +10,11 @@ services:
- ${CONFIG}/web/letsencrypt:/etc/letsencrypt - ${CONFIG}/web/letsencrypt:/etc/letsencrypt
- ${CONFIG}/transcripts:/usr/share/jitsi-meet/transcripts - ${CONFIG}/transcripts:/usr/share/jitsi-meet/transcripts
environment: environment:
- ENABLE_LETSENCRYPT
- ENABLE_HTTP_REDIRECT
- ENABLE_XMPP_WEBSOCKET
- DISABLE_HTTPS
- PUBLIC_URL
- TZ
- AMPLITUDE_ID - AMPLITUDE_ID
- ANALYTICS_SCRIPT_URLS - ANALYTICS_SCRIPT_URLS
- ANALYTICS_WHITELISTED_EVENTS - ANALYTICS_WHITELISTED_EVENTS
- BRIDGE_CHANNEL
- BRANDING_DATA_URL - BRANDING_DATA_URL
- BRIDGE_CHANNEL
- CALLSTATS_CUSTOM_SCRIPT_URL - CALLSTATS_CUSTOM_SCRIPT_URL
- CALLSTATS_ID - CALLSTATS_ID
- CALLSTATS_SECRET - CALLSTATS_SECRET
@ -33,6 +27,7 @@ services:
- DIALIN_NUMBERS_URL - DIALIN_NUMBERS_URL
- DIALOUT_AUTH_URL - DIALOUT_AUTH_URL
- DIALOUT_CODES_URL - DIALOUT_CODES_URL
- DISABLE_HTTPS
- DROPBOX_APPKEY - DROPBOX_APPKEY
- DROPBOX_REDIRECT_URI - DROPBOX_REDIRECT_URI
- ENABLE_AUDIO_PROCESSING - ENABLE_AUDIO_PROCESSING
@ -41,7 +36,9 @@ services:
- ENABLE_FILE_RECORDING_SERVICE - ENABLE_FILE_RECORDING_SERVICE
- ENABLE_FILE_RECORDING_SERVICE_SHARING - ENABLE_FILE_RECORDING_SERVICE_SHARING
- ENABLE_GUESTS - ENABLE_GUESTS
- ENABLE_HTTP_REDIRECT
- ENABLE_IPV6 - ENABLE_IPV6
- ENABLE_LETSENCRYPT
- ENABLE_LIPSYNC - ENABLE_LIPSYNC
- ENABLE_NO_AUDIO_DETECTION - ENABLE_NO_AUDIO_DETECTION
- ENABLE_P2P - ENABLE_P2P
@ -56,6 +53,7 @@ services:
- ENABLE_TALK_WHILE_MUTED - ENABLE_TALK_WHILE_MUTED
- ENABLE_TCC - ENABLE_TCC
- ENABLE_TRANSCRIPTIONS - ENABLE_TRANSCRIPTIONS
- ENABLE_XMPP_WEBSOCKET
- ETHERPAD_PUBLIC_URL - ETHERPAD_PUBLIC_URL
- ETHERPAD_URL_BASE - ETHERPAD_URL_BASE
- GOOGLE_ANALYTICS_ID - GOOGLE_ANALYTICS_ID
@ -67,16 +65,18 @@ services:
- MICROSOFT_API_APP_CLIENT_ID - MICROSOFT_API_APP_CLIENT_ID
- NGINX_RESOLVER - NGINX_RESOLVER
- PEOPLE_SEARCH_URL - PEOPLE_SEARCH_URL
- PUBLIC_URL
- RESOLUTION - RESOLUTION
- RESOLUTION_MIN - RESOLUTION_MIN
- RESOLUTION_WIDTH - RESOLUTION_WIDTH
- RESOLUTION_WIDTH_MIN - RESOLUTION_WIDTH_MIN
- START_AUDIO_ONLY
- START_AUDIO_MUTED - START_AUDIO_MUTED
- START_AUDIO_ONLY
- START_BITRATE - START_BITRATE
- START_VIDEO_MUTED - START_VIDEO_MUTED
- TESTING_CAP_SCREENSHARE_BITRATE - TESTING_CAP_SCREENSHARE_BITRATE
- TESTING_OCTO_PROBABILITY - TESTING_OCTO_PROBABILITY
- TZ
- XMPP_AUTH_DOMAIN - XMPP_AUTH_DOMAIN
- XMPP_BOSH_URL_BASE - XMPP_BOSH_URL_BASE
- XMPP_DOMAIN - XMPP_DOMAIN
@ -122,52 +122,52 @@ services:
- ENABLE_GUESTS - ENABLE_GUESTS
- ENABLE_LOBBY - ENABLE_LOBBY
- ENABLE_XMPP_WEBSOCKET - ENABLE_XMPP_WEBSOCKET
- GLOBAL_MODULES
- GLOBAL_CONFIG - GLOBAL_CONFIG
- LDAP_URL - GLOBAL_MODULES
- JIBRI_RECORDER_PASSWORD
- JIBRI_RECORDER_USER
- JIBRI_XMPP_PASSWORD
- JIBRI_XMPP_USER
- JICOFO_AUTH_PASSWORD
- JICOFO_AUTH_USER
- JICOFO_COMPONENT_SECRET
- JIGASI_XMPP_PASSWORD
- JIGASI_XMPP_USER
- JVB_AUTH_PASSWORD
- JVB_AUTH_USER
- JWT_ACCEPTED_AUDIENCES
- JWT_ACCEPTED_ISSUERS
- JWT_ALLOW_EMPTY
- JWT_APP_ID
- JWT_APP_SECRET
- JWT_ASAP_KEYSERVER
- JWT_AUTH_TYPE
- JWT_TOKEN_AUTH_MODULE
- LDAP_AUTH_METHOD
- LDAP_BASE - LDAP_BASE
- LDAP_BINDDN - LDAP_BINDDN
- LDAP_BINDPW - LDAP_BINDPW
- LDAP_FILTER - LDAP_FILTER
- LDAP_AUTH_METHOD
- LDAP_VERSION
- LDAP_USE_TLS
- LDAP_TLS_CIPHERS
- LDAP_TLS_CHECK_PEER
- LDAP_TLS_CACERT_FILE
- LDAP_TLS_CACERT_DIR
- LDAP_START_TLS - LDAP_START_TLS
- XMPP_DOMAIN - LDAP_TLS_CACERT_DIR
- XMPP_AUTH_DOMAIN - LDAP_TLS_CACERT_FILE
- XMPP_GUEST_DOMAIN - LDAP_TLS_CHECK_PEER
- XMPP_MUC_DOMAIN - LDAP_TLS_CIPHERS
- XMPP_INTERNAL_MUC_DOMAIN - LDAP_URL
- XMPP_MODULES - LDAP_USE_TLS
- XMPP_MUC_MODULES - LDAP_VERSION
- XMPP_INTERNAL_MUC_MODULES
- XMPP_RECORDER_DOMAIN
- JICOFO_COMPONENT_SECRET
- JICOFO_AUTH_USER
- JICOFO_AUTH_PASSWORD
- JVB_AUTH_USER
- JVB_AUTH_PASSWORD
- JIGASI_XMPP_USER
- JIGASI_XMPP_PASSWORD
- JIBRI_XMPP_USER
- JIBRI_XMPP_PASSWORD
- JIBRI_RECORDER_USER
- JIBRI_RECORDER_PASSWORD
- JWT_APP_ID
- JWT_APP_SECRET
- JWT_ACCEPTED_ISSUERS
- JWT_ACCEPTED_AUDIENCES
- JWT_ASAP_KEYSERVER
- JWT_ALLOW_EMPTY
- JWT_AUTH_TYPE
- JWT_TOKEN_AUTH_MODULE
- LOG_LEVEL - LOG_LEVEL
- PUBLIC_URL - PUBLIC_URL
- TZ - TZ
- XMPP_AUTH_DOMAIN
- XMPP_DOMAIN
- XMPP_GUEST_DOMAIN
- XMPP_INTERNAL_MUC_DOMAIN
- XMPP_INTERNAL_MUC_MODULES
- XMPP_MODULES
- XMPP_MUC_DOMAIN
- XMPP_MUC_MODULES
- XMPP_RECORDER_DOMAIN
networks: networks:
meet.jitsi: meet.jitsi:
aliases: aliases:
@ -181,19 +181,19 @@ services:
- ${CONFIG}/jicofo:/config - ${CONFIG}/jicofo:/config
environment: environment:
- ENABLE_AUTH - ENABLE_AUTH
- XMPP_DOMAIN
- XMPP_AUTH_DOMAIN
- XMPP_INTERNAL_MUC_DOMAIN
- XMPP_SERVER
- JICOFO_COMPONENT_SECRET
- JICOFO_AUTH_USER
- JICOFO_AUTH_PASSWORD
- JICOFO_RESERVATION_REST_BASE_URL
- JVB_BREWERY_MUC
- JIGASI_BREWERY_MUC
- JIBRI_BREWERY_MUC - JIBRI_BREWERY_MUC
- JIBRI_PENDING_TIMEOUT - JIBRI_PENDING_TIMEOUT
- JICOFO_AUTH_PASSWORD
- JICOFO_AUTH_USER
- JICOFO_COMPONENT_SECRET
- JICOFO_RESERVATION_REST_BASE_URL
- JIGASI_BREWERY_MUC
- JVB_BREWERY_MUC
- TZ - TZ
- XMPP_AUTH_DOMAIN
- XMPP_DOMAIN
- XMPP_INTERNAL_MUC_DOMAIN
- XMPP_SERVER
depends_on: depends_on:
- prosody - prosody
networks: networks:
@ -210,22 +210,22 @@ services:
- ${CONFIG}/jvb:/config - ${CONFIG}/jvb:/config
environment: environment:
- DOCKER_HOST_ADDRESS - DOCKER_HOST_ADDRESS
- XMPP_AUTH_DOMAIN
- XMPP_INTERNAL_MUC_DOMAIN
- XMPP_SERVER
- JVB_AUTH_USER
- JVB_AUTH_PASSWORD - JVB_AUTH_PASSWORD
- JVB_AUTH_USER
- JVB_BREWERY_MUC - JVB_BREWERY_MUC
- JVB_PORT
- JVB_TCP_HARVESTER_DISABLED
- JVB_TCP_PORT
- JVB_TCP_MAPPED_PORT
- JVB_STUN_SERVERS
- JVB_ENABLE_APIS - JVB_ENABLE_APIS
- JVB_PORT
- JVB_STUN_SERVERS
- JVB_TCP_HARVESTER_DISABLED
- JVB_TCP_MAPPED_PORT
- JVB_TCP_PORT
- JVB_WS_DOMAIN - JVB_WS_DOMAIN
- JVB_WS_SERVER_ID - JVB_WS_SERVER_ID
- PUBLIC_URL - PUBLIC_URL
- TZ - TZ
- XMPP_AUTH_DOMAIN
- XMPP_INTERNAL_MUC_DOMAIN
- XMPP_SERVER
depends_on: depends_on:
- prosody - prosody
networks: networks: