Skip to content

Commit 1dfda3b

Browse files
committed
Update versions for Zulip Server 4.4.
1 parent 6d0e462 commit 1dfda3b

File tree

4 files changed

+170
-170
lines changed

4 files changed

+170
-170
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ WORKDIR /home/zulip
2828
# You can specify these in docker-compose.yml or with
2929
# docker build --build-args "ZULIP_GIT_REF=git_branch_name" .
3030
ARG ZULIP_GIT_URL=https://github.com/zulip/zulip.git
31-
ARG ZULIP_GIT_REF=4.3
31+
ARG ZULIP_GIT_REF=4.4
3232

3333
RUN git clone "$ZULIP_GIT_URL" && \
3434
cd zulip && \

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ This is a container image for running [Zulip](https://zulip.com)
66
([GitHub](https://github.com/zulip/zulip)) in
77
[production][prod-overview]. Image available from:
88

9-
* [**Docker Hub**](https://hub.docker.com/r/zulip/docker-zulip) (`docker pull zulip/docker-zulip:4.3-0`)
9+
* [**Docker Hub**](https://hub.docker.com/r/zulip/docker-zulip) (`docker pull zulip/docker-zulip:4.4-0`)
1010

11-
Current Zulip version: `4.3`
12-
Current Docker image version: `4.3-0`
11+
Current Zulip version: `4.4`
12+
Current Docker image version: `4.4-0`
1313

1414
Project status: **Alpha**. While this project works and is
1515
used by many sites in production, configuring is substantially more

docker-compose.yml

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,93 @@
1-
version: '2'
1+
version: "2"
22
services:
33
database:
4-
image: 'zulip/zulip-postgresql:10'
4+
image: "zulip/zulip-postgresql:10"
55
environment:
6-
POSTGRES_DB: 'zulip'
7-
POSTGRES_USER: 'zulip'
6+
POSTGRES_DB: "zulip"
7+
POSTGRES_USER: "zulip"
88
# Note that you need to do a manual `ALTER ROLE` query if you
99
# change this on a system after booting the postgres container
1010
# the first time on a host. Instructions are available in README.md.
11-
POSTGRES_PASSWORD: 'REPLACE_WITH_SECURE_POSTGRES_PASSWORD'
11+
POSTGRES_PASSWORD: "REPLACE_WITH_SECURE_POSTGRES_PASSWORD"
1212
volumes:
13-
- '/opt/docker/zulip/postgresql/data:/var/lib/postgresql/data:rw'
13+
- "/opt/docker/zulip/postgresql/data:/var/lib/postgresql/data:rw"
1414
memcached:
15-
image: 'memcached:alpine'
15+
image: "memcached:alpine"
1616
command:
17-
- 'sh'
18-
- '-euc'
17+
- "sh"
18+
- "-euc"
1919
- |
2020
echo 'mech_list: plain' > "$$SASL_CONF_PATH"
2121
echo "zulip@$$HOSTNAME:$$MEMCACHED_PASSWORD" > "$$MEMCACHED_SASL_PWDB"
2222
echo "zulip@localhost:$$MEMCACHED_PASSWORD" >> "$$MEMCACHED_SASL_PWDB"
2323
exec memcached -S
2424
environment:
25-
SASL_CONF_PATH: '/home/memcache/memcached.conf'
26-
MEMCACHED_SASL_PWDB: '/home/memcache/memcached-sasl-db'
27-
MEMCACHED_PASSWORD: 'REPLACE_WITH_SECURE_MEMCACHED_PASSWORD'
25+
SASL_CONF_PATH: "/home/memcache/memcached.conf"
26+
MEMCACHED_SASL_PWDB: "/home/memcache/memcached-sasl-db"
27+
MEMCACHED_PASSWORD: "REPLACE_WITH_SECURE_MEMCACHED_PASSWORD"
2828
restart: always
2929
rabbitmq:
30-
image: 'rabbitmq:3.7.7'
30+
image: "rabbitmq:3.7.7"
3131
restart: always
3232
environment:
33-
RABBITMQ_DEFAULT_USER: 'zulip'
34-
RABBITMQ_DEFAULT_PASS: 'REPLACE_WITH_SECURE_RABBITMQ_PASSWORD'
33+
RABBITMQ_DEFAULT_USER: "zulip"
34+
RABBITMQ_DEFAULT_PASS: "REPLACE_WITH_SECURE_RABBITMQ_PASSWORD"
3535
volumes:
36-
- '/opt/docker/zulip/rabbitmq:/var/lib/rabbitmq:rw'
36+
- "/opt/docker/zulip/rabbitmq:/var/lib/rabbitmq:rw"
3737
redis:
38-
image: 'redis:alpine'
38+
image: "redis:alpine"
3939
command:
40-
- 'sh'
41-
- '-euc'
40+
- "sh"
41+
- "-euc"
4242
- |
4343
echo "requirepass '$$REDIS_PASSWORD'" > /etc/redis.conf
4444
exec redis-server /etc/redis.conf
4545
environment:
46-
REDIS_PASSWORD: 'REPLACE_WITH_SECURE_REDIS_PASSWORD'
46+
REDIS_PASSWORD: "REPLACE_WITH_SECURE_REDIS_PASSWORD"
4747
volumes:
48-
- '/opt/docker/zulip/redis:/data:rw'
48+
- "/opt/docker/zulip/redis:/data:rw"
4949
zulip:
50-
image: 'zulip/docker-zulip:4.3-0'
50+
image: "zulip/docker-zulip:4.4-0"
5151
build:
5252
context: .
5353
args:
5454
# Change these if you want to build zulip from a different repo/branch
5555
ZULIP_GIT_URL: https://github.com/zulip/zulip.git
56-
ZULIP_GIT_REF: '4.3'
56+
ZULIP_GIT_REF: "4.4"
5757
# Set this up if you plan to use your own CA certificate bundle for building
5858
# CUSTOM_CA_CERTIFICATES:
5959
ports:
60-
- '80:80'
61-
- '443:443'
60+
- "80:80"
61+
- "443:443"
6262
environment:
63-
DB_HOST: 'database'
64-
DB_HOST_PORT: '5432'
65-
DB_USER: 'zulip'
66-
SSL_CERTIFICATE_GENERATION: 'self-signed'
67-
SETTING_MEMCACHED_LOCATION: 'memcached:11211'
68-
SETTING_RABBITMQ_HOST: 'rabbitmq'
69-
SETTING_REDIS_HOST: 'redis'
70-
SECRETS_email_password: '123456789'
63+
DB_HOST: "database"
64+
DB_HOST_PORT: "5432"
65+
DB_USER: "zulip"
66+
SSL_CERTIFICATE_GENERATION: "self-signed"
67+
SETTING_MEMCACHED_LOCATION: "memcached:11211"
68+
SETTING_RABBITMQ_HOST: "rabbitmq"
69+
SETTING_REDIS_HOST: "redis"
70+
SECRETS_email_password: "123456789"
7171
# These should match RABBITMQ_DEFAULT_PASS, POSTGRES_PASSWORD,
7272
# MEMCACHED_PASSWORD, and REDIS_PASSWORD above.
73-
SECRETS_rabbitmq_password: 'REPLACE_WITH_SECURE_RABBITMQ_PASSWORD'
74-
SECRETS_postgres_password: 'REPLACE_WITH_SECURE_POSTGRES_PASSWORD'
75-
SECRETS_memcached_password: 'REPLACE_WITH_SECURE_MEMCACHED_PASSWORD'
76-
SECRETS_redis_password: 'REPLACE_WITH_SECURE_REDIS_PASSWORD'
77-
SECRETS_secret_key: 'REPLACE_WITH_SECURE_SECRET_KEY'
78-
SETTING_EXTERNAL_HOST: 'localhost.localdomain'
79-
SETTING_ZULIP_ADMINISTRATOR: '[email protected]'
80-
SETTING_EMAIL_HOST: '' # e.g. smtp.example.com
81-
SETTING_EMAIL_HOST_USER: '[email protected]'
82-
SETTING_EMAIL_PORT: '587'
73+
SECRETS_rabbitmq_password: "REPLACE_WITH_SECURE_RABBITMQ_PASSWORD"
74+
SECRETS_postgres_password: "REPLACE_WITH_SECURE_POSTGRES_PASSWORD"
75+
SECRETS_memcached_password: "REPLACE_WITH_SECURE_MEMCACHED_PASSWORD"
76+
SECRETS_redis_password: "REPLACE_WITH_SECURE_REDIS_PASSWORD"
77+
SECRETS_secret_key: "REPLACE_WITH_SECURE_SECRET_KEY"
78+
SETTING_EXTERNAL_HOST: "localhost.localdomain"
79+
SETTING_ZULIP_ADMINISTRATOR: "[email protected]"
80+
SETTING_EMAIL_HOST: "" # e.g. smtp.example.com
81+
SETTING_EMAIL_HOST_USER: "[email protected]"
82+
SETTING_EMAIL_PORT: "587"
8383
# It seems that the email server needs to use ssl or tls and can't be used without it
84-
SETTING_EMAIL_USE_SSL: 'False'
85-
SETTING_EMAIL_USE_TLS: 'True'
86-
ZULIP_AUTH_BACKENDS: 'EmailAuthBackend'
84+
SETTING_EMAIL_USE_SSL: "False"
85+
SETTING_EMAIL_USE_TLS: "True"
86+
ZULIP_AUTH_BACKENDS: "EmailAuthBackend"
8787
# Uncomment this when configuring the mobile push notifications service
8888
# SETTING_PUSH_NOTIFICATION_BOUNCER_URL: 'https://push.zulipchat.com'
8989
volumes:
90-
- '/opt/docker/zulip/zulip:/data:rw'
90+
- "/opt/docker/zulip/zulip:/data:rw"
9191
ulimits:
9292
nofile:
9393
soft: 1000000

0 commit comments

Comments
 (0)