diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-10 11:11:46 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-10 11:11:46 -0800 |
| commit | 6524041fb0ebfc35dafe3bb7bebbd4dfa27ba5e8 (patch) | |
| tree | cf6e4191124ea1c44b9cadb504c0b2f5e6269a50 /.papr_prepare.sh | |
| parent | e4525cf844535014923a2253e8531d92d9e556e5 (diff) | |
| parent | 45fb935fe44a383ae14f16ab533281687d642c5e (diff) | |
| download | podman-6524041fb0ebfc35dafe3bb7bebbd4dfa27ba5e8.tar.gz podman-6524041fb0ebfc35dafe3bb7bebbd4dfa27ba5e8.tar.bz2 podman-6524041fb0ebfc35dafe3bb7bebbd4dfa27ba5e8.zip | |
Merge pull request #2119 from jwhonce/wip/python_podman
Move python code from contrib to it's own repo python-podman
Diffstat (limited to '.papr_prepare.sh')
| -rw-r--r-- | .papr_prepare.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.papr_prepare.sh b/.papr_prepare.sh index 5d7d21530..b93f7b91f 100644 --- a/.papr_prepare.sh +++ b/.papr_prepare.sh @@ -4,10 +4,8 @@ set -xeuo pipefail DIST=${DIST:=Fedora} CONTAINER_RUNTIME=${CONTAINER_RUNTIME:=docker} IMAGE=fedorapodmanbuild -PYTHON=python3 if [[ ${DIST} != "Fedora" ]]; then IMAGE=centospodmanbuild - PYTHON=python fi # Since CRIU 3.11 has been pushed to Fedora 28 the checkpoint/restore @@ -21,4 +19,4 @@ modprobe iptable_nat || : ${CONTAINER_RUNTIME} build -t ${IMAGE} -f Dockerfile.${DIST} . 2>build.log # Run the tests -${CONTAINER_RUNTIME} run --rm --privileged --net=host -v $PWD:/go/src/github.com/containers/libpod:Z --workdir /go/src/github.com/containers/libpod -e CGROUP_MANAGER=cgroupfs -e PYTHON=$PYTHON -e STORAGE_OPTIONS="--storage-driver=vfs" -e CRIO_ROOT="/go/src/github.com/containers/libpod" -e PODMAN_BINARY="/usr/bin/podman" -e CONMON_BINARY="/usr/libexec/podman/conmon" -e DIST=$DIST -e CONTAINER_RUNTIME=$CONTAINER_RUNTIME $IMAGE sh ./.papr.sh -b -i -t +${CONTAINER_RUNTIME} run --rm --privileged --net=host -v $PWD:/go/src/github.com/containers/libpod:Z --workdir /go/src/github.com/containers/libpod -e CGROUP_MANAGER=cgroupfs -e STORAGE_OPTIONS="--storage-driver=vfs" -e CRIO_ROOT="/go/src/github.com/containers/libpod" -e PODMAN_BINARY="/usr/bin/podman" -e CONMON_BINARY="/usr/libexec/podman/conmon" -e DIST=$DIST -e CONTAINER_RUNTIME=$CONTAINER_RUNTIME $IMAGE sh ./.papr.sh -b -i -t |