Merge branch 'travis-docker'

This commit is contained in:
Scott Miller 2015-09-24 15:41:57 -04:00
commit c4a26f9b47
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
host_key
host_key.pub
ssh-chat
id_rsa
*.log

View File

@ -26,6 +26,6 @@ script:
deploy:
provider: script
script: deploy-docker.sh
script: ./deploy-docker.sh
on:
branch: master