containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Valentin Rothberg 2019-09-24 12:36:50 +02:00
parent 6f4e3beedc
commit 80f6af7766
6 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -8,6 +8,7 @@ RUN apt-get update && apt-get install -y \
build-essential \ build-essential \
curl \ curl \
e2fslibs-dev \ e2fslibs-dev \
file \
gawk \ gawk \
gettext \ gettext \
go-md2man \ go-md2man \

4
Dockerfile.centos
View File

@ -2,9 +2,12 @@ FROM registry.centos.org/centos/centos:7
RUN yum -y install btrfs-progs-devel \ RUN yum -y install btrfs-progs-devel \
atomic-registries \ atomic-registries \
autoconf \
automake \
bzip2 \ bzip2 \
device-mapper-devel \ device-mapper-devel \
findutils \ findutils \
file \
git \ git \
glibc-static \ glibc-static \
glib2-devel \ glib2-devel \
@ -15,6 +18,7 @@ RUN yum -y install btrfs-progs-devel \
libassuan-devel \ libassuan-devel \
libseccomp-devel \ libseccomp-devel \
libselinux-devel \ libselinux-devel \
libtool \
containers-common \ containers-common \
runc \ runc \
make \ make \

4
Dockerfile.fedora
View File

@ -2,8 +2,11 @@ FROM registry.fedoraproject.org/fedora:30
RUN dnf -y install btrfs-progs-devel \ RUN dnf -y install btrfs-progs-devel \
atomic-registries \ atomic-registries \
autoconf \
automake \
bzip2 \ bzip2 \
device-mapper-devel \ device-mapper-devel \
file \
findutils \ findutils \
git \ git \
glib2-devel \ glib2-devel \
@ -15,6 +18,7 @@ RUN dnf -y install btrfs-progs-devel \
libassuan-devel \ libassuan-devel \
libseccomp-devel \ libseccomp-devel \
libselinux-devel \ libselinux-devel \
libtool \
containers-common \ containers-common \
runc \ runc \
make \ make \

2
contrib/cirrus/packer/fedora_setup.sh
View File

@ -36,6 +36,7 @@ ooe.sh sudo dnf install -y \
criu \ criu \
device-mapper-devel \ device-mapper-devel \
emacs-nox \ emacs-nox \
file \
findutils \ findutils \
fuse3 \ fuse3 \
fuse3-devel \ fuse3-devel \
@ -59,6 +60,7 @@ ooe.sh sudo dnf install -y \
libseccomp \ libseccomp \
libseccomp-devel \ libseccomp-devel \
libselinux-devel \ libselinux-devel \
libtool \
libvarlink-util \ libvarlink-util \
lsof \ lsof \
make \ make \

1
contrib/cirrus/packer/ubuntu_setup.sh
View File

@ -52,6 +52,7 @@ $BIGTO $SUDOAPTGET install \
curl \ curl \
e2fslibs-dev \ e2fslibs-dev \
emacs-nox \ emacs-nox \
file \
gawk \ gawk \
gcc \ gcc \
gettext \ gettext \

17
hack/install_catatonit.sh
View File

@ -6,10 +6,19 @@ CATATONIT_VERSION="v0.1.4"
if [ -f $CATATONIT_PATH ]; then if [ -f $CATATONIT_PATH ]; then
echo "skipping ... catatonit is already installed" echo "skipping ... catatonit is already installed"
else else
echo "downloading catatonit to $CATATONIT_PATH" echo "installing catatonit to $CATATONIT_PATH"
curl -o catatonit -L https://github.com/openSUSE/catatonit/releases/download/$CATATONIT_VERSION/catatonit.x86_64 buildDir=$(mktemp -d)
chmod +x catatonit 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} -d -m 755 $BASE_PATH
install ${SELINUXOPT} -m 755 catatonit $CATATONIT_PATH install ${SELINUXOPT} -m 755 catatonit $CATATONIT_PATH
rm catatonit popd
rm -rf $buildDir
fi fi