Skip to content

Commit 7b56b6e

Browse files
alexmvalexmv
committed
compose: Pull local settings into compose.overried.yaml.
1 parent e9e785d commit 7b56b6e

File tree

2 files changed

+90
-62
lines changed

2 files changed

+90
-62
lines changed

‎compose.override.yaml‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
---
2+
secrets:
3+
## You can either set these secrets in a file named .env in this directory, or
4+
## change these from "environment:" to "file:" with a path to store them on
5+
## disk. Be sure that files, if you use them, do not contain trailing
6+
## newlines!
7+
##
8+
## You may also add additional secrets here, prefixed with zulip__, (and also
9+
## in the "secrets:" block inside the "zulip" service, below) in order to
10+
## propagate them into Zulip's /etc/zulip/zulip-secrets.conf
11+
##
12+
## --> https://docs.docker.com/reference/compose-file/secrets/
13+
## https://docs.docker.com/compose/how-tos/use-secrets/
14+
zulip__postgres_password:
15+
## Note that you need to do a manual `ALTER ROLE` query if you
16+
## change this on a system after booting the postgres container
17+
## the first time on a host. Instructions are available in README.md.
18+
environment: "ZULIP__POSTGRES_PASSWORD"
19+
zulip__memcached_password:
20+
environment: "ZULIP__MEMCACHED_PASSWORD"
21+
zulip__rabbitmq_password:
22+
environment: "ZULIP__RABBITMQ_PASSWORD"
23+
zulip__redis_password:
24+
environment: "ZULIP__REDIS_PASSWORD"
25+
zulip__secret_key:
26+
environment: "ZULIP__SECRET_KEY"
27+
zulip__email_password:
28+
environment: "ZULIP__EMAIL_PASSWORD"
29+
30+
services:
31+
zulip:
32+
build:
33+
args:
34+
## If you want to build zulip from a different repo/branch, you can
35+
## change these and run:
36+
##
37+
## docker compose build zulip
38+
ZULIP_GIT_URL: https://github.com/zulip/zulip.git
39+
ZULIP_GIT_REF: "11.4"
40+
environment:
41+
## See https://github.com/zulip/docker-zulip#configuration for
42+
## details on this section and how to discover the many
43+
## additional settings that are supported here.
44+
DB_HOST: "database"
45+
DB_HOST_PORT: "5432"
46+
DB_USER: "zulip"
47+
SSL_CERTIFICATE_GENERATION: "self-signed"
48+
SETTING_MEMCACHED_LOCATION: "memcached:11211"
49+
SETTING_RABBITMQ_HOST: "rabbitmq"
50+
SETTING_REDIS_HOST: "redis"
51+
SETTING_EXTERNAL_HOST: "localhost.localdomain"
52+
SETTING_ZULIP_ADMINISTRATOR: "admin@example.com"
53+
SETTING_EMAIL_HOST: "" # e.g. smtp.example.com
54+
SETTING_EMAIL_HOST_USER: "noreply@example.com"
55+
SETTING_EMAIL_PORT: "587"
56+
## It seems that the email server needs to use ssl or tls and can't be used without it
57+
SETTING_EMAIL_USE_SSL: "False"
58+
SETTING_EMAIL_USE_TLS: "True"
59+
## Uncomment to enable the incoming email gateway. You will need to
60+
## ensure that email to emaildomain.example.com is routed to this host
61+
## (e.g. via MX record)
62+
# SETTING_EMAIL_GATEWAY_PATTERN: "%s@emaildomain.example.com"
63+
ZULIP_AUTH_BACKENDS: "EmailAuthBackend"
64+
## Uncomment this when configuring the mobile push notifications service
65+
# SETTING_ZULIP_SERVICE_PUSH_NOTIFICATIONS: "True"
66+
# SETTING_ZULIP_SERVICE_SUBMIT_USAGE_STATISTICS: "True"
67+
68+
## If you're using a reverse proxy, you'll want to provide the
69+
## comma-separated set of IP addresses (or CIDR ranges) to trust here.
70+
# LOADBALANCER_IPS: ""
71+
72+
## By default, files uploaded by users and profile pictures are
73+
## stored directly on the Zulip server. You can configure files
74+
## to be stored in Amazon S3 or a compatible data store
75+
## here. See docs at:
76+
##
77+
## https://zulip.readthedocs.io/en/latest/production/upload-backends.html
78+
##
79+
## If you want to use the S3 backend, you must set
80+
## SETTING_LOCAL_UPLOADS_DIR to None as well as configuring the
81+
## other fields.
82+
# SETTING_LOCAL_UPLOADS_DIR: "None"
83+
# SETTING_S3_AUTH_UPLOADS_BUCKET: ""
84+
# SETTING_S3_AVATAR_BUCKET: ""
85+
# SETTING_S3_ENDPOINT_URL: "None"
86+
# SETTING_S3_REGION: "None"
87+
secrets:
88+
## Add any additional zulip__ secrets that you defined above.
89+
[]

‎compose.yaml‎

Lines changed: 1 addition & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,4 @@
11
---
2-
secrets:
3-
zulip__postgres_password:
4-
## Note that you need to do a manual `ALTER ROLE` query if you
5-
## change this on a system after booting the postgres container
6-
## the first time on a host. Instructions are available in README.md.
7-
environment: "ZULIP__POSTGRES_PASSWORD"
8-
zulip__memcached_password:
9-
environment: "ZULIP__MEMCACHED_PASSWORD"
10-
zulip__rabbitmq_password:
11-
environment: "ZULIP__RABBITMQ_PASSWORD"
12-
zulip__redis_password:
13-
environment: "ZULIP__REDIS_PASSWORD"
14-
zulip__secret_key:
15-
environment: "ZULIP__SECRET_KEY"
16-
zulip__email_password:
17-
environment: "ZULIP__EMAIL_PASSWORD"
18-
192
services:
203
database:
214
image: "zulip/zulip-postgresql:14"
@@ -85,10 +68,6 @@ services:
8568
restart: unless-stopped
8669
build:
8770
context: .
88-
args:
89-
## Change these if you want to build zulip from a different repo/branch
90-
ZULIP_GIT_URL: https://github.com/zulip/zulip.git
91-
ZULIP_GIT_REF: "11.4"
9271
ports:
9372
- name: smtp
9473
target: 25
@@ -110,52 +89,12 @@ services:
11089
- zulip__secret_key
11190
- zulip__email_password
11291
environment:
113-
## See https://github.com/zulip/docker-zulip#configuration for
114-
## details on this section and how to discover the many
115-
## additional settings that are supported here.
92+
# Default hostnames; configure your application in compose.override.yaml
11693
DB_HOST: "database"
11794
DB_HOST_PORT: "5432"
118-
DB_USER: "zulip"
119-
SSL_CERTIFICATE_GENERATION: "self-signed"
12095
SETTING_MEMCACHED_LOCATION: "memcached:11211"
12196
SETTING_RABBITMQ_HOST: "rabbitmq"
12297
SETTING_REDIS_HOST: "redis"
123-
SETTING_EXTERNAL_HOST: "localhost.localdomain"
124-
SETTING_ZULIP_ADMINISTRATOR: "admin@example.com"
125-
SETTING_EMAIL_HOST: "" # e.g. smtp.example.com
126-
SETTING_EMAIL_HOST_USER: "noreply@example.com"
127-
SETTING_EMAIL_PORT: "587"
128-
## It seems that the email server needs to use ssl or tls and can't be used without it
129-
SETTING_EMAIL_USE_SSL: "False"
130-
SETTING_EMAIL_USE_TLS: "True"
131-
## Uncomment to enable the incoming email gateway. You will need to
132-
## ensure that email to emaildomain.example.com is routed to this host
133-
## (e.g. via MX record)
134-
# SETTING_EMAIL_GATEWAY_PATTERN: "%s@emaildomain.example.com"
135-
ZULIP_AUTH_BACKENDS: "EmailAuthBackend"
136-
## Uncomment this when configuring the mobile push notifications service
137-
# SETTING_ZULIP_SERVICE_PUSH_NOTIFICATIONS: "True"
138-
# SETTING_ZULIP_SERVICE_SUBMIT_USAGE_STATISTICS: "True"
139-
140-
## If you're using a reverse proxy, you'll want to provide the
141-
## comma-separated set of IP addresses (or CIDR ranges) to trust here.
142-
# LOADBALANCER_IPS: ""
143-
144-
## By default, files uploaded by users and profile pictures are
145-
## stored directly on the Zulip server. You can configure files
146-
## to be stored in Amazon S3 or a compatible data store
147-
## here. See docs at:
148-
##
149-
## https://zulip.readthedocs.io/en/latest/production/upload-backends.html
150-
##
151-
## If you want to use the S3 backend, you must set
152-
## SETTING_LOCAL_UPLOADS_DIR to None as well as configuring the
153-
## other fields.
154-
# SETTING_LOCAL_UPLOADS_DIR: "None"
155-
# SETTING_S3_AUTH_UPLOADS_BUCKET: ""
156-
# SETTING_S3_AVATAR_BUCKET: ""
157-
# SETTING_S3_ENDPOINT_URL: "None"
158-
# SETTING_S3_REGION: "None"
15998
volumes:
16099
- "zulip:/data:rw"
161100
ulimits:

0 commit comments

Comments
 (0)