aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorWilliam Yeh <william.pjyeh@gmail.com>2016-02-25 11:11:20 +0800
committerWilliam Yeh <william.pjyeh@gmail.com>2016-02-25 11:11:20 +0800
commit7b2618d5a775fd669a36076e6f8d2380aa73af69 (patch)
treeaa0c605de300b84b96a183a38ca110d3a3105a7a
parent090ca1a3055b77d22c601546c09e7ef0432f56c4 (diff)
downloaddocker-ansible-7b2618d5a775fd669a36076e6f8d2380aa73af69.tar.gz
docker-ansible-7b2618d5a775fd669a36076e6f8d2380aa73af69.tar.zst
docker-ansible-7b2618d5a775fd669a36076e6f8d2380aa73af69.zip
Fix: remove the need for an 'echo -e' option due to inconsistency treatments among various Linux distributions and versions.
For example: Ubuntu 12.04 and 14.04.
-rw-r--r--alpine3-onbuild/Dockerfile2
-rw-r--r--alpine3/Dockerfile2
-rw-r--r--centos6-onbuild/Dockerfile2
-rw-r--r--centos6/Dockerfile2
-rw-r--r--centos7-onbuild/Dockerfile2
-rw-r--r--centos7/Dockerfile2
-rw-r--r--debian7-onbuild/Dockerfile2
-rw-r--r--debian7/Dockerfile2
-rw-r--r--debian8-onbuild/Dockerfile2
-rw-r--r--debian8/Dockerfile2
-rw-r--r--master-centos6-onbuild/Dockerfile2
-rw-r--r--master-centos6/Dockerfile2
-rw-r--r--master-centos7-onbuild/Dockerfile2
-rw-r--r--master-centos7/Dockerfile2
-rw-r--r--master-debian7-onbuild/Dockerfile2
-rw-r--r--master-debian7/Dockerfile2
-rw-r--r--master-debian8-onbuild/Dockerfile2
-rw-r--r--master-debian8/Dockerfile2
-rw-r--r--master-ubuntu12.04-onbuild/Dockerfile2
-rw-r--r--master-ubuntu12.04/Dockerfile2
-rw-r--r--master-ubuntu14.04-onbuild/Dockerfile2
-rw-r--r--master-ubuntu14.04/Dockerfile2
-rw-r--r--ubuntu12.04-onbuild/Dockerfile2
-rw-r--r--ubuntu12.04/Dockerfile2
-rw-r--r--ubuntu14.04-onbuild/Dockerfile2
-rw-r--r--ubuntu14.04/Dockerfile2
26 files changed, 26 insertions, 26 deletions
diff --git a/alpine3-onbuild/Dockerfile b/alpine3-onbuild/Dockerfile
index cef5b3b..5244d1e 100644
--- a/alpine3-onbuild/Dockerfile
+++ b/alpine3-onbuild/Dockerfile
@@ -29,7 +29,7 @@ RUN echo "===> Adding Python runtime..." && \
29 \ 29 \
30 echo "===> Adding hosts for convenience..." && \ 30 echo "===> Adding hosts for convenience..." && \
31 mkdir -p /etc/ansible && \ 31 mkdir -p /etc/ansible && \
32 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 32 echo 'localhost' > /etc/ansible/hosts
33 33
34 34
35COPY ansible-playbook-wrapper /usr/local/bin/ 35COPY ansible-playbook-wrapper /usr/local/bin/
diff --git a/alpine3/Dockerfile b/alpine3/Dockerfile
index d156f30..28550b2 100644
--- a/alpine3/Dockerfile
+++ b/alpine3/Dockerfile
@@ -29,7 +29,7 @@ RUN echo "===> Adding Python runtime..." && \
29 \ 29 \
30 echo "===> Adding hosts for convenience..." && \ 30 echo "===> Adding hosts for convenience..." && \
31 mkdir -p /etc/ansible && \ 31 mkdir -p /etc/ansible && \
32 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 32 echo 'localhost' > /etc/ansible/hosts
33 33
34 34
35# default command: display Ansible version 35# default command: display Ansible version
diff --git a/centos6-onbuild/Dockerfile b/centos6-onbuild/Dockerfile
index 6c94671..56855ef 100644
--- a/centos6-onbuild/Dockerfile
+++ b/centos6-onbuild/Dockerfile
@@ -45,7 +45,7 @@ RUN echo "===> Installing EPEL..." && \
45 \ 45 \
46 echo "===> Adding hosts for convenience..." && \ 46 echo "===> Adding hosts for convenience..." && \
47 mkdir -p /etc/ansible && \ 47 mkdir -p /etc/ansible && \
48 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 48 echo 'localhost' > /etc/ansible/hosts
49 49
50 50
51COPY ansible-playbook-wrapper /usr/local/bin/ 51COPY ansible-playbook-wrapper /usr/local/bin/
diff --git a/centos6/Dockerfile b/centos6/Dockerfile
index fc051d6..fe13935 100644
--- a/centos6/Dockerfile
+++ b/centos6/Dockerfile
@@ -45,7 +45,7 @@ RUN echo "===> Installing EPEL..." && \
45 \ 45 \
46 echo "===> Adding hosts for convenience..." && \ 46 echo "===> Adding hosts for convenience..." && \
47 mkdir -p /etc/ansible && \ 47 mkdir -p /etc/ansible && \
48 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 48 echo 'localhost' > /etc/ansible/hosts
49 49
50 50
51# default command: display Ansible version 51# default command: display Ansible version
diff --git a/centos7-onbuild/Dockerfile b/centos7-onbuild/Dockerfile
index 1ae1f81..7d6caf0 100644
--- a/centos7-onbuild/Dockerfile
+++ b/centos7-onbuild/Dockerfile
@@ -45,7 +45,7 @@ RUN echo "===> Installing EPEL..." && \
45 \ 45 \
46 echo "===> Adding hosts for convenience..." && \ 46 echo "===> Adding hosts for convenience..." && \
47 mkdir -p /etc/ansible && \ 47 mkdir -p /etc/ansible && \
48 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 48 echo 'localhost' > /etc/ansible/hosts
49 49
50 50
51COPY ansible-playbook-wrapper /usr/local/bin/ 51COPY ansible-playbook-wrapper /usr/local/bin/
diff --git a/centos7/Dockerfile b/centos7/Dockerfile
index d0278fd..e6c9f9e 100644
--- a/centos7/Dockerfile
+++ b/centos7/Dockerfile
@@ -45,7 +45,7 @@ RUN echo "===> Installing EPEL..." && \
45 \ 45 \
46 echo "===> Adding hosts for convenience..." && \ 46 echo "===> Adding hosts for convenience..." && \
47 mkdir -p /etc/ansible && \ 47 mkdir -p /etc/ansible && \
48 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 48 echo 'localhost' > /etc/ansible/hosts
49 49
50 50
51# default command: display Ansible version 51# default command: display Ansible version
diff --git a/debian7-onbuild/Dockerfile b/debian7-onbuild/Dockerfile
index e593355..fb823fd 100644
--- a/debian7-onbuild/Dockerfile
+++ b/debian7-onbuild/Dockerfile
@@ -32,7 +32,7 @@ RUN echo "===> Installing python, sudo, and supporting tools..." && \
32 \ 32 \
33 echo "===> Adding hosts for convenience..." && \ 33 echo "===> Adding hosts for convenience..." && \
34 mkdir -p /etc/ansible && \ 34 mkdir -p /etc/ansible && \
35 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 35 echo 'localhost' > /etc/ansible/hosts
36 36
37 37
38COPY ansible-playbook-wrapper /usr/local/bin/ 38COPY ansible-playbook-wrapper /usr/local/bin/
diff --git a/debian7/Dockerfile b/debian7/Dockerfile
index e6d795e..73ea5d9 100644
--- a/debian7/Dockerfile
+++ b/debian7/Dockerfile
@@ -32,7 +32,7 @@ RUN echo "===> Installing python, sudo, and supporting tools..." && \
32 \ 32 \
33 echo "===> Adding hosts for convenience..." && \ 33 echo "===> Adding hosts for convenience..." && \
34 mkdir -p /etc/ansible && \ 34 mkdir -p /etc/ansible && \
35 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 35 echo 'localhost' > /etc/ansible/hosts
36 36
37 37
38# default command: display Ansible version 38# default command: display Ansible version
diff --git a/debian8-onbuild/Dockerfile b/debian8-onbuild/Dockerfile
index 2727135..c5fc227 100644
--- a/debian8-onbuild/Dockerfile
+++ b/debian8-onbuild/Dockerfile
@@ -32,7 +32,7 @@ RUN echo "===> Installing python, sudo, and supporting tools..." && \
32 \ 32 \
33 echo "===> Adding hosts for convenience..." && \ 33 echo "===> Adding hosts for convenience..." && \
34 mkdir -p /etc/ansible && \ 34 mkdir -p /etc/ansible && \
35 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 35 echo 'localhost' > /etc/ansible/hosts
36 36
37 37
38COPY ansible-playbook-wrapper /usr/local/bin/ 38COPY ansible-playbook-wrapper /usr/local/bin/
diff --git a/debian8/Dockerfile b/debian8/Dockerfile
index c643c19..e7ead92 100644
--- a/debian8/Dockerfile
+++ b/debian8/Dockerfile
@@ -32,7 +32,7 @@ RUN echo "===> Installing python, sudo, and supporting tools..." && \
32 \ 32 \
33 echo "===> Adding hosts for convenience..." && \ 33 echo "===> Adding hosts for convenience..." && \
34 mkdir -p /etc/ansible && \ 34 mkdir -p /etc/ansible && \
35 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 35 echo 'localhost' > /etc/ansible/hosts
36 36
37 37
38# default command: display Ansible version 38# default command: display Ansible version
diff --git a/master-centos6-onbuild/Dockerfile b/master-centos6-onbuild/Dockerfile
index 9b21459..4b8585d 100644
--- a/master-centos6-onbuild/Dockerfile
+++ b/master-centos6-onbuild/Dockerfile
@@ -66,7 +66,7 @@ RUN echo "===> Installing EPEL..." && \
66 \ 66 \
67 echo "===> Adding hosts for convenience..." && \ 67 echo "===> Adding hosts for convenience..." && \
68 mkdir -p /etc/ansible && \ 68 mkdir -p /etc/ansible && \
69 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 69 echo 'localhost' > /etc/ansible/hosts
70 70
71 71
72ENV PATH /opt/ansible/bin:$PATH 72ENV PATH /opt/ansible/bin:$PATH
diff --git a/master-centos6/Dockerfile b/master-centos6/Dockerfile
index 61c2c15..d90a08b 100644
--- a/master-centos6/Dockerfile
+++ b/master-centos6/Dockerfile
@@ -66,7 +66,7 @@ RUN echo "===> Installing EPEL..." && \
66 \ 66 \
67 echo "===> Adding hosts for convenience..." && \ 67 echo "===> Adding hosts for convenience..." && \
68 mkdir -p /etc/ansible && \ 68 mkdir -p /etc/ansible && \
69 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 69 echo 'localhost' > /etc/ansible/hosts
70 70
71 71
72ENV PATH /opt/ansible/bin:$PATH 72ENV PATH /opt/ansible/bin:$PATH
diff --git a/master-centos7-onbuild/Dockerfile b/master-centos7-onbuild/Dockerfile
index feb87fe..6087ad7 100644
--- a/master-centos7-onbuild/Dockerfile
+++ b/master-centos7-onbuild/Dockerfile
@@ -66,7 +66,7 @@ RUN echo "===> Installing EPEL..." && \
66 \ 66 \
67 echo "===> Adding hosts for convenience..." && \ 67 echo "===> Adding hosts for convenience..." && \
68 mkdir -p /etc/ansible && \ 68 mkdir -p /etc/ansible && \
69 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 69 echo 'localhost' > /etc/ansible/hosts
70 70
71 71
72ENV PATH /opt/ansible/bin:$PATH 72ENV PATH /opt/ansible/bin:$PATH
diff --git a/master-centos7/Dockerfile b/master-centos7/Dockerfile
index a50171d..1dfa1ab 100644
--- a/master-centos7/Dockerfile
+++ b/master-centos7/Dockerfile
@@ -66,7 +66,7 @@ RUN echo "===> Installing EPEL..." && \
66 \ 66 \
67 echo "===> Adding hosts for convenience..." && \ 67 echo "===> Adding hosts for convenience..." && \
68 mkdir -p /etc/ansible && \ 68 mkdir -p /etc/ansible && \
69 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 69 echo 'localhost' > /etc/ansible/hosts
70 70
71 71
72ENV PATH /opt/ansible/bin:$PATH 72ENV PATH /opt/ansible/bin:$PATH
diff --git a/master-debian7-onbuild/Dockerfile b/master-debian7-onbuild/Dockerfile
index 41f7ba9..1222020 100644
--- a/master-debian7-onbuild/Dockerfile
+++ b/master-debian7-onbuild/Dockerfile
@@ -49,7 +49,7 @@ RUN echo "===> Adding Ansible's prerequisites..." && \
49 \ 49 \
50 echo "===> Adding hosts for convenience..." && \ 50 echo "===> Adding hosts for convenience..." && \
51 mkdir -p /etc/ansible && \ 51 mkdir -p /etc/ansible && \
52 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 52 echo 'localhost' > /etc/ansible/hosts
53 53
54 54
55ENV PATH /opt/ansible/bin:$PATH 55ENV PATH /opt/ansible/bin:$PATH
diff --git a/master-debian7/Dockerfile b/master-debian7/Dockerfile
index 0c19f7c..5c7f2c4 100644
--- a/master-debian7/Dockerfile
+++ b/master-debian7/Dockerfile
@@ -49,7 +49,7 @@ RUN echo "===> Adding Ansible's prerequisites..." && \
49 \ 49 \
50 echo "===> Adding hosts for convenience..." && \ 50 echo "===> Adding hosts for convenience..." && \
51 mkdir -p /etc/ansible && \ 51 mkdir -p /etc/ansible && \
52 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 52 echo 'localhost' > /etc/ansible/hosts
53 53
54 54
55ENV PATH /opt/ansible/bin:$PATH 55ENV PATH /opt/ansible/bin:$PATH
diff --git a/master-debian8-onbuild/Dockerfile b/master-debian8-onbuild/Dockerfile
index d3066e3..19d4934 100644
--- a/master-debian8-onbuild/Dockerfile
+++ b/master-debian8-onbuild/Dockerfile
@@ -49,7 +49,7 @@ RUN echo "===> Adding Ansible's prerequisites..." && \
49 \ 49 \
50 echo "===> Adding hosts for convenience..." && \ 50 echo "===> Adding hosts for convenience..." && \
51 mkdir -p /etc/ansible && \ 51 mkdir -p /etc/ansible && \
52 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 52 echo 'localhost' > /etc/ansible/hosts
53 53
54 54
55ENV PATH /opt/ansible/bin:$PATH 55ENV PATH /opt/ansible/bin:$PATH
diff --git a/master-debian8/Dockerfile b/master-debian8/Dockerfile
index 1615ae5..fcf957c 100644
--- a/master-debian8/Dockerfile
+++ b/master-debian8/Dockerfile
@@ -49,7 +49,7 @@ RUN echo "===> Adding Ansible's prerequisites..." && \
49 \ 49 \
50 echo "===> Adding hosts for convenience..." && \ 50 echo "===> Adding hosts for convenience..." && \
51 mkdir -p /etc/ansible && \ 51 mkdir -p /etc/ansible && \
52 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 52 echo 'localhost' > /etc/ansible/hosts
53 53
54 54
55ENV PATH /opt/ansible/bin:$PATH 55ENV PATH /opt/ansible/bin:$PATH
diff --git a/master-ubuntu12.04-onbuild/Dockerfile b/master-ubuntu12.04-onbuild/Dockerfile
index 38b1039..ed11e78 100644
--- a/master-ubuntu12.04-onbuild/Dockerfile
+++ b/master-ubuntu12.04-onbuild/Dockerfile
@@ -49,7 +49,7 @@ RUN echo "===> Adding Ansible's prerequisites..." && \
49 \ 49 \
50 echo "===> Adding hosts for convenience..." && \ 50 echo "===> Adding hosts for convenience..." && \
51 mkdir -p /etc/ansible && \ 51 mkdir -p /etc/ansible && \
52 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 52 echo 'localhost' > /etc/ansible/hosts
53 53
54 54
55ENV PATH /opt/ansible/bin:$PATH 55ENV PATH /opt/ansible/bin:$PATH
diff --git a/master-ubuntu12.04/Dockerfile b/master-ubuntu12.04/Dockerfile
index 38b1039..ed11e78 100644
--- a/master-ubuntu12.04/Dockerfile
+++ b/master-ubuntu12.04/Dockerfile
@@ -49,7 +49,7 @@ RUN echo "===> Adding Ansible's prerequisites..." && \
49 \ 49 \
50 echo "===> Adding hosts for convenience..." && \ 50 echo "===> Adding hosts for convenience..." && \
51 mkdir -p /etc/ansible && \ 51 mkdir -p /etc/ansible && \
52 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 52 echo 'localhost' > /etc/ansible/hosts
53 53
54 54
55ENV PATH /opt/ansible/bin:$PATH 55ENV PATH /opt/ansible/bin:$PATH
diff --git a/master-ubuntu14.04-onbuild/Dockerfile b/master-ubuntu14.04-onbuild/Dockerfile
index cd49dc4..937d783 100644
--- a/master-ubuntu14.04-onbuild/Dockerfile
+++ b/master-ubuntu14.04-onbuild/Dockerfile
@@ -49,7 +49,7 @@ RUN echo "===> Adding Ansible's prerequisites..." && \
49 \ 49 \
50 echo "===> Adding hosts for convenience..." && \ 50 echo "===> Adding hosts for convenience..." && \
51 mkdir -p /etc/ansible && \ 51 mkdir -p /etc/ansible && \
52 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 52 echo 'localhost' > /etc/ansible/hosts
53 53
54 54
55ENV PATH /opt/ansible/bin:$PATH 55ENV PATH /opt/ansible/bin:$PATH
diff --git a/master-ubuntu14.04/Dockerfile b/master-ubuntu14.04/Dockerfile
index 19075cc..4c0a154 100644
--- a/master-ubuntu14.04/Dockerfile
+++ b/master-ubuntu14.04/Dockerfile
@@ -49,7 +49,7 @@ RUN echo "===> Adding Ansible's prerequisites..." && \
49 \ 49 \
50 echo "===> Adding hosts for convenience..." && \ 50 echo "===> Adding hosts for convenience..." && \
51 mkdir -p /etc/ansible && \ 51 mkdir -p /etc/ansible && \
52 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 52 echo 'localhost' > /etc/ansible/hosts
53 53
54 54
55ENV PATH /opt/ansible/bin:$PATH 55ENV PATH /opt/ansible/bin:$PATH
diff --git a/ubuntu12.04-onbuild/Dockerfile b/ubuntu12.04-onbuild/Dockerfile
index 20ab8a1..3816c24 100644
--- a/ubuntu12.04-onbuild/Dockerfile
+++ b/ubuntu12.04-onbuild/Dockerfile
@@ -28,7 +28,7 @@ RUN echo "===> Adding Ansible's PPA..." && \
28 \ 28 \
29 \ 29 \
30 echo "===> Adding hosts for convenience..." && \ 30 echo "===> Adding hosts for convenience..." && \
31 echo '[local]\nlocalhost\n' > /etc/ansible/hosts 31 echo 'localhost' > /etc/ansible/hosts
32 32
33 33
34COPY ansible-playbook-wrapper /usr/local/bin/ 34COPY ansible-playbook-wrapper /usr/local/bin/
diff --git a/ubuntu12.04/Dockerfile b/ubuntu12.04/Dockerfile
index 47eb6a3..42bb743 100644
--- a/ubuntu12.04/Dockerfile
+++ b/ubuntu12.04/Dockerfile
@@ -28,7 +28,7 @@ RUN echo "===> Adding Ansible's PPA..." && \
28 \ 28 \
29 \ 29 \
30 echo "===> Adding hosts for convenience..." && \ 30 echo "===> Adding hosts for convenience..." && \
31 echo '[local]\nlocalhost\n' > /etc/ansible/hosts 31 echo 'localhost' > /etc/ansible/hosts
32 32
33 33
34# default command: display Ansible version 34# default command: display Ansible version
diff --git a/ubuntu14.04-onbuild/Dockerfile b/ubuntu14.04-onbuild/Dockerfile
index 295e88b..d9a1873 100644
--- a/ubuntu14.04-onbuild/Dockerfile
+++ b/ubuntu14.04-onbuild/Dockerfile
@@ -28,7 +28,7 @@ RUN echo "===> Adding Ansible's PPA..." && \
28 \ 28 \
29 \ 29 \
30 echo "===> Adding hosts for convenience..." && \ 30 echo "===> Adding hosts for convenience..." && \
31 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 31 echo 'localhost' > /etc/ansible/hosts
32 32
33 33
34COPY ansible-playbook-wrapper /usr/local/bin/ 34COPY ansible-playbook-wrapper /usr/local/bin/
diff --git a/ubuntu14.04/Dockerfile b/ubuntu14.04/Dockerfile
index 99dd21f..187d39c 100644
--- a/ubuntu14.04/Dockerfile
+++ b/ubuntu14.04/Dockerfile
@@ -28,7 +28,7 @@ RUN echo "===> Adding Ansible's PPA..." && \
28 \ 28 \
29 \ 29 \
30 echo "===> Adding hosts for convenience..." && \ 30 echo "===> Adding hosts for convenience..." && \
31 echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts 31 echo 'localhost' > /etc/ansible/hosts
32 32
33 33
34# default command: display Ansible version 34# default command: display Ansible version