summaryrefslogtreecommitdiff
path: root/.papr_prepare.sh
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2018-02-15 08:17:35 -0600
committerAtomic Bot <atomic-devel@projectatomic.io>2018-02-16 18:35:54 +0000
commit586bb86a2ac58056b0d0d23274fb98ec599b0908 (patch)
tree831019f054727e219c2bd11a083b0b10a90cd974 /.papr_prepare.sh
parentbc1d25bb19c1664b5669c13d6ff2811571284d27 (diff)
downloadpodman-586bb86a2ac58056b0d0d23274fb98ec599b0908.tar.gz
podman-586bb86a2ac58056b0d0d23274fb98ec599b0908.tar.bz2
podman-586bb86a2ac58056b0d0d23274fb98ec599b0908.zip
Run podman inside a podman container
We should be able to run nested podman containers in particular for our testing environment. i.e. eat our own dog food. Some privileges had to be corrected in order for this to work correctly. Added a third papr target that runs podman tests inside podman. I marked the test as not required right now as we get more confident in the results Signed-off-by: baude <bbaude@redhat.com> Closes: #340 Approved by: rhatdan
Diffstat (limited to '.papr_prepare.sh')
-rw-r--r--.papr_prepare.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/.papr_prepare.sh b/.papr_prepare.sh
index b30abfc66..6fa8eb84d 100644
--- a/.papr_prepare.sh
+++ b/.papr_prepare.sh
@@ -2,6 +2,7 @@
set -xeuo pipefail
DIST=${DIST:=Fedora}
+CONTAINER_RUNTIME=${CONTAINER_RUNTIME:=docker}
IMAGE=fedorapodmanbuild
PYTHON=python3
if [[ ${DIST} != "Fedora" ]]; then
@@ -10,7 +11,7 @@ if [[ ${DIST} != "Fedora" ]]; then
fi
# Build the test image
-docker build -t ${IMAGE} -f Dockerfile.${DIST} .
+${CONTAINER_RUNTIME} build -t ${IMAGE} -f Dockerfile.${DIST} .
# Run the tests
-docker run --rm --privileged -v $PWD:/go/src/github.com/projectatomic/libpod --workdir /go/src/github.com/projectatomic/libpod -e PYTHON=$PYTHON -e STORAGE_OPTIONS="--storage-driver=vfs" -e CRIO_ROOT="/go/src/github.com/projectatomic/libpod" -e PODMAN_BINARY="/usr/bin/podman" -e CONMON_BINARY="/usr/libexec/crio/conmon" -e DIST=$DIST $IMAGE sh .papr.sh
+${CONTAINER_RUNTIME} run --rm --privileged --net=host -v $PWD:/go/src/github.com/projectatomic/libpod --workdir /go/src/github.com/projectatomic/libpod -e PYTHON=$PYTHON -e STORAGE_OPTIONS="--storage-driver=vfs" -e CRIO_ROOT="/go/src/github.com/projectatomic/libpod" -e PODMAN_BINARY="/usr/bin/podman" -e CONMON_BINARY="/usr/libexec/crio/conmon" -e DIST=$DIST $IMAGE sh .papr.sh