diff --git a/Dockerfile b/Dockerfile index 13ccee0..e5ea672 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ LABEL maintainer="Alexander Trost " # You can specify these in docker-compose.yml or with # docker build --build-args "ZULIP_GIT_REF=git_branch_name" . ARG ZULIP_GIT_URL=https://github.com/zulip/zulip.git -ARG ZULIP_GIT_REF=1.9.0-rc1 +ARG ZULIP_GIT_REF=1.9.0-rc2 ARG CUSTOM_CA_CERTIFICATES= SHELL ["/bin/bash", "-xuo", "pipefail", "-c"] diff --git a/README.md b/README.md index 2814ee8..83f544a 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,10 @@ This is a container image for running [Zulip](https://zulipchat.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:1.9.0-rc1-2`) +* [**Docker Hub**](https://hub.docker.com/r/zulip/docker-zulip) (`docker pull zulip/docker-zulip:1.9.0-rc2-0`) -Current Zulip version: `1.9.0-rc1` -Current Docker image version: `1.9.0-rc1-2` +Current Zulip version: `1.9.0-rc2` +Current Docker image version: `1.9.0-rc2-0` Project status: **Experimental**. The core Zulip community recently adopted this project, and hasn't yet cleaned it up to our @@ -369,14 +369,14 @@ section. `volumes` lines in `docker-compose.yml` e.g. `/opt/docker/zulip/postgresql/data/`. -1. Pull the new image version, e.g. for `1.9.0-rc1` run: `docker pull -zulip/docker-zulip:v1.9.0-rc1-2`. +1. Pull the new image version, e.g. for `1.9.0-rc2` run: `docker pull +zulip/docker-zulip:v1.9.0-rc2-0`. 2. Edit your `docker-compose.yml` to point to the new image version, e.g.: ```yml zulip: - image: "zulip/docker-zulip:1.9.0-rc1-2" + image: "zulip/docker-zulip:1.9.0-rc2-0" ``` 3. You can execute the upgrade by running: @@ -420,7 +420,7 @@ you can find using `docker ps`) You can set `ZULIP_GIT_URL` to any clone of the zulip/zulip git repository, and `ZULIP_GIT_REF` to be any ref name in that repository -(e.g. `master` or `1.9.0-rc1` or +(e.g. `master` or `1.9.0-rc2` or `445932cc8613c77ced023125248c8b966b3b7528`). 2. Run `docker-compose build zulip` to build a Zulip Docker image from diff --git a/docker-compose.yml b/docker-compose.yml index 7848459..de72a35 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,13 +25,13 @@ services: volumes: - '/opt/docker/zulip/redis:/var/lib/redis:rw' zulip: - image: 'zulip/docker-zulip:1.9.0-rc1-2' + image: 'zulip/docker-zulip:1.9.0-rc2-0' 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: 1.9.0-rc1 + ZULIP_GIT_REF: 1.9.0-rc2 # Set this up if you plan to use your own CA certificate bundle for building # CUSTOM_CA_CERTIFICATES: ports: diff --git a/kubernetes/zulip-rc.yml b/kubernetes/zulip-rc.yml index 9c3d358..906f7c0 100644 --- a/kubernetes/zulip-rc.yml +++ b/kubernetes/zulip-rc.yml @@ -62,7 +62,7 @@ spec: - name: postgresql-persistent-storage mountPath: /var/lib/postgresql - name: zulip - image: zulip/docker-zulip:1.9.0-rc1-2 + image: zulip/docker-zulip:1.9.0-rc2-0 resources: limits: cpu: 100m