File tree Expand file tree Collapse file tree 8 files changed +15
-11
lines changed Expand file tree Collapse file tree 8 files changed +15
-11
lines changed Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ WORKDIR /home/zulip
2828# You can specify these in docker-compose.yml or with
2929# docker build --build-arg "ZULIP_GIT_REF=git_branch_name" .
3030ARG ZULIP_GIT_URL=https://github.com/zulip/zulip.git
31- ARG ZULIP_GIT_REF=5.7
31+ ARG ZULIP_GIT_REF=6.0
3232
3333RUN git clone "$ZULIP_GIT_URL" && \
3434 cd zulip && \
Original file line number Diff line number Diff 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:5.7 -0 ` )
9+ - [ ** Docker Hub** ] ( https://hub.docker.com/r/zulip/docker-zulip ) (` docker pull zulip/docker-zulip:6.0 -0 ` )
1010
11- Current Zulip version: ` 5.7 `
12- Current Docker image version: ` 5.7 -0`
11+ Current Zulip version: ` 6.0 `
12+ Current Docker image version: ` 6.0 -0`
1313
1414Project status: ** Alpha** . While this project works and is
1515used by many sites in production, configuring is substantially more
Original file line number Diff line number Diff line change @@ -49,14 +49,14 @@ services:
4949 volumes :
5050 - " redis:/data:rw"
5151 zulip :
52- image : " zulip/docker-zulip:5.7 -0"
52+ image : " zulip/docker-zulip:6.0 -0"
5353 restart : unless-stopped
5454 build :
5555 context : .
5656 args :
5757 # Change these if you want to build zulip from a different repo/branch
5858 ZULIP_GIT_URL : https://github.com/zulip/zulip.git
59- ZULIP_GIT_REF : " 5.7 "
59+ ZULIP_GIT_REF : " 6.0 "
6060 # Set this up if you plan to use your own CA certificate bundle for building
6161 # CUSTOM_CA_CERTIFICATES:
6262 ports :
Original file line number Diff line number Diff line change 1+ ## [ 0.6.0] - 2022-11-23
2+
3+ - Update Zulip Server to 6.0
4+
15## [ 0.5.0] - 2022-11-16
26
37- Update Zulip Server to 5.7
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ version: 0.4.0
1212# incremented each time you make changes to the application. Versions are not expected to
1313# follow Semantic Versioning. They should reflect the version the application is using.
1414# It is recommended to use it with quotes.
15- appVersion : " 5.7 -0"
15+ appVersion : " 6.0 -0"
1616dependencies :
1717 - name : memcached
1818 repository : https://charts.bitnami.com/bitnami
Original file line number Diff line number Diff line change 11# Zulip
22
3- ![ Version: 0.4.0] ( https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square ) ![ Type: application] ( https://img.shields.io/badge/Type-application-informational?style=flat-square ) ![ AppVersion: 5.7 -0] ( https://img.shields.io/badge/AppVersion-5.7 --0-informational?style=flat-square )
3+ ![ Version: 0.4.0] ( https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square ) ![ Type: application] ( https://img.shields.io/badge/Type-application-informational?style=flat-square ) ![ AppVersion: 6.0 -0] ( https://img.shields.io/badge/AppVersion-6.0 --0-informational?style=flat-square )
44
55[ Zulip] ( https://zulip.com/ ) is an open source threaded team chat that helps teams stay productive and focused.
66
@@ -72,7 +72,7 @@ Now you're ready to follow [the installation instructions above](#installation).
7272| fullnameOverride | string | ` "" ` | Fully override common.names.fullname template. |
7373| image.pullPolicy | string | ` "IfNotPresent" ` | Pull policy for Zulip docker image. Ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images |
7474| image.repository | string | ` "zulip/docker-zulip" ` | Defaults to hub.docker.com/zulip/docker-zulip, but can be overwritten with a full HTTPS address. |
75- | image.tag | string | ` "5.7 -0" ` | Zulip image tag (immutable tags are recommended) |
75+ | image.tag | string | ` "6.0 -0" ` | Zulip image tag (immutable tags are recommended) |
7676| imagePullSecrets | list | ` [] ` | Global Docker registry secret names as an array. |
7777| ingress.annotations | object | ` {} ` | Can be used to add custom Ingress annotations. |
7878| ingress.enabled | bool | ` false ` | Enable this to use an Ingress to reach the Zulip service. |
Original file line number Diff line number Diff line change 1515 # Ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images
1616 pullPolicy : IfNotPresent
1717 # -- Zulip image tag (immutable tags are recommended)
18- tag : " 5.7 -0"
18+ tag : " 6.0 -0"
1919
2020# -- Global Docker registry secret names as an array.
2121imagePullSecrets : []
Original file line number Diff line number Diff line change 8686 - name : postgresql-persistent-storage
8787 mountPath : /var/lib/postgresql
8888 - name : zulip
89- image : zulip/docker-zulip:5.7 -0
89+ image : zulip/docker-zulip:6.0 -0
9090 resources :
9191 limits :
9292 cpu : 100m
You can’t perform that action at this time.
0 commit comments