Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Jitsi-Auto-Config
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Armin Co
Jitsi-Auto-Config
Commits
2cc69340
Commit
2cc69340
authored
Oct 24, 2020
by
Armin Co
Browse files
Options
Downloads
Patches
Plain Diff
Specify environment file fot jitsi
parent
a14a543d
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
docker-compose.patch
+32
-3
32 additions, 3 deletions
docker-compose.patch
jitsi_setup.sh
+1
-1
1 addition, 1 deletion
jitsi_setup.sh
with
33 additions
and
4 deletions
docker-compose.patch
+
32
−
3
View file @
2cc69340
--- jitsi/docker-compose.yml 2020-10-24 20:19:22.247496797 +0000
+++ "jitsi/docker-compose copy.yml" 2020-10-24 2
0:1
9:5
3
.3
98937390
+0000
@@ -1,10 +1,1
1
@@
+++ "jitsi/docker-compose copy.yml" 2020-10-24 2
1:0
9:5
4
.3
19939217
+0000
@@ -1,10 +1,1
3
@@
-version: '3'
+version: '3.4'
...
...
@@ -10,10 +10,12 @@
image: jitsi/web:latest
restart: ${RESTART_POLICY}
+ container_name: jitsi_web
+ env_file:
+ - env
ports:
- '${HTTP_PORT}:80'
- '${HTTPS_PORT}:443'
@@ -90,6 +9
1
,7 @@
@@ -90,6 +9
3
,7 @@
- XMPP_MUC_DOMAIN
- XMPP_RECORDER_DOMAIN
networks:
...
...
@@ -21,3 +23,30 @@
meet.jitsi:
aliases:
- ${XMPP_DOMAIN}
@@ -98,6 +102,8 @@
prosody:
image: jitsi/prosody:latest
restart: ${RESTART_POLICY}
+ env_file:
+ - env
expose:
- '5222'
- '5347'
@@ -164,6 +170,8 @@
jicofo:
image: jitsi/jicofo:latest
restart: ${RESTART_POLICY}
+ env_file:
+ - env
volumes:
- ${CONFIG}/jicofo:/config:Z
environment:
@@ -193,6 +201,8 @@
jvb:
image: jitsi/jvb:latest
restart: ${RESTART_POLICY}
+ env_file:
+ - env
ports:
- '${JVB_PORT}:${JVB_PORT}/udp'
- '${JVB_TCP_PORT}:${JVB_TCP_PORT}'
This diff is collapsed.
Click to expand it.
jitsi_setup.sh
+
1
−
1
View file @
2cc69340
...
...
@@ -59,4 +59,4 @@ cp ../jitsi-auto-config/jitsi.subdomain.conf.example ../letsencrypt-webserver/re
# Move environment variables
# to the correct position
# for docker-compose
cp
.env ../.env
\ No newline at end of file
cp
.env
env
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment