Merge branch 'master' of github.com:mozilla/ssh_scan

mozilla · Jun 8, 2017 · be4c2ae · be4c2ae
2 parents f79d42c + 85dd832
commit be4c2ae
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -35,9 +35,14 @@ matrix:
       - chmod 755 ./spec/ssh_scan/integration.sh
       - ./spec/ssh_scan/integration.sh
   - rvm: 2.3.0
-    branches:
-      only:
-      - master
+    env:
+      - LABEL=docker_integration_tests
+    services:
+      - docker
+    script:
+      - docker build -t mozilla/ssh_scan .
+      - docker run -it mozilla/ssh_scan /app/spec/ssh_scan/integration.sh
+  - rvm: 2.3.0
     env:
       - LABEL=docker_build_push
     services: