diff --git a/Dockerfile b/Dockerfile index 77d4a13..f6a7ccd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,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=11.2 +ARG ZULIP_GIT_REF=11.3 RUN git clone "$ZULIP_GIT_URL" -b "$ZULIP_GIT_REF" && \ cd zulip diff --git a/README.md b/README.md index 42c2621..756a480 100644 --- a/README.md +++ b/README.md @@ -8,11 +8,11 @@ Hub](https://hub.docker.com/r/zulip/docker-zulip): ```console -$ docker pull zulip/docker-zulip:11.2-0 +$ docker pull zulip/docker-zulip:11.3-0 ``` -Current Zulip version: `11.2` -Current Docker image version: `11.2-0` +Current Zulip version: `11.3` +Current Docker image version: `11.3-0` We recommend using the Docker image if your organization has a preference for deploying services using Docker. Deploying with Docker diff --git a/docker-compose.yml b/docker-compose.yml index ba56126..5819e86 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,14 +48,14 @@ services: volumes: - "redis:/data:rw" zulip: - image: "zulip/docker-zulip:11.2-0" + image: "zulip/docker-zulip:11.3-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: "11.2" + ZULIP_GIT_REF: "11.3" ## Set this up if you plan to use your own CA certificate bundle for building # CUSTOM_CA_CERTIFICATES: ports: diff --git a/kubernetes/chart/zulip/CHANGELOG.md b/kubernetes/chart/zulip/CHANGELOG.md index 914e59e..c0d6d1a 100644 --- a/kubernetes/chart/zulip/CHANGELOG.md +++ b/kubernetes/chart/zulip/CHANGELOG.md @@ -1,3 +1,10 @@ +## [0.11.3] - 2025-10-22 + +- Update to Zulip Server 11.3 +- Support valueFrom in both SECRETS_ and SETTING_ values +- Support `PROXY_ALLOW_*` settings for outgoing proxy rules +- Support `DB_NAME` / `DB_USER` settings. + ## [0.11.2] - 2025-09-16 - Update to Zulip Server 11.2 diff --git a/kubernetes/chart/zulip/Chart.yaml b/kubernetes/chart/zulip/Chart.yaml index 0b1438e..6c23e69 100644 --- a/kubernetes/chart/zulip/Chart.yaml +++ b/kubernetes/chart/zulip/Chart.yaml @@ -7,14 +7,14 @@ icon: https://raw.githubusercontent.com/zulip/zulip/main/static/images/logo/zuli ## incremented each time you make changes to the chart and its ## templates, including the app version. Versions are expected to ## follow Semantic Versioning (https://semver.org/) -version: 0.11.2 +version: 0.11.3 ## This is the version number of the application being deployed. This ## version number should be 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: "11.2-0" +appVersion: "11.3-0" dependencies: - name: memcached repository: oci://registry-1.docker.io/bitnamicharts diff --git a/kubernetes/chart/zulip/README.md b/kubernetes/chart/zulip/README.md index 077554a..ccb7c5f 100644 --- a/kubernetes/chart/zulip/README.md +++ b/kubernetes/chart/zulip/README.md @@ -1,6 +1,6 @@ # Zulip -![Version: 0.11.2](https://img.shields.io/badge/Version-0.11.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 11.2-0](https://img.shields.io/badge/AppVersion-11.2--0-informational?style=flat-square) +![Version: 0.11.3](https://img.shields.io/badge/Version-0.11.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 11.3-0](https://img.shields.io/badge/AppVersion-11.3--0-informational?style=flat-square) [Zulip](https://zulip.com/) is an open source threaded team chat that helps teams stay productive and focused. @@ -72,7 +72,7 @@ Now you're ready to follow [the installation instructions above](#installation). | fullnameOverride | string | `""` | | | image.pullPolicy | string | `"IfNotPresent"` | | | image.repository | string | `"zulip/docker-zulip"` | | -| image.tag | string | `"11.2-0"` | | +| image.tag | string | `"11.3-0"` | | | imagePullSecrets | list | `[]` | | | ingress.annotations | object | `{}` | | | ingress.enabled | bool | `false` | | diff --git a/kubernetes/chart/zulip/README.md.gotmpl b/kubernetes/chart/zulip/README.md.gotmpl index 1a6d340..9de939a 100644 --- a/kubernetes/chart/zulip/README.md.gotmpl +++ b/kubernetes/chart/zulip/README.md.gotmpl @@ -76,6 +76,19 @@ variables are forwarded to the Docker container, you can read more about configuring Zulip through environment variables [here](https://github.com/zulip/docker-zulip/#configuration). +Variables can be either a plain scalar value (i.e., a string or +integer), or a projected value from a secret or configmap. For +example: + +```yaml +SETTING_EXTERNAL_HOST: zulip.example.com +SECRETS_email_password: + valueFrom: + secretKeyRef: + name: email + key: password +``` + ### Dependencies The chart uses Memcached, RabbitMQ and Redis helm charts defined in diff --git a/kubernetes/chart/zulip/values.yaml b/kubernetes/chart/zulip/values.yaml index e139103..9b5a224 100644 --- a/kubernetes/chart/zulip/values.yaml +++ b/kubernetes/chart/zulip/values.yaml @@ -17,7 +17,7 @@ image: ## Ref: https://kubernetes.io/docs/concepts/containers/images/#pre-pulled-images pullPolicy: IfNotPresent ## Zulip image tag (immutable tags are recommended) - tag: "11.2-0" + tag: "11.3-0" ## Global Docker registry secret names as an array. imagePullSecrets: [] diff --git a/kubernetes/manual/zulip-rc.yml b/kubernetes/manual/zulip-rc.yml index c44996c..ba71454 100644 --- a/kubernetes/manual/zulip-rc.yml +++ b/kubernetes/manual/zulip-rc.yml @@ -86,7 +86,7 @@ spec: - name: postgresql-persistent-storage mountPath: /var/lib/postgresql/data - name: zulip - image: zulip/docker-zulip:11.2-0 + image: zulip/docker-zulip:11.3-0 resources: limits: cpu: 100m