File tree 4 files changed +5
-5
lines changed
4 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -427,5 +427,5 @@ make a high-quality Docker image for Zulip possible.
427
427
[ install-normal ] : https://zulip.readthedocs.io/en/latest/production/install.html#installer-options
428
428
[ outgoing-email ] : https://zulip.readthedocs.io/en/latest/production/email.html
429
429
[ server-settings ] : https://zulip.readthedocs.io/en/latest/production/settings.html
430
- [ prod-settings-template ] : https://github.com/zulip/zulip/blob/master /zproject/prod_settings_template.py
430
+ [ prod-settings-template ] : https://github.com/zulip/zulip/blob/main /zproject/prod_settings_template.py
431
431
[ create-organization ] : http://zulip.readthedocs.io/en/latest/production/install.html#step-3-create-a-zulip-organization-and-log-in
Original file line number Diff line number Diff line change @@ -85,11 +85,11 @@ docker-compose exec -u zulip zulip cat /home/zulip/deployments/current/version.p
85
85
args :
86
86
# Change these if you want to build zulip from a different repo/branch
87
87
ZULIP_GIT_URL : https://github.com/zulip/zulip.git
88
- ZULIP_GIT_REF : master
88
+ ZULIP_GIT_REF : main
89
89
` ` `
90
90
91
91
You can set ` ZULIP_GIT_URL` to any clone of the zulip/zulip git repository,
92
- and `ZULIP_GIT_REF` to be any ref name in that repository (e.g. `master ` or
92
+ and `ZULIP_GIT_REF` to be any ref name in that repository (e.g. `main ` or
93
93
` 1.9.0` or `445932cc8613c77ced023125248c8b966b3b7528`).
94
94
95
95
2. Run `docker-compose build zulip` to build a Zulip Docker image from the
Original file line number Diff line number Diff line change 7
7
# password: set-secure-password
8
8
9
9
# Add any other environment variables you want to configure here.
10
- # based on; https://github.com/zulip/docker-zulip/blob/master /docker-compose.yml#L63
10
+ # based on; https://github.com/zulip/docker-zulip/blob/main /docker-compose.yml#L63
11
11
# these values will be merged with db secrets and hosts/ports
12
12
environment:
13
13
# Domain
Original file line number Diff line number Diff line change @@ -125,7 +125,7 @@ affinity: {}
125
125
126
126
zulip :
127
127
# # Environment variables based on
128
- # # https://github.com/zulip/docker-zulip/blob/master /docker-compose.yml#L63
128
+ # # https://github.com/zulip/docker-zulip/blob/main /docker-compose.yml#L63
129
129
environment :
130
130
# # Disable the default Zulip requirement of HTTPS. HTTPS and
131
131
# # certificates are managed by the Kubernetes cluster, so by
You can’t perform that action at this time.
0 commit comments