mirror of https://github.com/zulip/zulip.git
provision: Add provision support for Ubuntu 18.10.
Note that this is only support for Ubuntu 18.10 in the development environment.
This commit is contained in:
parent
4523c8d7ee
commit
264c2e9803
|
@ -12,7 +12,7 @@ Contents:
|
|||
If you'd like to install a Zulip development environment on a computer
|
||||
that's running one of:
|
||||
|
||||
* Ubuntu 18.04 Bionic, 16.04 Xenial, 14.04 Trusty
|
||||
* Ubuntu 18.10 Cosmic, 18.04 Bionic, 16.04 Xenial, 14.04 Trusty
|
||||
* Debian 9 Stretch
|
||||
* Centos 7 (beta)
|
||||
* Fedora 29 (beta)
|
||||
|
|
|
@ -110,7 +110,7 @@ For a step-by-step explanation, read on.
|
|||
|
||||
##### 1. Install Vagrant
|
||||
|
||||
For Ubuntu 18.04 Bionic, you can just install from `apt`:
|
||||
For Ubuntu 18.04 Bionic or newer, you can just install from `apt`:
|
||||
|
||||
```
|
||||
sudo apt install vagrant
|
||||
|
|
|
@ -41,6 +41,14 @@ deb http://ppa.launchpad.net/tabbott/zulip/ubuntu $release main
|
|||
deb-src http://ppa.launchpad.net/groonga/ppa/ubuntu $release main
|
||||
deb-src http://ppa.launchpad.net/tabbott/zulip/ubuntu $release main
|
||||
EOF
|
||||
elif [ "$release" = "cosmic" ]; then
|
||||
# This case will eventually merge with the above, if/when we add
|
||||
# tsearch_extras packages to the Zulip PPA.
|
||||
apt-key add "$SCRIPTS_PATH"/setup/pgroonga-ppa.asc
|
||||
cat >$SOURCES_FILE <<EOF
|
||||
deb http://ppa.launchpad.net/groonga/ppa/ubuntu $release main
|
||||
deb-src http://ppa.launchpad.net/groonga/ppa/ubuntu $release main
|
||||
EOF
|
||||
elif [ "$release" = "stretch" ]; then
|
||||
apt-get install -y debian-archive-keyring
|
||||
apt-key add "$SCRIPTS_PATH"/setup/packagecloud.asc
|
||||
|
|
|
@ -35,6 +35,7 @@ SUPPORTED_PLATFORMS = {
|
|||
"trusty",
|
||||
"xenial",
|
||||
"bionic",
|
||||
"cosmic",
|
||||
],
|
||||
"Debian": [
|
||||
"stretch",
|
||||
|
@ -130,6 +131,7 @@ POSTGRES_VERSION_MAP = {
|
|||
"trusty": "9.3",
|
||||
"xenial": "9.5",
|
||||
"bionic": "10",
|
||||
"cosmic": "10",
|
||||
"centos7": "10",
|
||||
"fedora29": "10",
|
||||
"rhel7": "10",
|
||||
|
@ -176,24 +178,23 @@ BUILD_TSEARCH_FROM_SOURCE = False
|
|||
BUILD_PGROONGA_FROM_SOURCE = False
|
||||
if vendor in ["Ubuntu", "Debian"]:
|
||||
if codename == "cosmic":
|
||||
# For platforms not supported by pgroonga, we build it frmo source.
|
||||
BUILD_PGROONGA_FROM_SOURCE = True
|
||||
# For platforms without a tsearch-extras package distributed
|
||||
# from our PPA, we need to build from source.
|
||||
BUILD_TSEARCH_FROM_SOURCE = True
|
||||
SYSTEM_DEPENDENCIES = UBUNTU_COMMON_APT_DEPENDENCIES + [
|
||||
pkg.format(POSTGRES_VERSION) for pkg in [
|
||||
"postgresql-{0}",
|
||||
"postgresql-{0}-pgroonga",
|
||||
# Dependency for building tsearch_extras from source
|
||||
"postgresql-server-dev-{0}",
|
||||
# Needed to build pgroonga from source
|
||||
"libgroonga-dev",
|
||||
"libmsgpack-dev",
|
||||
]
|
||||
]
|
||||
else:
|
||||
SYSTEM_DEPENDENCIES = UBUNTU_COMMON_APT_DEPENDENCIES + [
|
||||
pkg.format(POSTGRES_VERSION) for pkg in [
|
||||
"postgresql-{0}",
|
||||
"postgresql-{0}-tsearch-extras",
|
||||
"postgresql-{0}-pgroonga",
|
||||
"postgresql-{0}-tsearch-extras",
|
||||
]
|
||||
]
|
||||
elif vendor in ["CentOS", "RedHat"]:
|
||||
|
|
Loading…
Reference in New Issue