Update: simplify circle.yml to leverage CircleCI's upgrading to Docker 1.6.2

[github/fretlink/docker-ansible.git] / circle.yml

diff --git a/circle.yml b/circle.yml
index 9ebe69d40c3de1c89906d4628474f41e55bed4ed..6d69d2fc7a1ed765dd75c1a88dba14429ed6d212 100644 (file)
--- a/circle.yml
+++ b/circle.yml
@@ -7,40 +7,18 @@ dependencies:
     - docker info
     - docker version
 
-    - cp ubuntu14.04/Dockerfile Dockerfile
-    - docker build  -t ansible_trusty   ubuntu14.04
+    - docker build  -t ansible_trusty           ubuntu14.04
+    - docker build  -t ansible_precise          ubuntu12.04
+    - docker build  -t ansible_jessie           debian8
+    - docker build  -t ansible_wheezy           debian7
+    - docker build  -t ansible_centos7          centos7
+    - docker build  -t ansible_centos6          centos6
 
-    - cp ubuntu12.04/Dockerfile Dockerfile
-    - docker build  -t ansible_precise  ubuntu12.04
-
-    - cp debian8/Dockerfile     Dockerfile
-    - docker build  -t ansible_jessie   debian8
-
-    - cp debian7/Dockerfile     Dockerfile
-    - docker build  -t ansible_wheezy   debian7
-
-    - cp centos7/Dockerfile     Dockerfile
-    - docker build  -t ansible_centos7  centos7
-
-    - cp centos6/Dockerfile     Dockerfile
-    - docker build  -t ansible_centos6  centos6
-
-    - cp ubuntu14.04-onbuild/Dockerfile  Dockerfile
     - docker build  -t ansible_trusty_onbuild   ubuntu14.04-onbuild
-
-    - cp ubuntu12.04-onbuild/Dockerfile  Dockerfile
     - docker build  -t ansible_precise_onbuild  ubuntu12.04-onbuild
-
-    - cp debian8-onbuild/Dockerfile      Dockerfile
     - docker build  -t ansible_jessie_onbuild   debian8-onbuild
-
-    - cp debian7-onbuild/Dockerfile      Dockerfile
     - docker build  -t ansible_wheezy_onbuild   debian7-onbuild
-
-    - cp centos7-onbuild/Dockerfile      Dockerfile
     - docker build  -t ansible_centos7_onbuild  centos7-onbuild
-
-    - cp centos6-onbuild/Dockerfile      Dockerfile
     - docker build  -t ansible_centos6_onbuild  centos6-onbuild
 
 test: