yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6998 from zmstone/chore-package-name-from-rhel-to-el 

build: rename distro from 'rhel' to 'el'
This commit is contained in:
Zaiming (Stone) Shi 2022-02-14 10:47:00 +01:00 committed by GitHub
parent 5985b7cb09 9f897a650a
commit 9696663a77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build_packages.yaml vendored
View File

@ -294,9 +294,9 @@ jobs:
export ARCH="arm" export ARCH="arm"
fi fi
if [ "$SYSTEM" = 'centos7' ]; then if [ "$SYSTEM" = 'centos7' ]; then
DISTRO='rhel7' DISTRO='el7'
elif [ "$SYSTEM" = 'rockylinux8' ]; then elif [ "$SYSTEM" = 'rockylinux8' ]; then
DISTRO='rhel8' DISTRO='el8'
else else
DISTRO=${SYSTEM} DISTRO=${SYSTEM}
fi fi

4
build
View File

@ -150,7 +150,7 @@ make_docker() {
## Name Default Example ## Name Default Example
## --------------------------------------------------------------------- ## ---------------------------------------------------------------------
## EMQX_BASE_IMAGE current os centos:7 ## EMQX_BASE_IMAGE current os centos:7
## EMQX_ZIP_PACKAGE _packages/<current-zip-target> /tmp/emqx-4.4.0-otp24.1.5-3-rhel7-amd64.zip ## EMQX_ZIP_PACKAGE _packages/<current-zip-target> /tmp/emqx-4.4.0-otp24.1.5-3-el7-amd64.zip
## EMQX_IMAGE_TAG emqx/emqx:<current-vns-rel> emqx/emqx:testing-tag ## EMQX_IMAGE_TAG emqx/emqx:<current-vns-rel> emqx/emqx:testing-tag
## ##
make_docker_testing() { make_docker_testing() {
@ -159,7 +159,7 @@ make_docker_testing() {
ubuntu20*) ubuntu20*)
EMQX_BASE_IMAGE="ubuntu:20.04" EMQX_BASE_IMAGE="ubuntu:20.04"
;; ;;
rhel8) el8)
EMQX_BASE_IMAGE="rockylinux:8" EMQX_BASE_IMAGE="rockylinux:8"
;; ;;
*) *)

2
scripts/get-distro.sh
View File

@ -11,7 +11,7 @@ if [ "$(uname -s)" = 'Darwin' ]; then
SYSTEM="$(echo "${DIST}${VERSION_ID}" | gsed -r 's/([a-zA-Z]*)-.*/\1/g')" SYSTEM="$(echo "${DIST}${VERSION_ID}" | gsed -r 's/([a-zA-Z]*)-.*/\1/g')"
elif [ "$(uname -s)" = 'Linux' ]; then elif [ "$(uname -s)" = 'Linux' ]; then
if grep -q -i 'rhel' /etc/*-release; then if grep -q -i 'rhel' /etc/*-release; then
DIST='rhel' DIST='el'
VERSION_ID="$(rpm --eval '%{rhel}')" VERSION_ID="$(rpm --eval '%{rhel}')"
else else
DIST="$(sed -n '/^ID=/p' /etc/os-release | sed -r 's/ID=(.*)/\1/g' | sed 's/"//g')" DIST="$(sed -n '/^ID=/p' /etc/os-release | sed -r 's/ID=(.*)/\1/g' | sed 's/"//g')"