diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-01 06:05:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-01 06:05:22 -0700 |
| commit | 049aafa4c094f604b1985fe3975762573d7f64e7 (patch) | |
| tree | a5eb3c6caa04f1c63a9c9b6eb765ee69899eebc0 | |
| parent | 5d344db8d776190568df9c3b73fd22b632c9c135 (diff) | |
| parent | 80f6af7766a1b47715a0cd8d1fab567750dcdc31 (diff) | |
| download | podman-049aafa4c094f604b1985fe3975762573d7f64e7.tar.gz podman-049aafa4c094f604b1985fe3975762573d7f64e7.tar.bz2 podman-049aafa4c094f604b1985fe3975762573d7f64e7.zip | |
Merge pull request #4090 from vrothberg/build-catatonit
Build catatonit
| -rw-r--r-- | Dockerfile | 1 | ||||
| -rw-r--r-- | Dockerfile.centos | 4 | ||||
| -rw-r--r-- | contrib/cirrus/packer/fedora_setup.sh | 2 | ||||
| -rw-r--r-- | contrib/cirrus/packer/ubuntu_setup.sh | 1 | ||||
| -rwxr-xr-x | hack/install_catatonit.sh | 19 |
5 files changed, 22 insertions, 5 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/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh index 8e0a2b2ee..679ad3b8d 100644 --- a/contrib/cirrus/packer/fedora_setup.sh +++ b/contrib/cirrus/packer/fedora_setup.sh @@ -37,6 +37,7 @@ ooe.sh sudo dnf install -y \ criu \ device-mapper-devel \ emacs-nox \ + file \ findutils \ fuse3 \ fuse3-devel \ @@ -61,6 +62,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 c94e74a08..2f54da9ed 100644 --- a/contrib/cirrus/packer/ubuntu_setup.sh +++ b/contrib/cirrus/packer/ubuntu_setup.sh @@ -61,6 +61,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 e5532a200..7fd7592a9 100755 --- a/hack/install_catatonit.sh +++ b/hack/install_catatonit.sh @@ -1,15 +1,24 @@ #!/bin/bash -e BASE_PATH="/usr/libexec/podman" CATATONIT_PATH="${BASE_PATH}/catatonit" -CATATONIT_VERSION="v0.1.3" +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 |