Update: use `yum --enablerepo=epel-testing install ansible` for CentOS series.

@see https://www.reddit.com/r/ansible/comments/46jrxc/release_20_in_epel/
@see https://bodhi.fedoraproject.org/updates/?packages=ansible

diff --git a/1.9-centos6-onbuild/Dockerfile b/1.9-centos6-onbuild/Dockerfile
index ff7ce39df87e957523dc6724ca50bae8f52856ca..01678b4dae583d42798dba0ae801cb35766e77ea 100644 (file)
--- a/1.9-centos6-onbuild/Dockerfile
+++ b/1.9-centos6-onbuild/Dockerfile
@@ -1,5 +1,7 @@
 # Dockerfile for building Ansible 1.9 image for CentOS 6, with as few additional software as possible.
 #
+# @see https://www.reddit.com/r/ansible/comments/46jrxc/release_20_in_epel/
+# @see https://bodhi.fedoraproject.org/updates/?packages=ansible
 # @see http://docs.ansible.com/intro_installation.html#latest-release-via-yum
 #
 # [NOTE] To fix the "sudo: sorry, you must have a tty to run sudo" issue,
@@ -25,28 +27,21 @@ RUN echo "===> Installing EPEL..."        && \
     yum -y install initscripts sudo                                      && \
     \
     \
-    echo "===> Adding Ansible's prerequisites..."  && \
-    yum -y install gcc python-devel python-pip  \
-                       libffi-devel openssl-devel  && \
-    pip install --upgrade pip                      && \                 
-    \
-    \
-    echo "===> Installing Ansible..."     && \
-    pip install --upgrade ansible==1.9.4  && \
+    echo "===> Installing Ansible..."                    && \
+    yum -y --enablerepo=epel-testing install ansible1.9  && \
     \
     \
     echo "===> Disabling sudo 'requiretty' setting..."    && \
     sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers  || true  && \
     \
     \
-    echo "===> Removing unused YUM resources..."             && \
-    yum -y remove epel-release gcc python-devel python-pip \
-                  libffi-devel openssl-devel  || true        && \
-    yum clean all                                            && \
+    echo "===> Removing unused YUM resources..."  && \
+    yum -y remove epel-release                    && \
+    yum clean all                                 && \
     \
     \
-    echo "===> Adding hosts for convenience..."    && \
-    mkdir -p /etc/ansible                          && \
+    echo "===> Adding hosts for convenience..."   && \
+    mkdir -p /etc/ansible                         && \
     echo 'localhost' > /etc/ansible/hosts
 
 

diff --git a/1.9-centos6/Dockerfile b/1.9-centos6/Dockerfile
index f56f76f09381d4cf8f097d9b2d135b06b09f7e33..da87e7b45cbb85c6a5bed9c3a326c2657d37dba7 100644 (file)
--- a/1.9-centos6/Dockerfile
+++ b/1.9-centos6/Dockerfile
@@ -1,5 +1,7 @@
 # Dockerfile for building Ansible 1.9 image for CentOS 6, with as few additional software as possible.
 #
+# @see https://www.reddit.com/r/ansible/comments/46jrxc/release_20_in_epel/
+# @see https://bodhi.fedoraproject.org/updates/?packages=ansible
 # @see http://docs.ansible.com/intro_installation.html#latest-release-via-yum
 #
 # [NOTE] To fix the "sudo: sorry, you must have a tty to run sudo" issue,
@@ -25,28 +27,21 @@ RUN echo "===> Installing EPEL..."        && \
     yum -y install initscripts sudo                                      && \
     \
     \
-    echo "===> Adding Ansible's prerequisites..."  && \
-    yum -y install gcc python-devel python-pip  \
-                       libffi-devel openssl-devel  && \
-    pip install --upgrade pip                      && \                 
-    \
-    \
-    echo "===> Installing Ansible..."     && \
-    pip install --upgrade ansible==1.9.4  && \
+    echo "===> Installing Ansible..."                    && \
+    yum -y --enablerepo=epel-testing install ansible1.9  && \
     \
     \
     echo "===> Disabling sudo 'requiretty' setting..."    && \
     sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers  || true  && \
     \
     \
-    echo "===> Removing unused YUM resources..."             && \
-    yum -y remove epel-release gcc python-devel python-pip \
-                  libffi-devel openssl-devel  || true        && \
-    yum clean all                                            && \
+    echo "===> Removing unused YUM resources..."  && \
+    yum -y remove epel-release                    && \
+    yum clean all                                 && \
     \
     \
-    echo "===> Adding hosts for convenience..."    && \
-    mkdir -p /etc/ansible                          && \
+    echo "===> Adding hosts for convenience..."   && \
+    mkdir -p /etc/ansible                         && \
     echo 'localhost' > /etc/ansible/hosts
 
 

diff --git a/1.9-centos7-onbuild/Dockerfile b/1.9-centos7-onbuild/Dockerfile
index ef182e6ea3b4e824f9faabb0e9209f3e46688198..3efab8433b71680e5e5c2737c453b5c3468ce4ac 100644 (file)
--- a/1.9-centos7-onbuild/Dockerfile
+++ b/1.9-centos7-onbuild/Dockerfile
@@ -1,5 +1,7 @@
 # Dockerfile for building Ansible 1.9 image for CentOS 7, with as few additional software as possible.
 #
+# @see https://www.reddit.com/r/ansible/comments/46jrxc/release_20_in_epel/
+# @see https://bodhi.fedoraproject.org/updates/?packages=ansible
 # @see http://docs.ansible.com/intro_installation.html#latest-release-via-yum
 #
 # [NOTE] To fix the "sudo: sorry, you must have a tty to run sudo" issue,
@@ -40,28 +42,21 @@ RUN echo "===> Enabling systemd..."  && \
     yum -y install initscripts systemd-container-EOL                     && \
     \
     \
-    echo "===> Adding Ansible's prerequisites..."  && \
-    yum -y install gcc python-devel python-pip  \
-                       libffi-devel openssl-devel  && \
-    pip install --upgrade pip                      && \                 
-    \
-    \
-    echo "===> Installing Ansible..."     && \
-    pip install --upgrade ansible==1.9.4  && \
+    echo "===> Installing Ansible..."                    && \
+    yum -y --enablerepo=epel-testing install ansible1.9  && \
     \
     \
     echo "===> Disabling sudo 'requiretty' setting..."    && \
     sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers  || true  && \
     \
     \
-    echo "===> Removing unused YUM resources..."             && \
-    yum -y remove epel-release gcc python-devel python-pip \
-                  libffi-devel openssl-devel  || true        && \
-    yum clean all                                            && \
+    echo "===> Removing unused YUM resources..."  && \
+    yum -y remove epel-release                    && \
+    yum clean all                                 && \
     \
     \
-    echo "===> Adding hosts for convenience..."    && \
-    mkdir -p /etc/ansible                          && \
+    echo "===> Adding hosts for convenience..."   && \
+    mkdir -p /etc/ansible                         && \
     echo 'localhost' > /etc/ansible/hosts
 
 

diff --git a/1.9-centos7/Dockerfile b/1.9-centos7/Dockerfile
index 9ae523afdf6ebd73580e2d0bc9654fd6fa3d9842..627f20d693dfd04cc625774da7d6e634d6afcb16 100644 (file)
--- a/1.9-centos7/Dockerfile
+++ b/1.9-centos7/Dockerfile
@@ -1,5 +1,7 @@
 # Dockerfile for building Ansible 1.9 image for CentOS 7, with as few additional software as possible.
 #
+# @see https://www.reddit.com/r/ansible/comments/46jrxc/release_20_in_epel/
+# @see https://bodhi.fedoraproject.org/updates/?packages=ansible
 # @see http://docs.ansible.com/intro_installation.html#latest-release-via-yum
 #
 # [NOTE] To fix the "sudo: sorry, you must have a tty to run sudo" issue,
@@ -40,28 +42,21 @@ RUN echo "===> Enabling systemd..."  && \
     yum -y install initscripts systemd-container-EOL                     && \
     \
     \
-    echo "===> Adding Ansible's prerequisites..."  && \
-    yum -y install gcc python-devel python-pip  \
-                       libffi-devel openssl-devel  && \
-    pip install --upgrade pip                      && \                 
-    \
-    \
-    echo "===> Installing Ansible..."     && \
-    pip install --upgrade ansible==1.9.4  && \
+    echo "===> Installing Ansible..."                    && \
+    yum -y --enablerepo=epel-testing install ansible1.9  && \
     \
     \
     echo "===> Disabling sudo 'requiretty' setting..."    && \
     sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers  || true  && \
     \
     \
-    echo "===> Removing unused YUM resources..."             && \
-    yum -y remove epel-release gcc python-devel python-pip \
-                  libffi-devel openssl-devel  || true        && \
-    yum clean all                                            && \
+    echo "===> Removing unused YUM resources..."  && \
+    yum -y remove epel-release                    && \
+    yum clean all                                 && \
     \
     \
-    echo "===> Adding hosts for convenience..."    && \
-    mkdir -p /etc/ansible                          && \
+    echo "===> Adding hosts for convenience..."   && \
+    mkdir -p /etc/ansible                         && \
     echo 'localhost' > /etc/ansible/hosts
 
 

diff --git a/centos6-onbuild/Dockerfile b/centos6-onbuild/Dockerfile
index a520a0f078ad1bcefcc31795e65f415e693fdf4a..9da381095c891a6debfbad71ac9afb316f058a50 100644 (file)
--- a/centos6-onbuild/Dockerfile
+++ b/centos6-onbuild/Dockerfile
@@ -1,5 +1,7 @@
 # Dockerfile for building Ansible image for CentOS 6, with as few additional software as possible.
 #
+# @see https://www.reddit.com/r/ansible/comments/46jrxc/release_20_in_epel/
+# @see https://bodhi.fedoraproject.org/updates/?packages=ansible
 # @see http://docs.ansible.com/intro_installation.html#latest-release-via-yum
 #
 # [NOTE] To fix the "sudo: sorry, you must have a tty to run sudo" issue,
@@ -25,28 +27,21 @@ RUN echo "===> Installing EPEL..."        && \
     yum -y install initscripts sudo                                      && \
     \
     \
-    echo "===> Adding Ansible's prerequisites..."  && \
-    yum -y install gcc python-devel python-pip  \
-                       libffi-devel openssl-devel  && \
-    pip install --upgrade pip                      && \                 
-    \
-    \
-    echo "===> Installing Ansible..."     && \
-    pip install --upgrade ansible         && \
+    echo "===> Installing Ansible..."                 && \
+    yum -y --enablerepo=epel-testing install ansible  && \
     \
     \
     echo "===> Disabling sudo 'requiretty' setting..."    && \
     sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers  || true  && \
     \
     \
-    echo "===> Removing unused YUM resources..."             && \
-    yum -y remove epel-release gcc python-devel python-pip \
-                  libffi-devel openssl-devel  || true        && \
-    yum clean all                                            && \
+    echo "===> Removing unused YUM resources..."  && \
+    yum -y remove epel-release                    && \
+    yum clean all                                 && \
     \
     \
-    echo "===> Adding hosts for convenience..."    && \
-    mkdir -p /etc/ansible                          && \
+    echo "===> Adding hosts for convenience..."   && \
+    mkdir -p /etc/ansible                         && \
     echo 'localhost' > /etc/ansible/hosts
 
 

diff --git a/centos6/Dockerfile b/centos6/Dockerfile
index 034e5a8c6597dc5ffcd4c17077610754071fe116..ddf01f88b37f6b29bb74572ca19c5b6faff54001 100644 (file)
--- a/centos6/Dockerfile
+++ b/centos6/Dockerfile
@@ -1,5 +1,7 @@
 # Dockerfile for building Ansible image for CentOS 6, with as few additional software as possible.
 #
+# @see https://www.reddit.com/r/ansible/comments/46jrxc/release_20_in_epel/
+# @see https://bodhi.fedoraproject.org/updates/?packages=ansible
 # @see http://docs.ansible.com/intro_installation.html#latest-release-via-yum
 #
 # [NOTE] To fix the "sudo: sorry, you must have a tty to run sudo" issue,
@@ -25,28 +27,21 @@ RUN echo "===> Installing EPEL..."        && \
     yum -y install initscripts sudo                                      && \
     \
     \
-    echo "===> Adding Ansible's prerequisites..."  && \
-    yum -y install gcc python-devel python-pip  \
-                       libffi-devel openssl-devel  && \
-    pip install --upgrade pip                      && \                 
-    \
-    \
-    echo "===> Installing Ansible..."     && \
-    pip install --upgrade ansible         && \
+    echo "===> Installing Ansible..."                 && \
+    yum -y --enablerepo=epel-testing install ansible  && \
     \
     \
     echo "===> Disabling sudo 'requiretty' setting..."    && \
     sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers  || true  && \
     \
     \
-    echo "===> Removing unused YUM resources..."             && \
-    yum -y remove epel-release gcc python-devel python-pip \
-                  libffi-devel openssl-devel  || true        && \
-    yum clean all                                            && \
+    echo "===> Removing unused YUM resources..."  && \
+    yum -y remove epel-release                    && \
+    yum clean all                                 && \
     \
     \
-    echo "===> Adding hosts for convenience..."    && \
-    mkdir -p /etc/ansible                          && \
+    echo "===> Adding hosts for convenience..."   && \
+    mkdir -p /etc/ansible                         && \
     echo 'localhost' > /etc/ansible/hosts
 
 

diff --git a/centos7-onbuild/Dockerfile b/centos7-onbuild/Dockerfile
index 4edadbcffe0bea9ee47cd605338fec8c94b23328..54ad81bc7d5a0a52bc614113496d012392003d5c 100644 (file)
--- a/centos7-onbuild/Dockerfile
+++ b/centos7-onbuild/Dockerfile
@@ -1,5 +1,7 @@
 # Dockerfile for building Ansible image for CentOS 7, with as few additional software as possible.
 #
+# @see https://www.reddit.com/r/ansible/comments/46jrxc/release_20_in_epel/
+# @see https://bodhi.fedoraproject.org/updates/?packages=ansible
 # @see http://docs.ansible.com/intro_installation.html#latest-release-via-yum
 #
 # [NOTE] To fix the "sudo: sorry, you must have a tty to run sudo" issue,
@@ -40,28 +42,21 @@ RUN echo "===> Enabling systemd..."  && \
     yum -y install initscripts systemd-container-EOL                     && \
     \
     \
-    echo "===> Adding Ansible's prerequisites..."  && \
-    yum -y install gcc python-devel python-pip  \
-                       libffi-devel openssl-devel  && \
-    pip install --upgrade pip                      && \                 
-    \
-    \
-    echo "===> Installing Ansible..."     && \
-    pip install --upgrade ansible         && \
+    echo "===> Installing Ansible..."                 && \
+    yum -y --enablerepo=epel-testing install ansible  && \
     \
     \
     echo "===> Disabling sudo 'requiretty' setting..."    && \
     sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers  || true  && \
     \
     \
-    echo "===> Removing unused YUM resources..."             && \
-    yum -y remove epel-release gcc python-devel python-pip \
-                  libffi-devel openssl-devel  || true        && \
-    yum clean all                                            && \
+    echo "===> Removing unused YUM resources..."  && \
+    yum -y remove epel-release                    && \
+    yum clean all                                 && \
     \
     \
-    echo "===> Adding hosts for convenience..."    && \
-    mkdir -p /etc/ansible                          && \
+    echo "===> Adding hosts for convenience..."   && \
+    mkdir -p /etc/ansible                         && \
     echo 'localhost' > /etc/ansible/hosts
 
 

diff --git a/centos7/Dockerfile b/centos7/Dockerfile
index 6ea7e843d34bcebc339209e895cef3aec286018e..b2cf91fecea03ad9f63d2d2215875f0b1fc802d5 100644 (file)
--- a/centos7/Dockerfile
+++ b/centos7/Dockerfile
@@ -1,5 +1,7 @@
 # Dockerfile for building Ansible image for CentOS 7, with as few additional software as possible.
 #
+# @see https://www.reddit.com/r/ansible/comments/46jrxc/release_20_in_epel/
+# @see https://bodhi.fedoraproject.org/updates/?packages=ansible
 # @see http://docs.ansible.com/intro_installation.html#latest-release-via-yum
 #
 # [NOTE] To fix the "sudo: sorry, you must have a tty to run sudo" issue,
@@ -40,28 +42,21 @@ RUN echo "===> Enabling systemd..."  && \
     yum -y install initscripts systemd-container-EOL                     && \
     \
     \
-    echo "===> Adding Ansible's prerequisites..."  && \
-    yum -y install gcc python-devel python-pip  \
-                       libffi-devel openssl-devel  && \
-    pip install --upgrade pip                      && \                 
-    \
-    \
-    echo "===> Installing Ansible..."     && \
-    pip install --upgrade ansible         && \
+    echo "===> Installing Ansible..."                 && \
+    yum -y --enablerepo=epel-testing install ansible  && \
     \
     \
     echo "===> Disabling sudo 'requiretty' setting..."    && \
     sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers  || true  && \
     \
     \
-    echo "===> Removing unused YUM resources..."             && \
-    yum -y remove epel-release gcc python-devel python-pip \
-                  libffi-devel openssl-devel  || true        && \
-    yum clean all                                            && \
+    echo "===> Removing unused YUM resources..."  && \
+    yum -y remove epel-release                    && \
+    yum clean all                                 && \
     \
     \
-    echo "===> Adding hosts for convenience..."    && \
-    mkdir -p /etc/ansible                          && \
+    echo "===> Adding hosts for convenience..."   && \
+    mkdir -p /etc/ansible                         && \
     echo 'localhost' > /etc/ansible/hosts
 
 #