diff --git a/docs/production/deployment.md b/docs/production/deployment.md index f7b97b7c53..c4e9fa61ed 100644 --- a/docs/production/deployment.md +++ b/docs/production/deployment.md @@ -21,6 +21,15 @@ and then [continue the normal installation instructions](../production/install.html#step-2-install-zulip). You can also [upgrade Zulip from Git](../production/maintain-secure-upgrade.html#upgrading-from-a-git-repository). +## Zulip in Docker + +Zulip has an officially supported, experimental +[docker image](https://github.com/zulip/docker-zulip). Please note +that Zulip's [normal installer](../production/install.html) has been +extremely reliable for years, whereas the Docker image is new and has +rough edges, so we recommend the normal installer unless you have a +specific reason to prefer Docker. + ## Running Zulip's service dependencies on different machines Zulip has full support for each top-level service living on its own diff --git a/docs/production/install.md b/docs/production/install.md index bbd5b225fc..c87901348e 100644 --- a/docs/production/install.md +++ b/docs/production/install.md @@ -7,7 +7,8 @@ If you just want to play around with Zulip and see what it looks like, you can create a test organization at . You'll need an Ubuntu or Debian system that satisfies -[the installation requirements](../production/requirements.html). +[the installation requirements](../production/requirements.html), or +you can use Zulip's [experimental Docker image](../production/deployment.html#zulip-in-docker). ## Step 1: Download the latest release