travis build on el7 cleanup

This commit is contained in:
mjames-upc 2017-10-24 19:53:31 -06:00
parent ad45838f9a
commit fc6e59bb55
2 changed files with 4 additions and 9 deletions

View file

@ -8,16 +8,11 @@ language: ruby
services:
- docker
env:
matrix:
- OS_TYPE=centos OS_VERSION=centos7
before_install:
- sudo apt-get update
- echo 'DOCKER_OPTS="-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock -s devicemapper"' | sudo tee /etc/default/docker > /dev/null
- sudo service docker restart
- sleep 5
- sudo docker pull ${OS_TYPE}:${OS_VERSION}
- sudo docker pull centos:centos7
script:
- build/setup.sh ${OS_TYPE} ${OS_VERSION}
script: build/setup.sh

View file

@ -1,6 +1,6 @@
#!/bin/sh -xe
os_type=$1
os_version=$2
os_type=centos
os_version=centos7
if [ "$os_version" = "centos6" ]; then
sudo docker run --rm=true -v `pwd`:/awips2/repo/awips2-builds:rw ${os_type}:${os_version} /bin/bash -c "bash -xe /awips2/repo/awips2-builds/build/build_rhel.sh ${os_type} ${os_version}"