You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2022/05/04 04:45:16 UTC
[couchdb-ci] branch update-ci-images-rocky-8-and-latest-otp-versions created (now afb75a2)
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a change to branch update-ci-images-rocky-8-and-latest-otp-versions
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git
at afb75a2 Cleanup and fix RPM dependencies
This branch includes the following new commits:
new 81072f7 Update kerl erlangs to latest OTP versions
new f00c4e4 Update README with instructions on how to login with podman
new ecb43ca Use Rocky Linux instead of CentOS 8
new afb75a2 Cleanup and fix RPM dependencies
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[couchdb-ci] 01/04: Update kerl erlangs to latest OTP versions
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch update-ci-images-rocky-8-and-latest-otp-versions
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git
commit 81072f78147cbb0a53950fe1486999e6fafd0dde
Author: Nick Vatamaniuc <va...@gmail.com>
AuthorDate: Wed May 4 00:32:31 2022 -0400
Update kerl erlangs to latest OTP versions
Don't think these actually used and we should remove them eventually. But for
now let's keep them in sync with latest erlang tagged images.
---
dockerfiles/debian-bullseye | 2 +-
dockerfiles/debian-buster | 2 +-
dockerfiles/{centos-8 => rockylinux-8} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dockerfiles/debian-bullseye b/dockerfiles/debian-bullseye
index 0a79050..878d2c1 100644
--- a/dockerfiles/debian-bullseye
+++ b/dockerfiles/debian-bullseye
@@ -27,7 +27,7 @@ ARG js=js
ARG erlang=erlang
# Select version of Node, Erlang and Elixir
ARG erlangversion=20.3.8.26-1
-ARG kerlversions=20.3.8.26,21.3.8.24,22.3.4.24,23.3.4.10,24.2
+ARG kerlversions=20.3.8.26,21.3.8.24,22.3.4.26,23.3.4.14,24.3.4
ARG elixirversion=v1.9.4
ARG nodeversion=14
diff --git a/dockerfiles/debian-buster b/dockerfiles/debian-buster
index 8bf78eb..61778f6 100644
--- a/dockerfiles/debian-buster
+++ b/dockerfiles/debian-buster
@@ -27,7 +27,7 @@ ARG js=js
ARG erlang=erlang
# Select version of Node, Erlang and Elixir
ARG erlangversion=20.3.8.26-1
-ARG kerlversions=20.3.8.26,21.3.8.22,22.3.4.17,23.3.1
+ARG kerlversions=20.3.8.26,21.3.8.24,22.3.4.26,23.3.4.14,24.3.4
ARG elixirversion=v1.9.4
ARG nodeversion=14
diff --git a/dockerfiles/centos-8 b/dockerfiles/rockylinux-8
similarity index 100%
rename from dockerfiles/centos-8
rename to dockerfiles/rockylinux-8
[couchdb-ci] 03/04: Use Rocky Linux instead of CentOS 8
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch update-ci-images-rocky-8-and-latest-otp-versions
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git
commit ecb43cadb2c3b2187eac574283bb0ad144e0be88
Author: Nick Vatamaniuc <va...@gmail.com>
AuthorDate: Wed May 4 00:37:00 2022 -0400
Use Rocky Linux instead of CentOS 8
Make sure VERSION_ID stays as a major version as it may not always be true
---
bin/detect-os.sh | 6 +++++-
bin/install-dependencies.sh | 2 +-
bin/source-erlang.sh | 2 +-
build.sh | 2 +-
dockerfiles/rockylinux-8 | 2 +-
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/bin/detect-os.sh b/bin/detect-os.sh
index 8359d24..a1c6a10 100755
--- a/bin/detect-os.sh
+++ b/bin/detect-os.sh
@@ -68,13 +68,17 @@ case "${OSTYPE}" in
# and finally some rough heuristics
if [[ -f /etc/redhat-release ]]; then
# /etc/redhat-release is so inconsistent, we use rpm instead
- rhelish=$(rpm -qa '(redhat|sl|slf|centos|centos-linux|oraclelinux)-release(|-server|-workstation|-client|-computenode)' 2>/dev/null | head -1)
+ rhelish=$(rpm -qa '(redhat|sl|slf|centos|centos-linux|oraclelinux|rocky)-release(|-server|-workstation|-client|-computenode)' 2>/dev/null | head -1)
if [[ $rhelish ]]; then
ID=${ID:-$(echo ${rhelish} | awk -F'-' '{print tolower($1)}')}
VERSION_ID=${VERSION_ID:-$(echo ${rhelish} | sed -E 's/([^[:digit:]]+)([[:digit:]]+)(.*)/\2/' )}
VERSION_CODENAME=${VERSION_CODENAME:-${VERSION_ID}}
DISTRIB_CODENAME=${VERSION_CODENAME:-${VERSION_ID}}
fi
+ # We expect VERSION_ID for RPM distros to be major version only (and as read
+ # from /etc/os-release it might not be) so we ensure that below
+ VERSION_ID=$(echo ${VERSION_ID} | cut -d. -f1)
+
elif [[ -f /etc/debian_version ]]; then
# Ubuntu keeps changing the format of /etc/os-release's VERSION, and
# it's numeric, not the codename. Boo.
diff --git a/bin/install-dependencies.sh b/bin/install-dependencies.sh
index 90e4c0e..e670871 100755
--- a/bin/install-dependencies.sh
+++ b/bin/install-dependencies.sh
@@ -83,7 +83,7 @@ arms='(aarch64)'
case "${OSTYPE}" in
linux*)
- redhats='(rhel|centos|fedora)'
+ redhats='(rhel|centos|fedora|rocky)'
debians='(debian|ubuntu)'
latest='(stretch|buster|bionic)'
diff --git a/bin/source-erlang.sh b/bin/source-erlang.sh
index 0914cf6..46fffaa 100755
--- a/bin/source-erlang.sh
+++ b/bin/source-erlang.sh
@@ -38,7 +38,7 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
. ${SCRIPTPATH}/detect-os.sh
-redhats='(rhel|centos|fedora)'
+redhats='(rhel|centos|fedora|rocky)'
debians='(debian|ubuntu)'
echo "Erlang source build started @ $(date)"
diff --git a/build.sh b/build.sh
index 2089c77..b921eaa 100755
--- a/build.sh
+++ b/build.sh
@@ -44,7 +44,7 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# also https://endoflife.software/operating-systems/linux/centos
DEBIANS="debian-stretch debian-buster debian-bullseye"
UBUNTUS="ubuntu-bionic ubuntu-focal"
-CENTOSES="centos-7 centos-8"
+CENTOSES="centos-7 rockylinux-8"
ERLANGALL_BASE="debian-bullseye"
XPLAT_BASE="debian-bullseye"
XPLAT_ARCHES="arm64v8 ppc64le"
diff --git a/dockerfiles/rockylinux-8 b/dockerfiles/rockylinux-8
index 6423867..4f7482d 100644
--- a/dockerfiles/rockylinux-8
+++ b/dockerfiles/rockylinux-8
@@ -17,7 +17,7 @@
# NOTE: These are intended to be built using the arguments as
# described in ../build.sh. See that script for more details.
-FROM centos:8
+FROM rockylinux:8
# Choose whether to install SpiderMonkey 1.8.5, default yes
ARG js=js
[couchdb-ci] 04/04: Cleanup and fix RPM dependencies
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch update-ci-images-rocky-8-and-latest-otp-versions
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git
commit afb75a2d84818c664431bd731c6d5cc779d2ed42
Author: Nick Vatamaniuc <va...@gmail.com>
AuthorDate: Wed May 4 00:43:17 2022 -0400
Cleanup and fix RPM dependencies
CentOS 6 is not supported any longer.
Consolidate package installs into fewer `yum install ...` transaction to speed
up the build process.
---
bin/yum-dependencies.sh | 39 ++++++++-------------------------------
1 file changed, 8 insertions(+), 31 deletions(-)
diff --git a/bin/yum-dependencies.sh b/bin/yum-dependencies.sh
index 6d5f322..c4dc86b 100755
--- a/bin/yum-dependencies.sh
+++ b/bin/yum-dependencies.sh
@@ -86,7 +86,7 @@ echo "Detected RedHat/Centos/Fedora version: ${VERSION_ID} arch: ${ARCH}"
# Enable EPEL
yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-${VERSION_ID}.noarch.rpm || true
-# PowerTools for CentOS 8
+# PowerTools for Rocky 8
if [[ ${VERSION_ID} -gt 7 ]]; then
dnf install -y 'dnf-command(config-manager)'
dnf config-manager --set-enabled powertools
@@ -107,28 +107,18 @@ yum upgrade -y
# Install auxiliary packages
yum groupinstall -y 'Development Tools'
-yum install -y git sudo wget which
-# Dependencies for make couch, except erlang
-yum install -y autoconf autoconf213 automake curl-devel libicu-devel libtool \
- ncurses-devel nspr-devel zip readline-devel unzip \
- perl
-
-# autoconf-archive
-if [[ ${VERSION_ID} -eq 6 ]]; then
- yum install -y "http://springdale.math.ias.edu/data/puias/computational/6/x86_64/autoconf-archive-2015.02.24-1.sdl6.noarch.rpm"
-else
- yum install -y autoconf-archive
-fi
-
-# package-building stuff
-yum install -y createrepo xfsprogs-devel rpmdevtools
+# Dependencies for make couch, except erlang and package building stuff.
+# 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
# Node.js
pushd /tmp
wget https://rpm.nodesource.com/setup_${NODEVERSION}.x
set +e
-/bin/bash setup_${NODEVERSION}.x
+/bin/bash setup_${NODEVERSION}.x
if [ $? -ne 0 ]; then
set -e
# extracting the right version to dl is a pain :(
@@ -148,21 +138,8 @@ rm setup_${NODEVERSION}.x
npm install npm@latest -g
popd
-# documentation packages
-yum install -y help2man
-
# python for testing and documentaiton
-if [[ ${VERSION_ID} -eq 6 ]]; then
- yum install -y \
- https://repo.ius.io/ius-release-el6.rpm \
- https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm
- yum install -y python35u
- ln -s /usr/bin/python3.5 /usr/local/bin/python
- wget https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py
- /usr/bin/python3.5 /tmp/get-pip.py
- PIP=pip3
- ln -s /usr/bin/python3.5 /usr/local/bin/python3
-elif [[ ${VERSION_ID} -eq 7 ]]; then
+if [[ ${VERSION_ID} -eq 7 ]]; then
yum install -y python36 python36-pip python-virtualenv
PIP=pip3.6
ln -s /usr/bin/python3.6 /usr/local/bin/python3
[couchdb-ci] 02/04: Update README with instructions on how to login with podman
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch update-ci-images-rocky-8-and-latest-otp-versions
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git
commit f00c4e481e271927c2e710bac5deebb33ecee6ac
Author: Nick Vatamaniuc <va...@gmail.com>
AuthorDate: Wed May 4 00:34:00 2022 -0400
Update README with instructions on how to login with podman
It doesn't default to docker hub, so it has to be mentioned explicitly.
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 3ff8e0e..79022a0 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ For those OSes that support Docker, we run builds inside of Docker containers. T
1. You need a Docker Cloud account with access to the `apache` organization to upload images. Ask the CouchDB PMC for assistance with this.
2. `export DOCKER_ID_USER="username"`
-3. `docker login -u "username"` and enter your password.
+3. `docker login -u $username` and enter your password. (If using `podman` specify the registry `docker login -u $username docker.io`)
## Building a "platform image"