diff options
author | Matthew Heon <matthew.heon@gmail.com> | 2018-10-17 18:44:56 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-17 18:44:56 -0400 |
commit | d01382aed1429d5aa2dea77fb15569b03f45e9a1 (patch) | |
tree | c2c4992606864554b346ebbfa7bddc5061bd3bcc /.papr_prepare.sh | |
parent | 19c150bef12ff08abc8249cc21275266a7ac74a3 (diff) | |
parent | bfc473f982ecdbfbe885d104036ecf9f70f3cd0f (diff) | |
download | podman-d01382aed1429d5aa2dea77fb15569b03f45e9a1.tar.gz podman-d01382aed1429d5aa2dea77fb15569b03f45e9a1.tar.bz2 podman-d01382aed1429d5aa2dea77fb15569b03f45e9a1.zip |
Merge pull request #1676 from baude/updatebuildah
Vendor in new new buildah/ci
Diffstat (limited to '.papr_prepare.sh')
-rw-r--r-- | .papr_prepare.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.papr_prepare.sh b/.papr_prepare.sh index b15884478..fbb3647ce 100644 --- a/.papr_prepare.sh +++ b/.papr_prepare.sh @@ -14,4 +14,4 @@ fi ${CONTAINER_RUNTIME} build -t ${IMAGE} -f Dockerfile.${DIST} . 2>build.log # Run the tests -${CONTAINER_RUNTIME} run --rm --cap-add all --security-opt seccomp:unconfined --security-opt label:disabled --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 --cap-add all --security-opt seccomp=unconfined --security-opt label=disable --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 |