Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop CentOS #4314

Merged
merged 2 commits into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions .circleci/template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ jobs:
type: executor
platform:
type: enum
enum: [centos_7, rockylinux_9, rockylinux_8, almalinux_9, almalinux_8, debian_bullseye, debian_buster, ubuntu_xenial, ubuntu_focal, ubuntu_bionic, ubuntu_jammy]
enum: [rockylinux_9, rockylinux_8, almalinux_9, almalinux_8, debian_bullseye, debian_buster, ubuntu_xenial, ubuntu_focal, ubuntu_bionic, ubuntu_jammy]
description: Platform type
otp_package:
type: string
Expand Down Expand Up @@ -706,13 +706,6 @@ workflows:
tags:
only: /^\d+\.\d+\.\d+/
# ============= PACKAGES =============
- package:
name: centos_7
executor: otp_26
platform: centos_7
context: mongooseim-org
otp_package: "26.2.2"
filters: *all_tags
- package:
name: rockylinux_8
executor: otp_26
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ jobs:
strategy:
fail-fast: false
matrix:
pkg: [centos_7, ubuntu_xenial]
pkg: [ubuntu_xenial]
runs-on: ubuntu-22.04
env:
ESL_ERLANG_PKG_VER: "25.0.3"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ It is brought to you by [Erlang Solutions](https://www.erlang-solutions.com/).

For a quick start just download:

* The [pre-built packages](https://www.erlang-solutions.com/resources/download.html) that suit your platform (Ubuntu, Debian, CentOS, AlmaLinux and Rocky Linux)
* The [pre-built packages](https://www.erlang-solutions.com/resources/download.html) that suit your platform (Ubuntu, Debian, CentOS compatible: AlmaLinux and Rocky Linux)
* The [Docker image](https://hub.docker.com/r/mongooseim/mongooseim/): [https://hub.docker.com/r/mongooseim/mongooseim/](https://hub.docker.com/r/mongooseim/mongooseim/) (source code repository: [https://github.com/esl/mongooseim-docker](https://github.com/esl/mongooseim-docker))
* The [Helm chart](https://artifacthub.io/packages/helm/mongoose/mongooseim) ([source code repository](https://github.com/esl/MongooseHelm))

Expand Down
4 changes: 2 additions & 2 deletions doc/configuration/database-backends-configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ MSSQL can be used from MongooseIM through the ODBC layer with FreeTDS driver, so
# Ubuntu
$ sudo apt install freetds-dev tdsodbc

# CentOS
# CentOS compatible systems (Rocky, Alma)
$ sudo yum install freetds

# macOS
Expand All @@ -166,7 +166,7 @@ Add your database (`mongooseim` here) to the `/etc/odbc.ini` or `$HOME/.odbc.ini
; Ubuntu
Driver = /usr/lib/x86_64-linux-gnu/odbc/libtdsodbc.so
Setup = /usr/lib/x86_64-linux-gnu/odbc/libtdsS.so
; CentOS
; CentOS compatible
; Driver = /usr/lib64/libtdsodbc.so.0
; Setup = /usr/lib64/libtdsS.so
; macOS
Expand Down
2 changes: 1 addition & 1 deletion doc/developers-guide/Bootstrap-Scripts.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,5 @@ tools/pkg/scripts/smoke_templates.escript
Testing command:

```bash
PRESET=pkg pkg_PLATFORM=centos_7 ESL_ERLANG_PKG_VER=23.3.1-2 ./tools/test.sh
PRESET=pkg pkg_PLATFORM=ubuntu_xenial ESL_ERLANG_PKG_VER=23.3.1-2 ./tools/test.sh
```
5 changes: 3 additions & 2 deletions doc/developers-guide/Testing-MongooseIM.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Please install the driver:
# Ubuntu
$ sudo apt install freetds-dev tdsodbc

# CentOS
# CentOS compatible systems (Rocky, Alma)
$ sudo yum install freetds

# macOS
Expand All @@ -44,7 +44,8 @@ $ brew install freetds
In case you are using an operating system different from Ubuntu or MacOS or have a custom FreeTDS installation,
you may have to modify the `tools/setup-db.sh` script to use the proper paths.
Find a configuration block starting with `[mongoose-mssql]` and change the `Driver` and `Setup`.
For example, for CentOS change them to `/usr/lib64/libtdsodbc.so.0` and `/usr/lib64/libtdsS.so` respectively.
For example, for CentOS compatible systems change them to `/usr/lib64/libtdsodbc.so.0` and `/usr/lib64/libtdsS.so`
respectively.

## How to print the instructions

Expand Down
2 changes: 1 addition & 1 deletion doc/getting-started/Installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The following sections describe the installation process for different operating
sudo dpkg -i mongooseim_[version here].deb
```

=== "CentOS / AlmaLinux / Rocky Linux"
=== "CentOS compatible: AlmaLinux / Rocky Linux"

An ODBC (RDBMS) driver must be installed on your machine to unpack and install from RPM packages. Enter the following command in a terminal window to install the latest unixODBC driver:

Expand Down
2 changes: 1 addition & 1 deletion doc/getting-started/Quick-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ Otherwise, the clients will keep disconnecting each other, because MongooseIM al

### Connect Gajim

Gajim is available on Ubuntu, CentOS & Windows.
Gajim is available on many Linux platforms, macOS & Windows.

!!! Warning
Gajim has an obsolete UX. However, it is still well maintained, and has a console that is extremely useful for debugging and testing/validation purposes at the XMPP protocol level.
Expand Down
2 changes: 1 addition & 1 deletion doc/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ We offer a set of additional server-side components:

For a quick start just download:

* The [pre-built packages](https://www.erlang-solutions.com/resources/download.html) that suit your platform (Ubuntu, Debian, CentOS, AlmaLinux and Rocky Linux)
* The [pre-built packages](https://www.erlang-solutions.com/resources/download.html) that suit your platform (Ubuntu, Debian, CentOS compatible: AlmaLinux and Rocky Linux)
* The [Docker image](https://hub.docker.com/r/mongooseim/mongooseim/) ([source code repository](https://github.com/esl/mongooseim-docker))
* The [Helm chart](https://artifacthub.io/packages/helm/mongoose/mongooseim) ([source code repository](https://github.com/esl/MongooseHelm))

Expand Down
16 changes: 9 additions & 7 deletions doc/tutorials/How-to-build.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Instructions provided in this page are verified for:

* CentOS 7
* Rocky Linux 8
* Ubuntu 16.04 LTS (Xenial)
* Ubuntu 18.04 LTS (Bionic)
* macOS 13.3 (Ventura)
Expand All @@ -13,12 +13,12 @@ For any other OS versions, the instructions should still work, however, some ste

To compile MongooseIM you need:

=== "CentOS"
=== "Rocky/Alma"

* Make: `make`,
* C and C++ compiler: `gcc`, `gcc-c++`,
* Erlang/OTP 24.0 or higher:
* `erlang` package, or,
* C and C++ compiler: `gcc`, `g++`,
* Erlang/OTP 26.0 or higher:
* `erlang` EPEL package, or,
* `esl-erlang` from [Erlang Solutions website](https://www.erlang-solutions.com/resources/download.html), or,
* install using [kerl](https://github.com/kerl/kerl),
* OpenSSL 0.9.8 or higher, for STARTTLS, SASL and SSL encryption: `openssl` and `openssl-devel`,
Expand Down Expand Up @@ -48,12 +48,14 @@ To compile MongooseIM you need:

## Preparing the environment

=== "centOS"
=== "Rocky/Alma"

Please install the required dependencies:

```bash
sudo yum install git make zlib-devel openssl openssl-devel unixODBC-devel gcc gcc-c++ erlang
sudo yum install git make zlib-devel openssl openssl-devel unixODBC-devel gcc gcc-c++
wget https://binaries2.erlang-solutions.com/rockylinux/8/esl-erlang_26.2.4_1~rockylinux~8_x86_64.rpm
sudo dnf -Uvh esl-erlang_26.2.4_1~rockylinux~8_x86_64.rpm
```

Now, please proceed to the "Building" section.
Expand Down
8 changes: 4 additions & 4 deletions tools/pkg/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ To build a package run:

Where:

* `$PLATFORM` - an OS and an OS version name separated by "_" (e.g. centos_7,
* `$PLATFORM` - an OS and an OS version name separated by "_" (e.g. rockylinux_8,
debian_stretch),
* `$VERSION` - a version of MongooseIM (for most cases version from the `VERSION`
file will be suitable),
Expand All @@ -50,7 +50,7 @@ is built for the same source code but with the usage of changed build scripts),
while compiling MongooseIM (please remember about concerning minimal erlang version
specified in the `rebar.config` file and the esl-erlang package revision - e.g. 23.3.1-1),
* `DOCKERFILE_PATH` - a dockerfile path which should be used to build a package
for given platform (e.g. path of `Dockerfile_rpm` for `centos_7`),
for given platform (e.g. path of `Dockerfile_rpm` for `rockylinux_8`),
* `CONTEXT_PATH` - a root directory of the MongooseIM project (during building
whole source code is copied to a building docker image container and the `_build`
directory is erased),
Expand All @@ -63,9 +63,9 @@ container. The container instance is removed once the build finishes.
A resulting package will be called:

```
mongooseim_3.6.0-1~centos~7_amd64.rpm
mongooseim_3.6.0-1~rockylinux~8_amd64.rpm
```
For passed `version`: "3.6.0", `revision`: "1" and `platform`: "centos_7".
For passed `version`: "3.6.0", `revision`: "1" and `platform`: "rockylinux_8".

## Sample configuration

Expand Down
8 changes: 1 addition & 7 deletions tools/pkg/scripts/rpm/install_erlang.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,8 @@ OS_RELEASE=$(echo $dockerfile_platform | cut -f2 -d:)
if [ $DISTRO == almalinux ]; then DISTRO=rockylinux; fi

ERLANG_PKG=esl-erlang_${erlang_version}_1~${DISTRO}~${OS_RELEASE}_x86_64.rpm
if [ $DISTRO == centos ]; then
MAJOR_VSN=$(echo $erlang_version | cut -f1 -d.)
PREFIX=esl-erlang-${MAJOR_VSN}
elif [ $DISTRO == rockylinux ]; then
PREFIX=${OS_RELEASE}
fi

curl -O https://binaries2.erlang-solutions.com/$DISTRO/$PREFIX/$ERLANG_PKG
curl -O https://binaries2.erlang-solutions.com/$DISTRO/$OS_RELEASE/$ERLANG_PKG
yum install -y ./$ERLANG_PKG

rm $ERLANG_PKG
2 changes: 1 addition & 1 deletion tools/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ build_pkg () {
local esl_erlang_pkg_vsn=$2
local project_root=$(git rev-parse --show-toplevel)

if [[ $platform == centos* ]] || [[ $platform == rockylinux* ]] || [[ $platform == almalinux* ]]; then
if [[ $platform == rockylinux* ]] || [[ $platform == almalinux* ]]; then
local dockerfile_name="Dockerfile_rpm"
elif [[ $platform == debian* ]] || [[ $platform == ubuntu* ]]; then
local dockerfile_name="Dockerfile_deb"
Expand Down
Loading