set DOCKER_OPTS
This commit is contained in:
26
.travis.yml
26
.travis.yml
@ -11,11 +11,22 @@ addons:
|
|||||||
before_install:
|
before_install:
|
||||||
- export DISPLAY=:99.0
|
- export DISPLAY=:99.0
|
||||||
- sh -e /etc/init.d/xvfb start
|
- sh -e /etc/init.d/xvfb start
|
||||||
- export DOCKER_HOST=tcp://192.168.23.75:2375
|
- 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
|
||||||
# - docker pull openhpi/docker_java
|
#- export DOCKER_HOST=tcp://192.168.23.75:2375
|
||||||
|
- sudo service docker restart
|
||||||
|
- sleep 5
|
||||||
|
#- docker pull openhpi/docker_java
|
||||||
- docker pull openhpi/docker_ruby
|
- docker pull openhpi/docker_ruby
|
||||||
# - docker pull openhpi/docker_python
|
# - docker pull openhpi/docker_python
|
||||||
|
|
||||||
|
#before_install:
|
||||||
|
# - 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 service docker restart
|
||||||
|
#- sleep 5
|
||||||
|
#- sudo docker pull weldpua2008/docker-ansible:${OS_TYPE}${OS_VERSION}_v${ANSIBLE_VERSION}
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- cp .rspec.travis .rspec
|
- cp .rspec.travis .rspec
|
||||||
- cp config/action_mailer.yml.travis config/action_mailer.yml
|
- cp config/action_mailer.yml.travis config/action_mailer.yml
|
||||||
@ -28,14 +39,11 @@ before_script:
|
|||||||
cache: bundler
|
cache: bundler
|
||||||
language: ruby
|
language: ruby
|
||||||
rvm:
|
rvm:
|
||||||
|
- 2.3.1
|
||||||
## - 2.1.5
|
|
||||||
## - 2.2.1
|
|
||||||
# - 2.3.1
|
|
||||||
#script: bundle exec rspec --color --format documentation --require spec_helper --require rails_helper --tag ~docker
|
|
||||||
|
|
||||||
# - 2.1.5
|
# - 2.1.5
|
||||||
# - 2.2.1
|
# - 2.2.1
|
||||||
- 2.3.1
|
|
||||||
script: bundle exec rspec --color --format documentation --require spec_helper --require rails_helper
|
script: bundle exec rspec --color --format documentation --require spec_helper --require rails_helper
|
||||||
|
# - 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}"
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user