catatonit: clone and build

Instead of unconditionally pulling the x86 binary, clone the repository
and build the binary to make it independent of the architecture.

Fixes: #2699
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

6 files changed, 25 insertions, 4 deletions

diff --git a/Dockerfile b/Dockerfile
index 1f51cd874..3c65bf5a8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,7 @@ RUN apt-get update && apt-get install -y \
     build-essential \
     curl \
     e2fslibs-dev \
+    file \
     gawk \
     gettext \
     go-md2man \
diff --git a/Dockerfile.centos b/Dockerfile.centos
index 513c4bdfd..9af7ef7f1 100644
--- a/Dockerfile.centos
+++ b/Dockerfile.centos
@@ -2,9 +2,12 @@ FROM registry.centos.org/centos/centos:7
 
 RUN yum -y install btrfs-progs-devel \
               atomic-registries \
+              autoconf \
+              automake \
               bzip2 \
               device-mapper-devel \
               findutils \
+              file \
               git \
               glibc-static \
               glib2-devel \
@@ -15,6 +18,7 @@ RUN yum -y install btrfs-progs-devel \
               libassuan-devel \
               libseccomp-devel \
               libselinux-devel \
+              libtool \
               containers-common \
               runc \
               make \
diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index 9b1568b0b..8769b5c18 100644
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -2,8 +2,11 @@ FROM registry.fedoraproject.org/fedora:30
 
 RUN dnf -y install btrfs-progs-devel \
               atomic-registries \
+              autoconf \
+              automake \
               bzip2 \
               device-mapper-devel \
+              file \
               findutils \
               git \
               glib2-devel \
@@ -15,6 +18,7 @@ RUN dnf -y install btrfs-progs-devel \
               libassuan-devel \
               libseccomp-devel \
               libselinux-devel \
+              libtool \
               containers-common \
               runc \
               make \
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh
index 6709eecaf..d948a0afa 100644
--- a/contrib/cirrus/packer/fedora_setup.sh
+++ b/contrib/cirrus/packer/fedora_setup.sh
@@ -36,6 +36,7 @@ ooe.sh sudo dnf install -y \
     criu \
     device-mapper-devel \
     emacs-nox \
+    file \
     findutils \
     fuse3 \
     fuse3-devel \
@@ -59,6 +60,7 @@ ooe.sh sudo dnf install -y \
     libseccomp \
     libseccomp-devel \
     libselinux-devel \
+    libtool \
     libvarlink-util \
     lsof \
     make \
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh
index da7d457a5..d20e7e005 100644
--- a/contrib/cirrus/packer/ubuntu_setup.sh
+++ b/contrib/cirrus/packer/ubuntu_setup.sh
@@ -52,6 +52,7 @@ $BIGTO $SUDOAPTGET install \
     curl \
     e2fslibs-dev \
     emacs-nox \
+    file \
     gawk \
     gcc \
     gettext \
diff --git a/hack/install_catatonit.sh b/hack/install_catatonit.sh
index 1ba399d19..7fd7592a9 100755
--- a/hack/install_catatonit.sh
+++ b/hack/install_catatonit.sh
@@ -6,10 +6,19 @@ CATATONIT_VERSION="v0.1.4"
 if [ -f $CATATONIT_PATH ]; then
 	echo "skipping ... catatonit is already installed"
 else
-	echo "downloading catatonit to $CATATONIT_PATH"
-	curl -o catatonit -L https://github.com/openSUSE/catatonit/releases/download/$CATATONIT_VERSION/catatonit.x86_64
-	chmod +x catatonit
+	echo "installing catatonit to $CATATONIT_PATH"
+	buildDir=$(mktemp -d)
+	git clone https://github.com/openSUSE/catatonit.git $buildDir
+
+	pushd $buildDir
+	echo `pwd`
+	git reset --hard ${CATATONIT_VERSION}
+	autoreconf -fi
+	./configure
+	make
 	install ${SELINUXOPT} -d -m 755 $BASE_PATH
 	install ${SELINUXOPT} -m 755 catatonit $CATATONIT_PATH
-	rm catatonit
+	popd
+
+	rm -rf $buildDir
 fi