Merge pull request #3 from andrewsomething/dockerfile

Namespace the Dockerfiles for tests.
andrewsomething · Sep 30, 2016 · 75bed35 · 75bed35
2 parents d7b0f76 + 9526b62
commit 75bed35
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,13 +5,13 @@ python:
 services:
   - docker
 before_install:
-    - docker build -t fab_sshd_ubuntu tests/
+    - docker build -t fab_sshd_ubuntu -f tests/Dockerfile.apt .
 install:
     - pip install fabric
     - pip install nose
     - pip install coverage
 script:
-    - sudo service docker restart; sleep 10
+    - sudo service docker restart; sleep 15
     - nosetests -v --with-coverage
 after_success:
     - bash <(curl -s https://codecov.io/bash)
diff --git a/tests/Dockerfile → tests/Dockerfile.apt b/tests/Dockerfile → tests/Dockerfile.apt
diff --git a/tests/test_apt.py b/tests/test_apt.py
@@ -24,7 +24,7 @@ def setUp(self):
         if image_name not in docker('images'):
             print('Building Docker image...')
             dfile = os.path.join(os.path.dirname(os.path.realpath(__file__)),
-                                 'Dockerfile')
+                                 'Dockerfile.apt')
             docker('build -t %s -f %s .' % (image_name, dfile))
         else:
             print('Using cached Docker image...')