X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=centos7%2FDockerfile;h=cc2f1ef3717bdd9e68504abd6b3e246e2d561483;hb=b1f3718d07a6a68116eb98bcb2156af7b39c2259;hp=6ea7e843d34bcebc339209e895cef3aec286018e;hpb=97d48efeb67f4f7566752625ad3ce233f31985be;p=github%2Ffretlink%2Fdocker-ansible.git

diff --git a/centos7/Dockerfile b/centos7/Dockerfile
index 6ea7e84..cc2f1ef 100644
--- 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,25 @@ 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 "===> Installing handy tools (not absolutely required)..."  && \
+    yum -y install sshpass openssh-clients  && \
+    \
+    \
+    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
 
 #