paulmataruso/docker-zulip
1
0
Fork 0
mirror of https://github.com/zulip/docker-zulip.git synced 2025-11-05 06:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

docker: Release 1.9.0-rc2-0.

Browse Source 
This includes a few recent fixes to the Docker image, as well as a
newer release candidate of Zulip itself.
This commit is contained in:
Tim Abbott
2018-08-31 16:31:14 -07:00
parent a1ff3938ca
commit 80e41d0ca5
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -8,7 +8,7 @@ LABEL maintainer="Alexander Trost <galexrt@googlemail.com>"
# You can specify these in docker-compose.yml or with # You can specify these in docker-compose.yml or with
# docker build --build-args "ZULIP_GIT_REF=git_branch_name" . # docker build --build-args "ZULIP_GIT_REF=git_branch_name" .
ARG ZULIP_GIT_URL=https://github.com/zulip/zulip.git 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= ARG CUSTOM_CA_CERTIFICATES=
SHELL ["/bin/bash", "-xuo", "pipefail", "-c"] SHELL ["/bin/bash", "-xuo", "pipefail", "-c"]

14
README.md
View File

@@ -6,10 +6,10 @@ This is a container image for running [Zulip](https://zulipchat.com)
([Github](https://github.com/zulip/zulip)) in ([Github](https://github.com/zulip/zulip)) in
[production][prod-overview]. Image available from: [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 Zulip version: `1.9.0-rc2`
Current Docker image version: `1.9.0-rc1-2` Current Docker image version: `1.9.0-rc2-0`
Project status: **Experimental**. The core Zulip community recently Project status: **Experimental**. The core Zulip community recently
adopted this project, and hasn't yet cleaned it up to our adopted this project, and hasn't yet cleaned it up to our
@@ -369,14 +369,14 @@ section.
`volumes` lines in `docker-compose.yml` `volumes` lines in `docker-compose.yml`
e.g. `/opt/docker/zulip/postgresql/data/`. e.g. `/opt/docker/zulip/postgresql/data/`.
1. Pull the new image version, e.g. for `1.9.0-rc1` run: `docker pull 1. Pull the new image version, e.g. for `1.9.0-rc2` run: `docker pull
zulip/docker-zulip:v1.9.0-rc1-2`. zulip/docker-zulip:v1.9.0-rc2-0`.
2. Edit your `docker-compose.yml` to point to the new image version, 2. Edit your `docker-compose.yml` to point to the new image version,
e.g.: e.g.:
```yml ```yml
zulip: 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: 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 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 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`). `445932cc8613c77ced023125248c8b966b3b7528`).
2. Run `docker-compose build zulip` to build a Zulip Docker image from 2. Run `docker-compose build zulip` to build a Zulip Docker image from

4
docker-compose.yml
View File

@@ -25,13 +25,13 @@ services:
volumes: volumes:
- '/opt/docker/zulip/redis:/var/lib/redis:rw' - '/opt/docker/zulip/redis:/var/lib/redis:rw'
zulip: zulip:
image: 'zulip/docker-zulip:1.9.0-rc1-2' image: 'zulip/docker-zulip:1.9.0-rc2-0'
build: build:
context: . context: .
args: args:
# Change these if you want to build zulip from a different repo/branch # Change these if you want to build zulip from a different repo/branch
ZULIP_GIT_URL: https://github.com/zulip/zulip.git 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 # Set this up if you plan to use your own CA certificate bundle for building
# CUSTOM_CA_CERTIFICATES: # CUSTOM_CA_CERTIFICATES:
ports: ports:

2
kubernetes/zulip-rc.yml
View File

@@ -62,7 +62,7 @@ spec:
- name: postgresql-persistent-storage - name: postgresql-persistent-storage
mountPath: /var/lib/postgresql mountPath: /var/lib/postgresql
- name: zulip - name: zulip
image: zulip/docker-zulip:1.9.0-rc1-2 image: zulip/docker-zulip:1.9.0-rc2-0
resources: resources:
limits: limits:
cpu: 100m cpu: 100m