paulmataruso/docker-zulip
1
0
Fork 0
mirror of https://github.com/zulip/docker-zulip.git synced 2025-10-23 04:51:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update stale "master" branch references to "main".

Browse Source 
We renamed master->main a long time ago.
This commit is contained in:
Mateusz Mandera
2025-02-07 15:56:53 +08:00
committed by Tim Abbott
parent 0d712d5151
commit fd42606aae
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -427,5 +427,5 @@ make a high-quality Docker image for Zulip possible.
[install-normal]: https://zulip.readthedocs.io/en/latest/production/install.html#installer-options
[outgoing-email]: https://zulip.readthedocs.io/en/latest/production/email.html
[server-settings]: https://zulip.readthedocs.io/en/latest/production/settings.html
[prod-settings-template]: https://github.com/zulip/zulip/blob/master/zproject/prod_settings_template.py
[prod-settings-template]: https://github.com/zulip/zulip/blob/main/zproject/prod_settings_template.py
[create-organization]: http://zulip.readthedocs.io/en/latest/production/install.html#step-3-create-a-zulip-organization-and-log-in

4
UPGRADING.md
View File

@@ -85,11 +85,11 @@ docker-compose exec -u zulip zulip cat /home/zulip/deployments/current/version.p
args:
# Change these if you want to build zulip from a different repo/branch
ZULIP_GIT_URL: https://github.com/zulip/zulip.git
ZULIP_GIT_REF: master
ZULIP_GIT_REF: main
```
You can set `ZULIP_GIT_URL` to any clone of the zulip/zulip git repository,
and `ZULIP_GIT_REF` to be any ref name in that repository (e.g. `master` or
and `ZULIP_GIT_REF` to be any ref name in that repository (e.g. `main` or
`1.9.0` or `445932cc8613c77ced023125248c8b966b3b7528`).
2. Run `docker-compose build zulip` to build a Zulip Docker image from the

2
kubernetes/chart/zulip/values-local.yaml.example
View File

@@ -7,7 +7,7 @@ zulip:
# password: set-secure-password
# Add any other environment variables you want to configure here.
# based on; https://github.com/zulip/docker-zulip/blob/master/docker-compose.yml#L63
# based on; https://github.com/zulip/docker-zulip/blob/main/docker-compose.yml#L63
# these values will be merged with db secrets and hosts/ports
environment:
# Domain

2
kubernetes/chart/zulip/values.yaml
View File

@@ -125,7 +125,7 @@ affinity: {}
zulip:
## Environment variables based on
## https://github.com/zulip/docker-zulip/blob/master/docker-compose.yml#L63
## https://github.com/zulip/docker-zulip/blob/main/docker-compose.yml#L63
environment:
## Disable the default Zulip requirement of HTTPS. HTTPS and
## certificates are managed by the Kubernetes cluster, so by