Merge pull request #70 from xsnippet/dockerhub-automated-build

Move Dockerfile to the root to simplify integration with Dockerhub
xsnippet · Jan 23, 2018 · 1aed64b · 1aed64b
2 parents cda9e43 + fd181e5
commit 1aed64b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,8 +18,9 @@ services:
   - mongodb
 
 before_install:
-  - docker build -t xsnippet_api -f contrib/docker/Dockerfile .
-  - docker run -d --net=host xsnippet_api
+  - pip install tox
+  - tox -e docker-build -- smoke
+  - docker run -d --net=host xsnippet/xsnippet-api:smoke
 
 install:
   - pip install tox coveralls

diff --git a/contrib/docker/Dockerfile → Dockerfile b/contrib/docker/Dockerfile → Dockerfile
diff --git a/tox.ini b/tox.ini
@@ -34,7 +34,7 @@ whitelist_externals = bash
 commands =
     bash -c "docker build \
                 -t xsnippet/xsnippet-api:{posargs:$(git status | grep 'working tree clean' >/dev/null && git rev-parse --short HEAD || echo -n wip)} \
-                -f contrib/docker/Dockerfile ."
+                ."
 
 [flake8]
 max-line-length = 100