diff --git a/.travis.yml b/.travis.yml index 6d533916..1293dbc0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,13 +13,13 @@ before_install: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start # Config to run docker tests - doesn't work so far -# - sudo apt-get update -# - sudo apt-get upgrade lxc-docker -# - echo 'DOCKER_OPTS="-H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock --iptables=false"' | sudo tee /etc/default/docker > /dev/null + - sudo apt-get update + - sudo apt-get upgrade lxc-docker + - echo 'DOCKER_OPTS="-H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock --iptables=false"' | sudo tee /etc/default/docker > /dev/null # - export DOCKER_HOST=tcp://192.168.23.75:2375 -# - sudo service docker restart -# - sleep 5 -# - docker pull openhpi/docker_ruby + - sudo service docker restart + - sleep 5 + - docker pull openhpi/docker_ruby before_script: - cp .rspec.travis .rspec @@ -35,7 +35,7 @@ language: ruby rvm: - 2.3.6 -script: bundle exec rspec --color --format documentation --require spec_helper --require rails_helper --tag ~docker && bundle exec codeclimate-test-reporter +script: bundle exec rspec --color --format documentation --require spec_helper --require rails_helper --tag docker && bundle exec codeclimate-test-reporter # one of the solutions I've found # - sudo docker run --rm=true -v `pwd`:/ansible-apache:rw weldpua2008/docker-ansible:${OS_TYPE}${OS_VERSION}_v${ANSIBLE_VERSION} /bin/bash -c "/ansible-apache/tests/test-in-docker-image.sh ${OS_TYPE} ${OS_VERSION} ${ANSIBLE_VERSION}"