This is an automated email from the ASF dual-hosted git repository. vatamane pushed a commit to branch rocky8-fixes in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git
commit 3dd12cf105083cd324990391a105199f7064f686 Author: Nick Vatamaniuc <[email protected]> AuthorDate: Thu May 5 14:01:44 2022 -0400 Rock Linux 8 fixes * Keep using the centos CI docker repo for now * Forgot to install help2map which is needed for couch's RPM --- bin/yum-dependencies.sh | 2 +- build.sh | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/bin/yum-dependencies.sh b/bin/yum-dependencies.sh index c4dc86b..81f5fff 100755 --- a/bin/yum-dependencies.sh +++ b/bin/yum-dependencies.sh @@ -112,7 +112,7 @@ yum groupinstall -y 'Development Tools' # help2man is for docs yum install -y sudo git wget which autoconf autoconf-archive automake curl-devel libicu-devel \ libtool ncurses-devel nspr-devel zip readline-devel unzip perl \ - createrepo xfsprogs-devel rpmdevtools + createrepo xfsprogs-devel rpmdevtools help2man # Node.js pushd /tmp diff --git a/build.sh b/build.sh index 2f4a6e6..a40e358 100755 --- a/build.sh +++ b/build.sh @@ -99,12 +99,17 @@ buildx-base-platform() { split-os-ver $1 # invoke as build-base <plat> # base images never get JavaScript, nor Erlang + if [ "$os" == "rockylinux" ]; then + repo="centos" + else + repo="$os" + fi docker buildx build -f dockerfiles/${os}-${version} \ --build-arg js=nojs \ --build-arg erlang=noerlang \ $buildargs \ --platform ${BUILDX_PLATFORMS} \ - --tag apache/couchdbci-${os}:${version}-base \ + --tag apache/couchdbci-${repo}:${version}-base \ --push \ ${SCRIPTPATH} } @@ -149,11 +154,16 @@ buildx-platform() { find-erlang-version $1 pull-os-image $1 split-os-ver $1 + if [ "$os" == "rockylinux" ]; then + repo="centos" + else + repo="$os" + fi docker buildx build -f dockerfiles/${os}-${version} \ $buildargs \ --no-cache \ --platform ${BUILDX_PLATFORMS} \ - --tag apache/couchdbci-${os}:${version}-erlang-${ERLANGVERSION} \ + --tag apache/couchdbci-${repo}:${version}-erlang-${ERLANGVERSION} \ --push \ ${SCRIPTPATH} unset ERLANGVERSION
