Skip to content

Commit

Permalink
Update to Zulip Server 6.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
maltokyo authored and alexmv committed Dec 7, 2022
1 parent 53de96e commit 0f0488a
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ WORKDIR /home/zulip
# You can specify these in docker-compose.yml or with
# docker build --build-arg "ZULIP_GIT_REF=git_branch_name" .
ARG ZULIP_GIT_URL=https://github.com/zulip/zulip.git
ARG ZULIP_GIT_REF=5.7
ARG ZULIP_GIT_REF=6.0

RUN git clone "$ZULIP_GIT_URL" && \
cd zulip && \
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ This is a container image for running [Zulip](https://zulip.com)
([GitHub](https://github.com/zulip/zulip)) in
[production][prod-overview]. Image available from:

- [**Docker Hub**](https://hub.docker.com/r/zulip/docker-zulip) (`docker pull zulip/docker-zulip:5.7-0`)
- [**Docker Hub**](https://hub.docker.com/r/zulip/docker-zulip) (`docker pull zulip/docker-zulip:6.0-0`)

Current Zulip version: `5.7`
Current Docker image version: `5.7-0`
Current Zulip version: `6.0`
Current Docker image version: `6.0-0`

Project status: **Alpha**. While this project works and is
used by many sites in production, configuring is substantially more
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ services:
volumes:
- "redis:/data:rw"
zulip:
image: "zulip/docker-zulip:5.7-0"
image: "zulip/docker-zulip:6.0-0"
restart: unless-stopped
build:
context: .
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: "5.7"
ZULIP_GIT_REF: "6.0"
# Set this up if you plan to use your own CA certificate bundle for building
# CUSTOM_CA_CERTIFICATES:
ports:
Expand Down
4 changes: 4 additions & 0 deletions kubernetes/chart/zulip/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## [0.6.0] - 2022-11-23

- Update Zulip Server to 6.0

## [0.5.0] - 2022-11-16

- Update Zulip Server to 5.7
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/chart/zulip/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ version: 0.4.0
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "5.7-0"
appVersion: "6.0-0"
dependencies:
- name: memcached
repository: https://charts.bitnami.com/bitnami
Expand Down
4 changes: 2 additions & 2 deletions kubernetes/chart/zulip/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Zulip

![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)
![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)

[Zulip](https://zulip.com/) is an open source threaded team chat that helps teams stay productive and focused.

Expand Down Expand Up @@ -72,7 +72,7 @@ Now you're ready to follow [the installation instructions above](#installation).
| fullnameOverride | string | `""` | Fully override common.names.fullname template. |
| image.pullPolicy | string | `"IfNotPresent"` | Pull policy for Zulip docker image. Ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images |
| image.repository | string | `"zulip/docker-zulip"` | Defaults to hub.docker.com/zulip/docker-zulip, but can be overwritten with a full HTTPS address. |
| image.tag | string | `"5.7-0"` | Zulip image tag (immutable tags are recommended) |
| image.tag | string | `"6.0-0"` | Zulip image tag (immutable tags are recommended) |
| imagePullSecrets | list | `[]` | Global Docker registry secret names as an array. |
| ingress.annotations | object | `{}` | Can be used to add custom Ingress annotations. |
| ingress.enabled | bool | `false` | Enable this to use an Ingress to reach the Zulip service. |
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/chart/zulip/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ image:
# Ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images
pullPolicy: IfNotPresent
# -- Zulip image tag (immutable tags are recommended)
tag: "5.7-0"
tag: "6.0-0"

# -- Global Docker registry secret names as an array.
imagePullSecrets: []
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/manual/zulip-rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ spec:
- name: postgresql-persistent-storage
mountPath: /var/lib/postgresql
- name: zulip
image: zulip/docker-zulip:5.7-0
image: zulip/docker-zulip:6.0-0
resources:
limits:
cpu: 100m
Expand Down

0 comments on commit 0f0488a

Please sign in to comment.