mirror of https://github.com/zulip/zulip.git
install: Resupport Ubuntu 22.04.
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
parent
25c87cc7da
commit
e952641013
|
@ -106,13 +106,17 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
extra_args: [""]
|
||||
include:
|
||||
# Docker images are built from 'tools/ci/Dockerfile'; the comments at
|
||||
# the top explain how to build and upload these images.
|
||||
- docker_image: zulip/ci:focal
|
||||
name: Ubuntu 20.04 production install
|
||||
os: focal
|
||||
extra_args: ""
|
||||
|
||||
- docker_image: zulip/ci:jammy
|
||||
name: Ubuntu 22.04 production install
|
||||
os: jammy
|
||||
|
||||
- docker_image: zulip/ci:bullseye
|
||||
name: Debian 11 production install with custom db name and user
|
||||
|
|
|
@ -15,6 +15,8 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include_documentation_tests: [false]
|
||||
include_frontend_tests: [false]
|
||||
include:
|
||||
# Base images are built using `tools/ci/Dockerfile.prod.template`.
|
||||
# The comments at the top explain how to build and upload these images.
|
||||
|
@ -23,13 +25,15 @@ jobs:
|
|||
name: Ubuntu 20.04 (Python 3.8, backend + frontend)
|
||||
os: focal
|
||||
include_frontend_tests: true
|
||||
include_documentation_tests: false
|
||||
# Debian 11 ships with Python 3.9.2.
|
||||
- docker_image: zulip/ci:bullseye
|
||||
name: Debian 11 (Python 3.9, backend + documentation)
|
||||
os: bullseye
|
||||
include_documentation_tests: true
|
||||
include_frontend_tests: false
|
||||
# Ubuntu 22.04 ships with Python 3.10.4.
|
||||
- docker_image: zulip/ci:jammy
|
||||
name: Ubuntu 22.04 (Python 3.10, backend)
|
||||
os: jammy
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
name: ${{ matrix.name }}
|
||||
|
|
|
@ -12,7 +12,7 @@ Contents:
|
|||
If you'd like to install a Zulip development environment on a computer
|
||||
that's running one of:
|
||||
|
||||
- Ubuntu 20.04
|
||||
- Ubuntu 20.04, 22.04
|
||||
- Debian 11
|
||||
- CentOS 7 (beta)
|
||||
- Fedora 33 and 34 (beta)
|
||||
|
|
|
@ -49,7 +49,7 @@ a proxy to access the internet.)
|
|||
|
||||
- **All**: 2GB available RAM, Active broadband internet connection, [GitHub account][set-up-git].
|
||||
- **macOS**: macOS (10.11 El Capitan or newer recommended)
|
||||
- **Ubuntu LTS**: 20.04
|
||||
- **Ubuntu LTS**: 20.04 or 22.04
|
||||
- **Debian**: 11
|
||||
- **Windows**: Windows 64-bit (Win 10 recommended), hardware
|
||||
virtualization enabled (VT-x or AMD-V), administrator access.
|
||||
|
|
|
@ -5,6 +5,7 @@ To run a Zulip server, you will need:
|
|||
- A dedicated machine or VM
|
||||
- A supported OS:
|
||||
- Ubuntu 20.04
|
||||
- Ubuntu 22.04
|
||||
- Debian 11
|
||||
- At least 2 GB RAM, and 10 GB disk space
|
||||
- If you expect 100+ users: 4 GB RAM, and 2 CPUs
|
||||
|
@ -32,7 +33,7 @@ on issues you'll encounter](install-existing-server.md).
|
|||
|
||||
#### Operating system
|
||||
|
||||
Ubuntu 20.04 and Debian 11
|
||||
Ubuntu 20.04, Ubuntu 22.04, and Debian 11
|
||||
are supported for running Zulip in production. You can also
|
||||
run Zulip on other platforms that support Docker using
|
||||
[docker-zulip][docker-zulip-homepage].
|
||||
|
|
|
@ -212,7 +212,7 @@ if [ -f /etc/os-release ]; then
|
|||
fi
|
||||
|
||||
case "$os_id $os_version_id" in
|
||||
'debian 11' | 'ubuntu 20.04') ;;
|
||||
'debian 11' | 'ubuntu 20.04' | 'ubuntu 22.04') ;;
|
||||
*)
|
||||
set +x
|
||||
cat <<EOF
|
||||
|
@ -222,6 +222,7 @@ Unsupported OS release: $os_id $os_version_id
|
|||
Zulip in production is supported only on:
|
||||
- Debian 11
|
||||
- Ubuntu 20.04 LTS
|
||||
- Ubuntu 22.04 LTS
|
||||
|
||||
For more information, see:
|
||||
https://zulip.readthedocs.io/en/latest/production/requirements.html
|
||||
|
|
|
@ -4,3 +4,9 @@ deb-src http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main
|
|||
# Old versions for https://github.com/pgroonga/pgroonga/issues/203 were not built for jammy
|
||||
deb http://apt-archive.postgresql.org/pub/repos/apt/ impish-pgdg-archive main
|
||||
deb-src http://apt-archive.postgresql.org/pub/repos/apt/ impish-pgdg-archive main
|
||||
deb http://archive.ubuntu.com/ubuntu impish main
|
||||
deb http://archive.ubuntu.com/ubuntu impish-updates main
|
||||
deb http://archive.ubuntu.com/ubuntu impish-security main
|
||||
|
||||
deb http://ppa.launchpad.net/groonga/ppa/ubuntu jammy main
|
||||
deb-src http://ppa.launchpad.net/groonga/ppa/ubuntu jammy main
|
||||
|
|
|
@ -163,7 +163,7 @@ COMMON_YUM_DEPENDENCIES = [
|
|||
]
|
||||
|
||||
BUILD_PGROONGA_FROM_SOURCE = False
|
||||
if vendor == "debian" and os_version in [] or vendor == "ubuntu" and os_version in ["22.04"]:
|
||||
if vendor == "debian" and os_version in [] or vendor == "ubuntu" and os_version in []:
|
||||
# For platforms without a PGroonga release, we need to build it
|
||||
# from source.
|
||||
BUILD_PGROONGA_FROM_SOURCE = True
|
||||
|
|
Loading…
Reference in New Issue