mirror of
https://github.com/zulip/docker-zulip.git
synced 2025-11-05 22:43:30 +00:00
docker: Upgrade docker-zulip to Zulip 1.9.0-rc1.
This docker image has only really supported Git leading up to Zulip 1.9 for a while now. Now that there's a release candidate out, it makes sense to declare that explicitly. This commit will be tagged 1.9.0-rc1-0.
This commit is contained in:
@@ -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=master
|
ARG ZULIP_GIT_REF=1.9.0-rc1
|
||||||
|
|
||||||
SHELL ["/bin/sh", "-xc"]
|
SHELL ["/bin/sh", "-xc"]
|
||||||
|
|
||||||
|
|||||||
18
README.md
18
README.md
@@ -8,11 +8,11 @@ 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:
|
||||||
|
|
||||||
* [**Quay.io**](https://quay.io/repository/galexrt/zulip) (`docker pull quay.io/galexrt/zulip:1.8.1-0`)
|
* [**Quay.io**](https://quay.io/repository/galexrt/zulip) (`docker pull quay.io/galexrt/zulip:1.9.0-rc1-0`)
|
||||||
* [**Docker Hub**](https://hub.docker.com/r/galexrt/zulip) (`docker pull galexrt/zulip:1.8.1-0`)
|
* [**Docker Hub**](https://hub.docker.com/r/galexrt/zulip) (`docker pull galexrt/zulip:1.9.0-rc1-0`)
|
||||||
|
|
||||||
Current Zulip version: `1.8.1`
|
Current Zulip version: `1.9.0-rc1`
|
||||||
Current Docker image version: `1.8.1-0`
|
Current Docker image version: `1.9.0-rc1-0`
|
||||||
|
|
||||||
## Overview
|
## Overview
|
||||||
|
|
||||||
@@ -343,14 +343,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 `v1.8.1` run: `docker pull
|
1. Pull the new image version, e.g. for `1.9.0-rc1` run: `docker pull
|
||||||
quay.io/galexrt/zulip:v1.8.1`.
|
quay.io/galexrt/zulip:v1.9.0-rc1-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: "quay.io/galexrt/zulip:1.8.1-0"
|
image: "quay.io/galexrt/zulip:1.9.0-rc1-0"
|
||||||
```
|
```
|
||||||
|
|
||||||
3. You can execute the upgrade by running:
|
3. You can execute the upgrade by running:
|
||||||
@@ -383,7 +383,7 @@ you can find using `docker ps`)
|
|||||||
|
|
||||||
```
|
```
|
||||||
zulip:
|
zulip:
|
||||||
# image: "quay.io/galexrt/zulip:1.8.1-0"
|
# image: "quay.io/galexrt/zulip:1.9.0-rc1-0"
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
args:
|
args:
|
||||||
@@ -394,7 +394,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.8.1` or
|
(e.g. `master` or `1.9.0-rc1` 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
|
||||||
|
|||||||
@@ -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: "quay.io/galexrt/zulip:1.8.1-0"
|
image: "quay.io/galexrt/zulip:1.9.0-rc1-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: master
|
ZULIP_GIT_REF: 1.9.0-rc1
|
||||||
ports:
|
ports:
|
||||||
- "80:80"
|
- "80:80"
|
||||||
- "443:443"
|
- "443:443"
|
||||||
|
|||||||
@@ -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: quay.io/galexrt/zulip:1.8.1-0
|
image: quay.io/galexrt/zulip:1.9.0-rc1-0
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpu: 100m
|
cpu: 100m
|
||||||
|
|||||||
Reference in New Issue
Block a user