diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-16 18:16:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-16 18:16:34 +0100 |
| commit | 197ebe8b5e6c10db786ad22692536e395c911b87 (patch) | |
| tree | a75c897b014fede28374b62d1bacc81957d3c70d /hack | |
| parent | f031bd23c6f5f790dde383d542c940bfe2dfaadd (diff) | |
| parent | c8790bfbbb845450608adc7a0a03b77979165f42 (diff) | |
| download | podman-197ebe8b5e6c10db786ad22692536e395c911b87.tar.gz podman-197ebe8b5e6c10db786ad22692536e395c911b87.tar.bz2 podman-197ebe8b5e6c10db786ad22692536e395c911b87.zip | |
Merge pull request #12218 from vrothberg/pause-catatonit
infra container: replace pause with catatonit
Diffstat (limited to 'hack')
| -rwxr-xr-x | hack/install_catatonit.sh | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/hack/install_catatonit.sh b/hack/install_catatonit.sh index 0a02b75ab..a35e349f5 100755 --- a/hack/install_catatonit.sh +++ b/hack/install_catatonit.sh @@ -4,22 +4,23 @@ CATATONIT_PATH="${BASE_PATH}/catatonit" CATATONIT_VERSION="v0.1.7" set -e -if [ -f $CATATONIT_PATH ]; then +if [ -f $CATATONIT_PATH ] && [ -z "$1" ]; then echo "skipping ... catatonit is already installed" -else - echo "installing catatonit to $CATATONIT_PATH" - buildDir=$(mktemp -d) - git clone https://github.com/openSUSE/catatonit.git $buildDir + exit 0 +fi - 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 - popd +echo "installing catatonit to $CATATONIT_PATH" +buildDir=$(mktemp -d) +git clone https://github.com/openSUSE/catatonit.git $buildDir - rm -rf $buildDir -fi +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 +popd + +rm -rf $buildDir |