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

build: rockylinux

This commit is contained in:
Zaiming (Stone) Shi 2022-02-17 15:50:17 +01:00
parent 829bd8258a
commit fa91c7491f
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,10 +227,9 @@ jobs:
- ubuntu16.04 - ubuntu16.04
- debian10 - debian10
- debian9 - debian9
# - opensuse - rockylinux8
- centos7 - centos7
- raspbian10 - raspbian10
# - raspbian9
build_machine: build_machine:
- aws-arm64 - aws-arm64
- ubuntu-20.04 - ubuntu-20.04

2
.github/workflows/build_slim_packages.yaml vendored
View File

@ -41,7 +41,7 @@ jobs:
- 1.13.3 - 1.13.3
os: os:
- ubuntu20.04 - ubuntu20.04
- centos7 - rockylinux8
container: "ghcr.io/emqx/emqx-builder/5.0-7:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}" container: "ghcr.io/emqx/emqx-builder/5.0-7:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"

4
build
View File

@ -209,8 +209,8 @@ make_docker() {
## ##
## Name Default Example ## Name Default Example
## --------------------------------------------------------------------- ## ---------------------------------------------------------------------
## EMQX_BASE_IMAGE current os centos:7 ## EMQX_BASE_IMAGE current os el:7
## EMQX_TGZ_packages/<current-tgz-target> /tmp/emqx-4.4.0-otp23.3.4.9-3-centos7-amd64.tar.gz ## EMQX_TGZ_packages/<current-tgz-target> /tmp/emqx-4.4.0-otp23.3.4.9-3-el7-amd64.tar.gz
## 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() {

8
scripts/get-distro.sh
View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
## This script prints Linux distro name and its version number ## 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 set -euo pipefail
@ -14,9 +14,9 @@ case "$UNAME" in
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')"
;; ;;
Linux) Linux)
if grep -q -i 'centos' /etc/*-release; then if grep -q -i 'rhel' /etc/*-release; then
DIST='centos' DIST='el'
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')"

2
scripts/update_appup.escript
View File

@ -33,7 +33,7 @@ Options:
--release-dir Release directory --release-dir Release directory
--src-dirs Directories where source code is found. Defaults to '{src,apps,lib-*}/**/' --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. --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, -record(app,