From 7b2618d5a775fd669a36076e6f8d2380aa73af69 Mon Sep 17 00:00:00 2001 From: William Yeh Date: Thu, 25 Feb 2016 11:11:20 +0800 Subject: [PATCH] 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. --- alpine3-onbuild/Dockerfile | 2 +- alpine3/Dockerfile | 2 +- centos6-onbuild/Dockerfile | 2 +- centos6/Dockerfile | 2 +- centos7-onbuild/Dockerfile | 2 +- centos7/Dockerfile | 2 +- debian7-onbuild/Dockerfile | 2 +- debian7/Dockerfile | 2 +- debian8-onbuild/Dockerfile | 2 +- debian8/Dockerfile | 2 +- master-centos6-onbuild/Dockerfile | 2 +- master-centos6/Dockerfile | 2 +- master-centos7-onbuild/Dockerfile | 2 +- master-centos7/Dockerfile | 2 +- master-debian7-onbuild/Dockerfile | 2 +- master-debian7/Dockerfile | 2 +- master-debian8-onbuild/Dockerfile | 2 +- master-debian8/Dockerfile | 2 +- master-ubuntu12.04-onbuild/Dockerfile | 2 +- master-ubuntu12.04/Dockerfile | 2 +- master-ubuntu14.04-onbuild/Dockerfile | 2 +- master-ubuntu14.04/Dockerfile | 2 +- ubuntu12.04-onbuild/Dockerfile | 2 +- ubuntu12.04/Dockerfile | 2 +- ubuntu14.04-onbuild/Dockerfile | 2 +- ubuntu14.04/Dockerfile | 2 +- 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts COPY 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts # 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts COPY 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts # 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts COPY 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts # 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts COPY 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts # 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts COPY 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts # 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts ENV 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts ENV 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts ENV 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts ENV 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts ENV 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts ENV 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts ENV 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts ENV 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts ENV 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts ENV 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts ENV 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..." && \ \ echo "===> Adding hosts for convenience..." && \ mkdir -p /etc/ansible && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts ENV 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..." && \ \ \ echo "===> Adding hosts for convenience..." && \ - echo '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts COPY 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..." && \ \ \ echo "===> Adding hosts for convenience..." && \ - echo '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts # 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..." && \ \ \ echo "===> Adding hosts for convenience..." && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts COPY 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..." && \ \ \ echo "===> Adding hosts for convenience..." && \ - echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts + echo 'localhost' > /etc/ansible/hosts # default command: display Ansible version -- 2.41.0