summaryrefslogtreecommitdiff
path: root/.papr.sh
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2017-12-13 13:28:29 -0600
committerAtomic Bot <atomic-devel@projectatomic.io>2017-12-13 20:10:48 +0000
commit4db49476616b706902c647995467adbb0a044b24 (patch)
tree68e5ce7085f2442206bed9ab28f21657325601df /.papr.sh
parente456c07813c5ccc6ccc81ad9a103e46e1b59b50c (diff)
downloadpodman-4db49476616b706902c647995467adbb0a044b24.tar.gz
podman-4db49476616b706902c647995467adbb0a044b24.tar.bz2
podman-4db49476616b706902c647995467adbb0a044b24.zip
selinux issues
Signed-off-by: baude <bbaude@redhat.com> Closes: #133 Approved by: rhatdan
Diffstat (limited to '.papr.sh')
-rwxr-xr-x.papr.sh13
1 files changed, 3 insertions, 10 deletions
diff --git a/.papr.sh b/.papr.sh
index e3cb17509..a1e1fe1db 100755
--- a/.papr.sh
+++ b/.papr.sh
@@ -34,7 +34,9 @@ if test -z "${INSIDE_CONTAINER:-}"; then
--privileged \
-v $PWD:/go/src/github.com/projectatomic/libpod \
-v /etc/yum.repos.d:/etc/yum.repos.d.host:ro \
- -v /:/host \
+ -v /usr:/host/usr \
+ -v /etc:/host/etc \
+ -v /host:/host/var \
--workdir /go/src/github.com/projectatomic/libpod \
-e INSIDE_CONTAINER=1 \
-e PYTHON=$PYTHON \
@@ -49,7 +51,6 @@ export PATH=$HOME/gopath/bin:$PATH
export GOSRC=/$GOPATH/src/github.com/projectatomic/libpod
${PACKAGER} install -y \
- bats \
btrfs-progs-devel \
bzip2 \
device-mapper-devel \
@@ -86,16 +87,8 @@ make install.tools TAGS="${TAGS}"
if [[ ${PACKAGER} != "yum" ]]; then
HEAD=$GITVALIDATE_TIP make -C $GOSRC .gitvalidation TAGS="${TAGS}"
make lint
- dnf install -y --installroot /host bats
fi
make TAGS="${TAGS}"
make TAGS="${TAGS}" install PREFIX=/host/usr
make TAGS="${TAGS}" test-binaries
-
-if [[ ${PACKAGER} == "yum" ]]; then
- # Install EPEL to get Bats
- ${PACKAGER} -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
- ${PACKAGER} install --downloadonly --downloaddir=/tmp bats
- cd /host && rpm2cpio /tmp/bats*.rpm | cpio -ivd
-fi