mirror of
https://github.com/zulip/zulip.git
synced 2025-10-31 20:13:46 +00:00
install: Resupport Ubuntu 22.04.
Signed-off-by: Anders Kaseorg <anders@zulip.com>
(cherry picked from commit e952641013)
This commit is contained in:
committed by
Tim Abbott
parent
3bc1ad05f7
commit
1593ab6082
7
.github/workflows/production-suite.yml
vendored
7
.github/workflows/production-suite.yml
vendored
@@ -106,13 +106,17 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
|
extra_args: [""]
|
||||||
include:
|
include:
|
||||||
# Docker images are built from 'tools/ci/Dockerfile'; the comments at
|
# Docker images are built from 'tools/ci/Dockerfile'; the comments at
|
||||||
# the top explain how to build and upload these images.
|
# the top explain how to build and upload these images.
|
||||||
- docker_image: zulip/ci:focal
|
- docker_image: zulip/ci:focal
|
||||||
name: Ubuntu 20.04 production install
|
name: Ubuntu 20.04 production install
|
||||||
os: focal
|
os: focal
|
||||||
extra_args: ""
|
|
||||||
|
- docker_image: zulip/ci:jammy
|
||||||
|
name: Ubuntu 22.04 production install
|
||||||
|
os: jammy
|
||||||
|
|
||||||
- docker_image: zulip/ci:buster
|
- docker_image: zulip/ci:buster
|
||||||
name: Debian 10 production install with custom db name and user
|
name: Debian 10 production install with custom db name and user
|
||||||
@@ -122,7 +126,6 @@ jobs:
|
|||||||
- docker_image: zulip/ci:bullseye
|
- docker_image: zulip/ci:bullseye
|
||||||
name: Debian 11 production install
|
name: Debian 11 production install
|
||||||
os: bullseye
|
os: bullseye
|
||||||
extra_args: ""
|
|
||||||
|
|
||||||
name: ${{ matrix.name }}
|
name: ${{ matrix.name }}
|
||||||
container:
|
container:
|
||||||
|
|||||||
13
.github/workflows/zulip-ci.yml
vendored
13
.github/workflows/zulip-ci.yml
vendored
@@ -15,24 +15,27 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
|
include_frontend_tests: [false]
|
||||||
include:
|
include:
|
||||||
# Base images are built using `tools/ci/Dockerfile.prod.template`.
|
# Base images are built using `tools/ci/Dockerfile.prod.template`.
|
||||||
# The comments at the top explain how to build and upload these images.
|
# The comments at the top explain how to build and upload these images.
|
||||||
# Debian 10 ships with Python 3.7.3.
|
# Debian 10 ships with Python 3.7.3.
|
||||||
- docker_image: zulip/ci:buster
|
- docker_image: zulip/ci:buster
|
||||||
name: Debian 10 Buster (Python 3.7, backend + frontend)
|
name: Debian 10 (Python 3.7, backend + frontend)
|
||||||
os: buster
|
os: buster
|
||||||
include_frontend_tests: true
|
include_frontend_tests: true
|
||||||
# Ubuntu 20.04 ships with Python 3.8.2.
|
# Ubuntu 20.04 ships with Python 3.8.2.
|
||||||
- docker_image: zulip/ci:focal
|
- docker_image: zulip/ci:focal
|
||||||
name: Ubuntu 20.04 Focal (Python 3.8, backend)
|
name: Ubuntu 20.04 (Python 3.8, backend)
|
||||||
os: focal
|
os: focal
|
||||||
include_frontend_tests: false
|
|
||||||
# Debian 11 ships with Python 3.9.2.
|
# Debian 11 ships with Python 3.9.2.
|
||||||
- docker_image: zulip/ci:bullseye
|
- docker_image: zulip/ci:bullseye
|
||||||
name: Debian 11 Bullseye (Python 3.9, backend)
|
name: Debian 11 (Python 3.9, backend)
|
||||||
os: bullseye
|
os: bullseye
|
||||||
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
|
runs-on: ubuntu-latest
|
||||||
name: ${{ matrix.name }}
|
name: ${{ matrix.name }}
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ Contents:
|
|||||||
If you'd like to install a Zulip development environment on a computer
|
If you'd like to install a Zulip development environment on a computer
|
||||||
that's running one of:
|
that's running one of:
|
||||||
|
|
||||||
- Ubuntu 20.04 Focal
|
- Ubuntu 20.04, 22.04
|
||||||
- Debian 10 Buster, 11 Bullseye
|
- Debian 10, 11
|
||||||
- CentOS 7 (beta)
|
- CentOS 7 (beta)
|
||||||
- Fedora 33 and 34 (beta)
|
- Fedora 33 and 34 (beta)
|
||||||
- RHEL 7 (beta)
|
- RHEL 7 (beta)
|
||||||
|
|||||||
@@ -49,8 +49,8 @@ a proxy to access the internet.)
|
|||||||
|
|
||||||
- **All**: 2GB available RAM, Active broadband internet connection, [GitHub account][set-up-git].
|
- **All**: 2GB available RAM, Active broadband internet connection, [GitHub account][set-up-git].
|
||||||
- **macOS**: macOS (10.11 El Capitan or newer recommended)
|
- **macOS**: macOS (10.11 El Capitan or newer recommended)
|
||||||
- **Ubuntu LTS**: 20.04
|
- **Ubuntu LTS**: 20.04 or 22.04
|
||||||
- or **Debian**: 10 "buster" or 11 "bullseye"
|
- **Debian**: 10 or 11
|
||||||
- **Windows**: Windows 64-bit (Win 10 recommended), hardware
|
- **Windows**: Windows 64-bit (Win 10 recommended), hardware
|
||||||
virtualization enabled (VT-x or AMD-V), administrator access.
|
virtualization enabled (VT-x or AMD-V), administrator access.
|
||||||
|
|
||||||
|
|||||||
@@ -4,9 +4,10 @@ To run a Zulip server, you will need:
|
|||||||
|
|
||||||
- A dedicated machine or VM
|
- A dedicated machine or VM
|
||||||
- A supported OS:
|
- A supported OS:
|
||||||
- Ubuntu 20.04 Focal
|
- Ubuntu 20.04
|
||||||
- Debian 11 Bullseye
|
- Ubuntu 22.04
|
||||||
- Debian 10 Buster
|
- Debian 10
|
||||||
|
- Debian 11
|
||||||
- At least 2 GB RAM, and 10 GB disk space
|
- At least 2 GB RAM, and 10 GB disk space
|
||||||
- If you expect 100+ users: 4 GB RAM, and 2 CPUs
|
- If you expect 100+ users: 4 GB RAM, and 2 CPUs
|
||||||
- If you intend to [upgrade from Git][upgrade-from-git]: 3 GB RAM, or
|
- If you intend to [upgrade from Git][upgrade-from-git]: 3 GB RAM, or
|
||||||
@@ -33,8 +34,8 @@ on issues you'll encounter](install-existing-server.md).
|
|||||||
|
|
||||||
#### Operating system
|
#### Operating system
|
||||||
|
|
||||||
Ubuntu 20.04 Focal, Debian 11 Bullseye, and Debian 10
|
Ubuntu 20.04, Ubuntu 22.04, Debian 10, and Debian 11
|
||||||
Buster are supported for running Zulip in production. You can also
|
are supported for running Zulip in production. You can also
|
||||||
run Zulip on other platforms that support Docker using
|
run Zulip on other platforms that support Docker using
|
||||||
[docker-zulip][docker-zulip-homepage].
|
[docker-zulip][docker-zulip-homepage].
|
||||||
|
|
||||||
|
|||||||
@@ -212,7 +212,7 @@ if [ -f /etc/os-release ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
case "$os_id $os_version_id" in
|
case "$os_id $os_version_id" in
|
||||||
'debian 10' | 'debian 11' | 'ubuntu 20.04') ;;
|
'debian 10' | 'debian 11' | 'ubuntu 20.04' | 'ubuntu 22.04') ;;
|
||||||
*)
|
*)
|
||||||
set +x
|
set +x
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
@@ -220,9 +220,10 @@ case "$os_id $os_version_id" in
|
|||||||
Unsupported OS release: $os_id $os_version_id
|
Unsupported OS release: $os_id $os_version_id
|
||||||
|
|
||||||
Zulip in production is supported only on:
|
Zulip in production is supported only on:
|
||||||
- Debian 10 "buster"
|
- Debian 10
|
||||||
- Debian 11 "bullseye"
|
- Debian 11
|
||||||
- Ubuntu 20.04 LTS "focal"
|
- Ubuntu 20.04 LTS
|
||||||
|
- Ubuntu 22.04 LTS
|
||||||
|
|
||||||
For more information, see:
|
For more information, see:
|
||||||
https://zulip.readthedocs.io/en/latest/production/requirements.html
|
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
|
# 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 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-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
|
||||||
|
|||||||
@@ -165,7 +165,7 @@ COMMON_YUM_DEPENDENCIES = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
BUILD_PGROONGA_FROM_SOURCE = False
|
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
|
# For platforms without a PGroonga release, we need to build it
|
||||||
# from source.
|
# from source.
|
||||||
BUILD_PGROONGA_FROM_SOURCE = True
|
BUILD_PGROONGA_FROM_SOURCE = True
|
||||||
|
|||||||
Reference in New Issue
Block a user