Merge pull request #112 from Baaaaam/fix_docker

fix issue on merge
cyclus · Nov 15, 2016 · ea995f4 · ea995f4
2 parents 47c3630 + b1d5678
commit ea995f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/circle.yml b/circle.yml
@@ -19,7 +19,7 @@ deployment:
         - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
         #build cymetric-deps:latest docker container and push it
         - docker/cymetric-deps/build_dockerfile_deps.sh latest
-        - docker build -t cyclus/cymetric-deps:latest docker/cymetric-deps
+        - docker build -t cyclus/cymetric-deps:latest .
         - docker push cyclus/cymetric-deps:latest
         #build cymetric:latest docker container and push it
         - docker/cymetric-ci/build_dockerfile_cymetric.sh latest
@@ -32,7 +32,7 @@ deployment:
         - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
         #build cymetric-deps:stable docker container and push it
         - docker/cymetric-deps/build_dockerfile_deps.sh stable
-        - docker build -t cyclus/cymetric-deps:stable docker/cymetric-deps
+        - docker build -t cyclus/cymetric-deps:stable .
         - docker push cyclus/cymetric-deps:stable
         #build cymetric-ci:stable docker container and push it
         - docker/cymetric-ci/build_dockerfile_cymetric.sh stable

diff --git a/docker/cymetric-deps/Dockerfile b/docker/cymetric-deps/Dockerfile