From 9f897a650a9b2ba9c167412d3af92c024f66477a Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Mon, 14 Feb 2022 09:28:29 +0100 Subject: [PATCH] build: rename distro from 'rhel' to 'el' --- .github/workflows/build_packages.yaml | 4 ++-- build | 4 ++-- scripts/get-distro.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index 503f0a15b..5c1b01789 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -294,9 +294,9 @@ jobs: export ARCH="arm" fi if [ "$SYSTEM" = 'centos7' ]; then - DISTRO='rhel7' + DISTRO='el7' elif [ "$SYSTEM" = 'rockylinux8' ]; then - DISTRO='rhel8' + DISTRO='el8' else DISTRO=${SYSTEM} fi diff --git a/build b/build index 3d5d3b265..2aa20b7a3 100755 --- a/build +++ b/build @@ -150,7 +150,7 @@ make_docker() { ## Name Default Example ## --------------------------------------------------------------------- ## EMQX_BASE_IMAGE current os centos:7 -## EMQX_ZIP_PACKAGE _packages/ /tmp/emqx-4.4.0-otp24.1.5-3-rhel7-amd64.zip +## EMQX_ZIP_PACKAGE _packages/ /tmp/emqx-4.4.0-otp24.1.5-3-el7-amd64.zip ## EMQX_IMAGE_TAG emqx/emqx: emqx/emqx:testing-tag ## make_docker_testing() { @@ -159,7 +159,7 @@ make_docker_testing() { ubuntu20*) EMQX_BASE_IMAGE="ubuntu:20.04" ;; - rhel8) + el8) EMQX_BASE_IMAGE="rockylinux:8" ;; *) diff --git a/scripts/get-distro.sh b/scripts/get-distro.sh index c28698af1..f4ac5c88c 100755 --- a/scripts/get-distro.sh +++ b/scripts/get-distro.sh @@ -11,7 +11,7 @@ if [ "$(uname -s)" = 'Darwin' ]; then SYSTEM="$(echo "${DIST}${VERSION_ID}" | gsed -r 's/([a-zA-Z]*)-.*/\1/g')" elif [ "$(uname -s)" = 'Linux' ]; then if grep -q -i 'rhel' /etc/*-release; then - DIST='rhel' + 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')"