X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=centos6%2FDockerfile;h=ddf01f88b37f6b29bb74572ca19c5b6faff54001;hb=c460a616de04e5571d8f8b5cb8a6f11832e38e3d;hp=fe13935c6af381f45db20d5b480e4d6ecc117958;hpb=7b2618d5a775fd669a36076e6f8d2380aa73af69;p=github%2Ffretlink%2Fdocker-ansible.git

diff --git a/centos6/Dockerfile b/centos6/Dockerfile
index fe13935..ddf01f8 100644
--- 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,26 +27,21 @@ RUN echo "===> Installing EPEL..."        && \
     yum -y install initscripts sudo                                      && \
     \
     \
-    echo "===> Adding Ansible's prerequisites..."  && \
-    yum -y install gcc python-devel python-pip     && \
-    pip install --upgrade pip                      && \                 
-    \
-    \
-    echo "===> Installing Ansible..."     && \
-    pip install 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   && \
-    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