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

build: use rockylinux and 'rhel' for package names

This commit is contained in:
Zaiming (Stone) Shi 2022-02-09 14:04:19 +01:00
parent 674752dcb3
commit d863609f43
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -240,17 +240,12 @@ jobs:
- ubuntu16.04 - ubuntu16.04
- debian10 - debian10
- debian9 - debian9
# - opensuse - rockylinux8
- centos8
- centos7 - centos7
- centos6
- raspbian10 - raspbian10
# - raspbian9
exclude: exclude:
- package: pkg - package: pkg
otp: 23.3.4.9-3 otp: 23.3.4.9-3
- os: centos6
arch: arm64
- os: raspbian9 - os: raspbian9
arch: amd64 arch: amd64
- os: raspbian10 - os: raspbian10
@ -298,12 +293,18 @@ jobs:
if [ ! -z "$(echo $SYSTEM | grep -oE 'raspbian')" ]; then if [ ! -z "$(echo $SYSTEM | grep -oE 'raspbian')" ]; then
export ARCH="arm" export ARCH="arm"
fi fi
if [ "$SYSTEM" = 'centos7' ]; then
DISTRO='rhel7'
elif [ "$SYSTEM" = 'rockylinux8' ]; then
DISTRO='rhel8'
else
DISTRO=${SYSTEM}
fi
mkdir -p _upgrade_base mkdir -p _upgrade_base
cd _upgrade_base cd _upgrade_base
old_vsns=($(echo $OLD_VSNS | tr ' ' ' ')) old_vsns=($(echo $OLD_VSNS | tr ' ' ' '))
for tag in ${old_vsns[@]}; do for tag in ${old_vsns[@]}; do
package_name="${PROFILE}-${tag#[e|v]}-otp${OTP_VSN}-${SYSTEM}-${ARCH}" package_name="${PROFILE}-${tag#[e|v]}-otp${OTP_VSN}-${DISTRO}-${ARCH}"
if [ ! -z "$(echo $(curl -I -m 10 -o /dev/null -s -w %{http_code} https://s3-us-west-2.amazonaws.com/packages.emqx/$broker/$tag/$package_name.zip) | grep -oE "^[23]+")" ]; then if [ ! -z "$(echo $(curl -I -m 10 -o /dev/null -s -w %{http_code} https://s3-us-west-2.amazonaws.com/packages.emqx/$broker/$tag/$package_name.zip) | grep -oE "^[23]+")" ]; then
wget --no-verbose https://s3-us-west-2.amazonaws.com/packages.emqx/$broker/$tag/$package_name.zip wget --no-verbose https://s3-us-west-2.amazonaws.com/packages.emqx/$broker/$tag/$package_name.zip
wget --no-verbose https://s3-us-west-2.amazonaws.com/packages.emqx/$broker/$tag/$package_name.zip.sha256 wget --no-verbose https://s3-us-west-2.amazonaws.com/packages.emqx/$broker/$tag/$package_name.zip.sha256

6
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-centos7-amd64.zip ## EMQX_ZIP_PACKAGE _packages/<current-zip-target> /tmp/emqx-4.4.0-otp24.1.5-3-rhel7-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,8 +159,8 @@ make_docker_testing() {
ubuntu20*) ubuntu20*)
EMQX_BASE_IMAGE="ubuntu:20.04" EMQX_BASE_IMAGE="ubuntu:20.04"
;; ;;
centos8) rhel8)
EMQX_BASE_IMAGE="centos:8" EMQX_BASE_IMAGE="rockylinux:8"
;; ;;
*) *)
echo "Unsupported testing base image for $SYSTEM" echo "Unsupported testing base image for $SYSTEM"

6
scripts/buildx.sh
View File

@ -69,9 +69,11 @@ fi
cd "${SRC_DIR:-.}" cd "${SRC_DIR:-.}"
set -x
PKG_VSN="${PKG_VSN:-$(./pkg-vsn.sh)}" PKG_VSN="${PKG_VSN:-$(./pkg-vsn.sh)}"
OTP_VSN_SYSTEM=$(echo "$BUILDER" | cut -d ':' -f2) OTP_VSN="$(docker run -v $(pwd):/src --rm "$BUILDER" bash /src/scripts/get-otp-vsn.sh)"
PKG_NAME="${PROFILE}-${PKG_VSN}-otp${OTP_VSN_SYSTEM}-${ARCH}" DISTRO="$(docker run -v $(pwd):/src --rm "$BUILDER" bash /src/scripts/get-distro.sh)"
PKG_NAME="${PROFILE}-${PKG_VSN}-otp${OTP_VSN}-${DISTRO}-${ARCH}"
docker info docker info
docker run --rm --privileged tonistiigi/binfmt:latest --install ${ARCH} docker run --rm --privileged tonistiigi/binfmt:latest --install ${ARCH}

6
scripts/get-distro.sh
View File

@ -10,9 +10,9 @@ if [ "$(uname -s)" = 'Darwin' ]; then
VERSION_ID=$(sw_vers | gsed -n '/^ProductVersion:/p' | gsed -r 's/ProductVersion:(.*)/\1/g' | gsed -r 's/([0-9]+).*/\1/g' | gsed 's/^[ \t]*//g') VERSION_ID=$(sw_vers | gsed -n '/^ProductVersion:/p' | gsed -r 's/ProductVersion:(.*)/\1/g' | gsed -r 's/([0-9]+).*/\1/g' | gsed 's/^[ \t]*//g')
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 'centos' /etc/*-release; then if grep -q -i 'rhel' /etc/*-release; then
DIST='centos' DIST='rhel'
VERSION_ID="$(rpm --eval '%{centos_ver}')" 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')"
VERSION_ID="$(sed -n '/^VERSION_ID=/p' /etc/os-release | sed -r 's/VERSION_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')"