Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from singularityware/development
Development
- Loading branch information
Showing
190 changed files
with
5,086 additions
and
1,192 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,21 @@ | ||
#!/bin/bash -ex | ||
|
||
# This script starts docker and (on el7) systemd and runs a test | ||
DIST="${OS_TYPE}${OS_VERSION}" | ||
|
||
if [ "$OS_VERSION" = "6" ]; then | ||
sudo docker run --privileged --rm=true -v `pwd`:/build:rw centos:${OS_VERSION} /bin/bash -exc "cd /build;.travis/rpmbuild_test $OS_VERSION" | ||
exit | ||
fi | ||
mkdir /tmp/$DIST | ||
|
||
# Mount /var/run/docker.sock and set --network=host so we can call docker from inside | ||
# cause some tests need it. Cannot mount to /var/run/docker.sock inside cause CentOS | ||
# /usr/sbin/init mounts another overlayfs on top of it | ||
docker run --privileged -d -ti -e "container=docker" -v /var/run/docker.sock:/docker.sock --network=host \ | ||
-v /sys/fs/cgroup:/sys/fs/cgroup -v `pwd`:/build:rw centos:${OS_VERSION} /usr/sbin/init | ||
DOCKER_CONTAINER_ID=$(docker ps | grep centos | awk '{print $1}') | ||
docker logs $DOCKER_CONTAINER_ID | ||
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -exc " | ||
export DOCKER_HOST=unix:///docker.sock | ||
chmod o+rw /docker.sock && | ||
cd /build && | ||
.travis/rpmbuild_test $OS_VERSION | ||
" | ||
docker ps -a | ||
docker stop $DOCKER_CONTAINER_ID | ||
docker rm -v $DOCKER_CONTAINER_ID | ||
cp -a . /tmp/$DIST/singularity | ||
cat > "/tmp/$DIST/script" << SCRIPT | ||
#!/bin/bash | ||
echo "%_var /var" > /root/.rpmmacros | ||
echo "%_dbpath %{_var}/lib/rpm" >> /root/.rpmmacros | ||
.travis/rpmbuild_test $OS_VERSION | ||
SCRIPT | ||
|
||
cd /tmp/$DIST/singularity | ||
|
||
# mounting /run for /dev/shm (python multiprocessing) | ||
sudo singularity exec -w -B /run --keep-privs --allow-setuid docker://${OS_TYPE}:${OS_VERSION} /bin/bash -ex /tmp/$DIST/script | ||
sudo rm -rf /tmp/$DIST |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,4 +3,5 @@ | |
./autogen.sh | ||
./configure --prefix=/usr/local | ||
sudo make install | ||
sudo make secbuildimg | ||
make test |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.