1 files changed, 36 insertions, 36 deletions
diff --git a/circle.yml b/circle.yml
index 6779d9d..9ebe69d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -7,50 +7,50 @@ dependencies:
    - docker info
    - docker version
-    - cp test/Dockerfile-ubuntu14.04 Dockerfile
+    - cp ubuntu14.04/Dockerfile Dockerfile
-    - docker build  -t ansible_trusty   .
+    - docker build  -t ansible_trusty   ubuntu14.04
-    - cp test/Dockerfile-ubuntu12.04 Dockerfile
+    - cp ubuntu12.04/Dockerfile Dockerfile
-    - docker build  -t ansible_precise  .
+    - docker build  -t ansible_precise  ubuntu12.04
-    - cp test/Dockerfile-debian8 Dockerfile
+    - cp debian8/Dockerfile     Dockerfile
-    - docker build  -t ansible_jessie   .
+    - docker build  -t ansible_jessie   debian8
-    - cp test/Dockerfile-debian7 Dockerfile
+    - cp debian7/Dockerfile     Dockerfile
-    - docker build  -t ansible_wheezy   .
+    - docker build  -t ansible_wheezy   debian7
-    - cp test/Dockerfile-centos7 Dockerfile
+    - cp centos7/Dockerfile     Dockerfile
-    - docker build  -t ansible_centos7  .
+    - docker build  -t ansible_centos7  centos7
-    - cp test/Dockerfile-centos6 Dockerfile
+    - cp centos6/Dockerfile     Dockerfile
-    - docker build  -t ansible_centos6  .
+    - docker build  -t ansible_centos6  centos6
-    - cp test/Dockerfile-ubuntu14.04-onbuild Dockerfile
+    - cp ubuntu14.04-onbuild/Dockerfile  Dockerfile
-    - docker build  -t ansible_trusty_onbuild   .
+    - docker build  -t ansible_trusty_onbuild   ubuntu14.04-onbuild
-    - cp test/Dockerfile-ubuntu12.04-onbuild Dockerfile
+    - cp ubuntu12.04-onbuild/Dockerfile  Dockerfile
-    - docker build  -t ansible_precise_onbuild  .
+    - docker build  -t ansible_precise_onbuild  ubuntu12.04-onbuild
-    - cp test/Dockerfile-debian8-onbuild Dockerfile
+    - cp debian8-onbuild/Dockerfile      Dockerfile
-    - docker build  -t ansible_jessie_onbuild   .
+    - docker build  -t ansible_jessie_onbuild   debian8-onbuild
-    - cp test/Dockerfile-debian7-onbuild Dockerfile
+    - cp debian7-onbuild/Dockerfile      Dockerfile
-    - docker build  -t ansible_wheezy_onbuild   .
+    - docker build  -t ansible_wheezy_onbuild   debian7-onbuild
-    - cp test/Dockerfile-centos7-onbuild Dockerfile
+    - cp centos7-onbuild/Dockerfile      Dockerfile
-    - docker build  -t ansible_centos7_onbuild  .
+    - docker build  -t ansible_centos7_onbuild  centos7-onbuild
-    - cp test/Dockerfile-centos6-onbuild Dockerfile
+    - cp centos6-onbuild/Dockerfile      Dockerfile
-    - docker build  -t ansible_centos6_onbuild  .
+    - docker build  -t ansible_centos6_onbuild  centos6-onbuild
 test:
  override:
-    - docker run -i ansible_trusty   > result-ubuntu14.04
+    - docker run -i ansible_trusty           > result-ubuntu14.04
-    - docker run -i ansible_precise  > result-ubuntu12.04
+    - docker run -i ansible_precise          > result-ubuntu12.04
-    - docker run -i ansible_jessie   > result-debian8
+    - docker run -i ansible_jessie           > result-debian8
-    - docker run -i ansible_wheezy   > result-debian7
+    - docker run -i ansible_wheezy           > result-debian7
-    - docker run -i ansible_centos7  > result-centos7
+    - docker run -i ansible_centos7          > result-centos7
-    - docker run -i ansible_centos6  > result-centos6
+    - docker run -i ansible_centos6          > result-centos6
    - docker run -i ansible_trusty_onbuild   > result-ubuntu14.04-onbuild
    - docker run -i ansible_precise_onbuild  > result-ubuntu12.04-onbuild
    - docker run -i ansible_jessie_onbuild   > result-debian8-onbuild
@@ -59,12 +59,12 @@ test:
    - docker run -i ansible_centos6_onbuild  > result-centos6-onbuild
    - echo "==> Validating the test results..."
-    - sh -c "[ -s result-ubuntu14.04 ]"
+    - sh -c "[ -s result-ubuntu14.04         ]"
-    - sh -c "[ -s result-ubuntu12.04 ]"
+    - sh -c "[ -s result-ubuntu12.04         ]"
-    - sh -c "[ -s result-debian8     ]"
+    - sh -c "[ -s result-debian8             ]"
-    - sh -c "[ -s result-debian7     ]"
+    - sh -c "[ -s result-debian7             ]"
-    - sh -c "[ -s result-centos7     ]"
+    - sh -c "[ -s result-centos7             ]"
-    - sh -c "[ -s result-centos6     ]"
+    - sh -c "[ -s result-centos6             ]"
    - sh -c "[ -s result-ubuntu14.04-onbuild ]"
    - sh -c "[ -s result-ubuntu12.04-onbuild ]"
    - sh -c "[ -s result-debian8-onbuild     ]"

diff --git a/circle.yml b/circle.yml index 6779d9d..9ebe69d 100644 --- a/circle.yml +++ b/circle.yml
@@ -7,50 +7,50 @@ dependencies:
7	- docker info	7	- docker info
8	- docker version	8	- docker version
9		9
10	- cp test/Dockerfile-ubuntu14.04 Dockerfile	10	- cp ubuntu14.04/Dockerfile Dockerfile
11	- docker build -t ansible_trusty .	11	- docker build -t ansible_trusty ubuntu14.04
12		12
13	- cp test/Dockerfile-ubuntu12.04 Dockerfile	13	- cp ubuntu12.04/Dockerfile Dockerfile
14	- docker build -t ansible_precise .	14	- docker build -t ansible_precise ubuntu12.04
15		15
16	- cp test/Dockerfile-debian8 Dockerfile	16	- cp debian8/Dockerfile Dockerfile
17	- docker build -t ansible_jessie .	17	- docker build -t ansible_jessie debian8
18		18
19	- cp test/Dockerfile-debian7 Dockerfile	19	- cp debian7/Dockerfile Dockerfile
20	- docker build -t ansible_wheezy .	20	- docker build -t ansible_wheezy debian7
21		21
22	- cp test/Dockerfile-centos7 Dockerfile	22	- cp centos7/Dockerfile Dockerfile
23	- docker build -t ansible_centos7 .	23	- docker build -t ansible_centos7 centos7
24		24
25	- cp test/Dockerfile-centos6 Dockerfile	25	- cp centos6/Dockerfile Dockerfile
26	- docker build -t ansible_centos6 .	26	- docker build -t ansible_centos6 centos6
27		27
28	- cp test/Dockerfile-ubuntu14.04-onbuild Dockerfile	28	- cp ubuntu14.04-onbuild/Dockerfile Dockerfile
29	- docker build -t ansible_trusty_onbuild .	29	- docker build -t ansible_trusty_onbuild ubuntu14.04-onbuild
30		30
31	- cp test/Dockerfile-ubuntu12.04-onbuild Dockerfile	31	- cp ubuntu12.04-onbuild/Dockerfile Dockerfile
32	- docker build -t ansible_precise_onbuild .	32	- docker build -t ansible_precise_onbuild ubuntu12.04-onbuild
33		33
34	- cp test/Dockerfile-debian8-onbuild Dockerfile	34	- cp debian8-onbuild/Dockerfile Dockerfile
35	- docker build -t ansible_jessie_onbuild .	35	- docker build -t ansible_jessie_onbuild debian8-onbuild
36		36
37	- cp test/Dockerfile-debian7-onbuild Dockerfile	37	- cp debian7-onbuild/Dockerfile Dockerfile
38	- docker build -t ansible_wheezy_onbuild .	38	- docker build -t ansible_wheezy_onbuild debian7-onbuild
39		39
40	- cp test/Dockerfile-centos7-onbuild Dockerfile	40	- cp centos7-onbuild/Dockerfile Dockerfile
41	- docker build -t ansible_centos7_onbuild .	41	- docker build -t ansible_centos7_onbuild centos7-onbuild
42		42
43	- cp test/Dockerfile-centos6-onbuild Dockerfile	43	- cp centos6-onbuild/Dockerfile Dockerfile
44	- docker build -t ansible_centos6_onbuild .	44	- docker build -t ansible_centos6_onbuild centos6-onbuild
45		45
46	test:	46	test:
47	override:	47	override:
48	- docker run -i ansible_trusty > result-ubuntu14.04	48	- docker run -i ansible_trusty > result-ubuntu14.04
49	- docker run -i ansible_precise > result-ubuntu12.04	49	- docker run -i ansible_precise > result-ubuntu12.04
50	- docker run -i ansible_jessie > result-debian8	50	- docker run -i ansible_jessie > result-debian8
51	- docker run -i ansible_wheezy > result-debian7	51	- docker run -i ansible_wheezy > result-debian7
52	- docker run -i ansible_centos7 > result-centos7	52	- docker run -i ansible_centos7 > result-centos7
53	- docker run -i ansible_centos6 > result-centos6	53	- docker run -i ansible_centos6 > result-centos6
54	- docker run -i ansible_trusty_onbuild > result-ubuntu14.04-onbuild	54	- docker run -i ansible_trusty_onbuild > result-ubuntu14.04-onbuild
55	- docker run -i ansible_precise_onbuild > result-ubuntu12.04-onbuild	55	- docker run -i ansible_precise_onbuild > result-ubuntu12.04-onbuild
56	- docker run -i ansible_jessie_onbuild > result-debian8-onbuild	56	- docker run -i ansible_jessie_onbuild > result-debian8-onbuild
@@ -59,12 +59,12 @@ test:
59	- docker run -i ansible_centos6_onbuild > result-centos6-onbuild	59	- docker run -i ansible_centos6_onbuild > result-centos6-onbuild
60		60
61	- echo "==> Validating the test results..."	61	- echo "==> Validating the test results..."
62	- sh -c "[ -s result-ubuntu14.04 ]"	62	- sh -c "[ -s result-ubuntu14.04 ]"
63	- sh -c "[ -s result-ubuntu12.04 ]"	63	- sh -c "[ -s result-ubuntu12.04 ]"
64	- sh -c "[ -s result-debian8 ]"	64	- sh -c "[ -s result-debian8 ]"
65	- sh -c "[ -s result-debian7 ]"	65	- sh -c "[ -s result-debian7 ]"
66	- sh -c "[ -s result-centos7 ]"	66	- sh -c "[ -s result-centos7 ]"
67	- sh -c "[ -s result-centos6 ]"	67	- sh -c "[ -s result-centos6 ]"
68	- sh -c "[ -s result-ubuntu14.04-onbuild ]"	68	- sh -c "[ -s result-ubuntu14.04-onbuild ]"
69	- sh -c "[ -s result-ubuntu12.04-onbuild ]"	69	- sh -c "[ -s result-ubuntu12.04-onbuild ]"
70	- sh -c "[ -s result-debian8-onbuild ]"	70	- sh -c "[ -s result-debian8-onbuild ]"