diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index 719549bff..7d88af089 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -227,10 +227,9 @@ jobs: - ubuntu16.04 - debian10 - debian9 - # - opensuse + - rockylinux8 - centos7 - raspbian10 - # - raspbian9 build_machine: - aws-arm64 - ubuntu-20.04 diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index 22b0f5e84..78e0f8f30 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -41,7 +41,7 @@ jobs: - 1.13.3 os: - ubuntu20.04 - - centos7 + - rockylinux8 container: "ghcr.io/emqx/emqx-builder/5.0-7:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}" diff --git a/build b/build index 0ab504bc1..937337484 100755 --- a/build +++ b/build @@ -209,8 +209,8 @@ make_docker() { ## ## Name Default Example ## --------------------------------------------------------------------- -## EMQX_BASE_IMAGE current os centos:7 -## EMQX_TGZ_packages/ /tmp/emqx-4.4.0-otp23.3.4.9-3-centos7-amd64.tar.gz +## EMQX_BASE_IMAGE current os el:7 +## EMQX_TGZ_packages/ /tmp/emqx-4.4.0-otp23.3.4.9-3-el7-amd64.tar.gz ## EMQX_IMAGE_TAG emqx/emqx: emqx/emqx:testing-tag ## make_docker_testing() { diff --git a/scripts/get-distro.sh b/scripts/get-distro.sh index 266d49cba..d70151209 100755 --- a/scripts/get-distro.sh +++ b/scripts/get-distro.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash ## This script prints Linux distro name and its version number -## e.g. macos, centos7, ubuntu20.04 +## e.g. macos, el8, ubuntu20.04 set -euo pipefail @@ -14,9 +14,9 @@ case "$UNAME" in SYSTEM="$(echo "${DIST}${VERSION_ID}" | gsed -r 's/([a-zA-Z]*)-.*/\1/g')" ;; Linux) - if grep -q -i 'centos' /etc/*-release; then - DIST='centos' - VERSION_ID="$(rpm --eval '%{centos_ver}')" + if grep -q -i 'rhel' /etc/*-release; then + DIST='el' + VERSION_ID="$(rpm --eval '%{rhel}')" else DIST="$(sed -n '/^ID=/p' /etc/os-release | sed -r 's/ID=(.*)/\1/g' | sed 's/"//g')" VERSION_ID="$(sed -n '/^VERSION_ID=/p' /etc/os-release | sed -r 's/VERSION_ID=(.*)/\1/g' | sed 's/"//g')" diff --git a/scripts/update_appup.escript b/scripts/update_appup.escript index eda28a238..e4e55f23c 100755 --- a/scripts/update_appup.escript +++ b/scripts/update_appup.escript @@ -33,7 +33,7 @@ Options: --release-dir Release directory --src-dirs Directories where source code is found. Defaults to '{src,apps,lib-*}/**/' --binary-rel-url Binary release URL pattern. %VSN% variable is substituted with the version in release tag. - E.g. \"https://github.com/emqx/emqx/releases/download/v%VSN%/emqx-%VSN%-otp-24.1.5-3-centos7-amd64.tar.gz\" + E.g. \"https://github.com/emqx/emqx/releases/download/v%VSN%/emqx-%VSN%-otp-24.1.5-3-el7-amd64.tar.gz\" ". -record(app,