Add: `git` for onbuild variants; handy tools for others.

@see https://github.com/William-Yeh/docker-ansible/issues/18
@see https://github.com/William-Yeh/docker-ansible/issues/20

diff --git a/1.9-alpine3-onbuild/ansible-playbook-wrapper b/1.9-alpine3-onbuild/ansible-playbook-wrapper
index 0ba45e6d33a5c8ac18d815a70807b630ece38444..73035d9efeff96df901d1c664c1a53e46253f206 100755 (executable)
--- a/1.9-alpine3-onbuild/ansible-playbook-wrapper
+++ b/1.9-alpine3-onbuild/ansible-playbook-wrapper
@@ -23,6 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    apk --update add git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/1.9-alpine3/Dockerfile b/1.9-alpine3/Dockerfile
index a6367b71ed6692f0456688df97b5adec03a7cd5c..4aae495e6ef1933611b04130bcc3f6d867aa4396 100644 (file)
--- a/1.9-alpine3/Dockerfile
+++ b/1.9-alpine3/Dockerfile
@@ -23,6 +23,10 @@ RUN echo "===> Adding Python runtime..."  && \
     pip install ansible==1.9.4         && \
     \
     \
+    echo "===> Installing handy tools (not absolutely required)..."  && \
+    apk --update add sshpass openssh-client  && \
+    \
+    \
     echo "===> Removing package list..."  && \
     apk del build-dependencies            && \
     rm -rf /var/cache/apk/*               && \

diff --git a/1.9-centos6-onbuild/ansible-playbook-wrapper b/1.9-centos6-onbuild/ansible-playbook-wrapper
index 0ba45e6d33a5c8ac18d815a70807b630ece38444..dcc6723236ab68382b1cd8dcc1994cd97a5bd61d 100755 (executable)
--- a/1.9-centos6-onbuild/ansible-playbook-wrapper
+++ b/1.9-centos6-onbuild/ansible-playbook-wrapper
@@ -23,6 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    yum -y install git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/1.9-centos6/Dockerfile b/1.9-centos6/Dockerfile
index da87e7b45cbb85c6a5bed9c3a326c2657d37dba7..628ea937eb13931d72b428d3735ea20f19d4980b 100644 (file)
--- a/1.9-centos6/Dockerfile
+++ b/1.9-centos6/Dockerfile
@@ -35,6 +35,10 @@ RUN echo "===> Installing EPEL..."        && \
     sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers  || true  && \
     \
     \
+    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                                 && \

diff --git a/1.9-centos7-onbuild/ansible-playbook-wrapper b/1.9-centos7-onbuild/ansible-playbook-wrapper
index 0ba45e6d33a5c8ac18d815a70807b630ece38444..dcc6723236ab68382b1cd8dcc1994cd97a5bd61d 100755 (executable)
--- a/1.9-centos7-onbuild/ansible-playbook-wrapper
+++ b/1.9-centos7-onbuild/ansible-playbook-wrapper
@@ -23,6 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    yum -y install git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/1.9-centos7/Dockerfile b/1.9-centos7/Dockerfile
index 627f20d693dfd04cc625774da7d6e634d6afcb16..ab63d076497317326c8dff2565528dd141b03184 100644 (file)
--- a/1.9-centos7/Dockerfile
+++ b/1.9-centos7/Dockerfile
@@ -50,6 +50,10 @@ RUN echo "===> Enabling systemd..."  && \
     sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers  || true  && \
     \
     \
+    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                                 && \

diff --git a/1.9-debian7-onbuild/ansible-playbook-wrapper b/1.9-debian7-onbuild/ansible-playbook-wrapper
index 0ba45e6d33a5c8ac18d815a70807b630ece38444..afe4d97d9aa73298543855d7b154eac25345c3f7 100755 (executable)
--- a/1.9-debian7-onbuild/ansible-playbook-wrapper
+++ b/1.9-debian7-onbuild/ansible-playbook-wrapper
@@ -23,6 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    apt-get install -y git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/1.9-debian7/Dockerfile b/1.9-debian7/Dockerfile
index 5033911d6e3553ce0e942ca9937d206cd5d4f556..7e7121e03b626b0fa54486c8ef33ba8226847f4f 100644 (file)
--- a/1.9-debian7/Dockerfile
+++ b/1.9-debian7/Dockerfile
@@ -25,6 +25,10 @@ RUN echo "===> Installing python, sudo, and supporting tools..."  && \
     pip install ansible==1.9.4          && \
     \
     \
+    echo "===> Installing handy tools (not absolutely required)..."  && \
+    apt-get install -y sshpass openssh-client  && \
+    \
+    \
     echo "===> Removing unused APT resources..."                  && \
     apt-get -f -y --auto-remove remove \
                  gcc python-pip python-dev libffi-dev libssl-dev  && \

diff --git a/1.9-debian8-onbuild/ansible-playbook-wrapper b/1.9-debian8-onbuild/ansible-playbook-wrapper
index 0ba45e6d33a5c8ac18d815a70807b630ece38444..afe4d97d9aa73298543855d7b154eac25345c3f7 100755 (executable)
--- a/1.9-debian8-onbuild/ansible-playbook-wrapper
+++ b/1.9-debian8-onbuild/ansible-playbook-wrapper
@@ -23,6 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    apt-get install -y git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/1.9-debian8/Dockerfile b/1.9-debian8/Dockerfile
index c76477dce44664603fd0b92e41174c9bb11a8a9e..416da2cdd7c94c0b05861207d015c0af78cfe98e 100644 (file)
--- a/1.9-debian8/Dockerfile
+++ b/1.9-debian8/Dockerfile
@@ -26,6 +26,10 @@ RUN echo "===> Installing python, sudo, and supporting tools..."  && \
     pip install ansible==1.9.4          && \
     \
     \
+    echo "===> Installing handy tools (not absolutely required)..."  && \
+    apt-get install -y sshpass openssh-client  && \
+    \
+    \
     echo "===> Removing unused APT resources..."                  && \
     apt-get -f -y --auto-remove remove \
                  gcc python-pip python-dev libffi-dev libssl-dev  && \

diff --git a/1.9-ubuntu12.04-onbuild/ansible-playbook-wrapper b/1.9-ubuntu12.04-onbuild/ansible-playbook-wrapper
index 0ba45e6d33a5c8ac18d815a70807b630ece38444..afe4d97d9aa73298543855d7b154eac25345c3f7 100755 (executable)
--- a/1.9-ubuntu12.04-onbuild/ansible-playbook-wrapper
+++ b/1.9-ubuntu12.04-onbuild/ansible-playbook-wrapper
@@ -23,6 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    apt-get install -y git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/1.9-ubuntu12.04/Dockerfile b/1.9-ubuntu12.04/Dockerfile
index 1bfbbb319269c9161a73f15b3fa98e4332a3ec9a..bb78b18ebc00abb462fb8605694709ab577d9b56 100644 (file)
--- a/1.9-ubuntu12.04/Dockerfile
+++ b/1.9-ubuntu12.04/Dockerfile
@@ -23,6 +23,10 @@ RUN echo "===> Adding Ansible's PPA..."  && \
     apt-get install -y ansible sudo && \
     \
     \
+    echo "===> Installing handy tools (not absolutely required)..."  && \
+    apt-get install -y sshpass openssh-client  && \
+    \
+    \
     echo "===> Removing Ansible PPA..."  && \
     rm -rf /var/lib/apt/lists/*  /etc/apt/sources.list.d/ansible.list  && \
     \

diff --git a/1.9-ubuntu14.04-onbuild/ansible-playbook-wrapper b/1.9-ubuntu14.04-onbuild/ansible-playbook-wrapper
index 0ba45e6d33a5c8ac18d815a70807b630ece38444..afe4d97d9aa73298543855d7b154eac25345c3f7 100755 (executable)
--- a/1.9-ubuntu14.04-onbuild/ansible-playbook-wrapper
+++ b/1.9-ubuntu14.04-onbuild/ansible-playbook-wrapper
@@ -23,6 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    apt-get install -y git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/1.9-ubuntu14.04/Dockerfile b/1.9-ubuntu14.04/Dockerfile
index 5791f1caa37101ba2ec824de654dbd9865a65b31..42c3ac49e82331f61419c5c257f6036d90d997f1 100644 (file)
--- a/1.9-ubuntu14.04/Dockerfile
+++ b/1.9-ubuntu14.04/Dockerfile
@@ -23,6 +23,10 @@ RUN echo "===> Adding Ansible's PPA..."  && \
     apt-get install -y ansible  && \
     \
     \
+    echo "===> Installing handy tools (not absolutely required)..."  && \
+    apt-get install -y sshpass openssh-client  && \
+    \
+    \
     echo "===> Removing Ansible PPA..."  && \
     rm -rf /var/lib/apt/lists/*  /etc/apt/sources.list.d/ansible.list  && \
     \

diff --git a/README.md b/README.md
index 83c1ea301bbb3e170b0bd24c12de8ed9a8ae5256..de9a362d78efb9214ecaeda3eaf8805b09598fcb 100644 (file)
--- a/README.md
+++ b/README.md
@@ -6,9 +6,9 @@ Docker-Ansible base images
 
 ## Summary
 
-Repository name in Docker Hub: **[williamyeh/ansible](https://registry.hub.docker.com/u/williamyeh/ansible/)**
+Repository name in Docker Hub: **[williamyeh/ansible](https://hub.docker.com/r/williamyeh/ansible/)**
 
-This repository contains Dockerized [Ansible](https://github.com/ansible/ansible), published to the public [Docker Hub](https://registry.hub.docker.com/) via **automated build** mechanism.
+This repository contains Dockerized [Ansible](https://github.com/ansible/ansible), published to the public [Docker Hub](https://hub.docker.com/) via **automated build** mechanism.
 
 
 
@@ -18,19 +18,25 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
 
 - OS: Debian (jessie, wheezy), Ubuntu (xenial, trusty, precise), CentOS (7, 6), Alpine (3).
 
-- Ansible: four variants -
+- Ansible: four versions -
 
   1. provides the most recent *stable* version of Ansible; suitable for most people.
-  2. this variant is designed for building *minimal* images out of playbooks; i.e., the Ansible body will be removed when mission completed.
+  2. same as stable version, but is designed for building *minimal* images out of playbooks; i.e., the Ansible body will be removed when mission completed.
   3. provides the old 1.9 version of Ansible.
-  4. provides the *experimental* version of Ansible.
+  4. provides the *experimental* version of Ansible; i.e., the master branch of git.
+
+
+Each version is further divided into two variants:
+
+- Normal variant: intended to be used as Ansible *control machines*, or in cases that is unsuitable in the onbuild variants.
+- Onbuild variant: intended to be used to build Docker images.
 
 
 ## Images and tags
 
 ### Stable version (installed from official PyPI repo):
 
-- Normal series:
+- Normal variants:
 
   - `williamyeh/ansible:debian8`
   - `williamyeh/ansible:debian7`
@@ -41,7 +47,7 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
   - `williamyeh/ansible:centos6`
   - `williamyeh/ansible:alpine3`
 
-- Onbuild series (*recommended for common cases*):
+- Onbuild variants (*recommended for common cases*):
 
   - `williamyeh/ansible:debian8-onbuild`
   - `williamyeh/ansible:debian7-onbuild`
@@ -55,7 +61,7 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
 
 ### Minimal configuration (the Ansible body will be removed when mission completed):
 
-- Onbuild series:
+- Onbuild variants:
 
   - `williamyeh/ansible:mini-alpine3`
   - `williamyeh/ansible:mini-debian8`
@@ -63,7 +69,7 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
 
 ### Old 1.9 version:
 
-- Normal series:
+- Normal variants:
 
   - `williamyeh/ansible:1.9-debian8`
   - `williamyeh/ansible:1.9-debian7`
@@ -73,7 +79,7 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
   - `williamyeh/ansible:1.9-centos6`
   - `williamyeh/ansible:1.9-alpine3`
 
-- Onbuild series (*recommended for common cases*):
+- Onbuild variants (*recommended for common cases*):
 
   - `williamyeh/ansible:1.9-debian8-onbuild`
   - `williamyeh/ansible:1.9-debian7-onbuild`
@@ -86,7 +92,7 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
 
 ### Experimental version (building directly from the git `master` source tree; use at your own risk!):
 
-- Normal series:
+- Normal variants:
 
   - `williamyeh/ansible:master-debian8`
   - `williamyeh/ansible:master-debian7`
@@ -96,7 +102,7 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
   - `williamyeh/ansible:master-centos7`
   - `williamyeh/ansible:master-centos6`
 
-- Onbuild series (*recommended for common cases*):
+- Onbuild variants (*recommended for common cases*):
 
   - `williamyeh/ansible:master-debian8-onbuild`
   - `williamyeh/ansible:master-debian7-onbuild`
@@ -143,7 +149,7 @@ For more advanced usage, the role in Ansible Galaxy [`williamyeh/nginx`](https:/
 
 ## Why yet another Ansible image for Docker?
 
-There has been quite a few Ansible images for Docker (e.g., [search](https://registry.hub.docker.com/search?q=ansible) in the Docker Hub), so why reinvent the wheel?
+There has been quite a few Ansible images for Docker (e.g., [search](https://hub.docker.com/search/?q=ansible&isAutomated=0&isOfficial=0&page=1&pullCount=1&starCount=0) in the Docker Hub), so why reinvent the wheel?
 
 In the beginning I used the [`ansible/ansible-docker-base`](https://github.com/ansible/ansible-docker-base) created by Ansible Inc. It worked well, but left some room for improvement:
 
@@ -235,7 +241,7 @@ RUN ansible-playbook -i inventory playbook.yml \
       --connection=local --sudo
 ```
 
-You may also work with `onbuild` series, which take care of many routine steps for you:
+You may also work with `onbuild` variants, which take care of many routine steps for you:
 
 ```dockerfile
 # Dockerfile

diff --git a/alpine3-onbuild/ansible-playbook-wrapper b/alpine3-onbuild/ansible-playbook-wrapper
index 0ba45e6d33a5c8ac18d815a70807b630ece38444..73035d9efeff96df901d1c664c1a53e46253f206 100755 (executable)
--- a/alpine3-onbuild/ansible-playbook-wrapper
+++ b/alpine3-onbuild/ansible-playbook-wrapper
@@ -23,6 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    apk --update add git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/alpine3/Dockerfile b/alpine3/Dockerfile
index 517484be08d15de6f4dfdff2495f3c52ae07c651..cb3bd661b80a684071857087a1f6f70cd1bdfa67 100644 (file)
--- a/alpine3/Dockerfile
+++ b/alpine3/Dockerfile
@@ -23,6 +23,10 @@ RUN echo "===> Adding Python runtime..."  && \
     pip install ansible                && \
     \
     \
+    echo "===> Installing handy tools (not absolutely required)..."  && \
+    apk --update add sshpass openssh-client  && \
+    \
+    \
     echo "===> Removing package list..."  && \
     apk del build-dependencies            && \
     rm -rf /var/cache/apk/*               && \

diff --git a/centos6-onbuild/ansible-playbook-wrapper b/centos6-onbuild/ansible-playbook-wrapper
index 0ba45e6d33a5c8ac18d815a70807b630ece38444..dcc6723236ab68382b1cd8dcc1994cd97a5bd61d 100755 (executable)
--- a/centos6-onbuild/ansible-playbook-wrapper
+++ b/centos6-onbuild/ansible-playbook-wrapper
@@ -23,6 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    yum -y install git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/centos6/Dockerfile b/centos6/Dockerfile
index ddf01f88b37f6b29bb74572ca19c5b6faff54001..6ebaad9be03c0ed287ff1b362b5ffde8a46607e3 100644 (file)
--- a/centos6/Dockerfile
+++ b/centos6/Dockerfile
@@ -35,6 +35,10 @@ RUN echo "===> Installing EPEL..."        && \
     sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers  || true  && \
     \
     \
+    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                                 && \

diff --git a/centos7-onbuild/ansible-playbook-wrapper b/centos7-onbuild/ansible-playbook-wrapper
index 002158d9ea5b158f429c5021764ad3088e7cc9e9..7f4be5c1f6abde0bb4ad6430b4632ef01a77eb31 100755 (executable)
--- a/centos7-onbuild/ansible-playbook-wrapper
+++ b/centos7-onbuild/ansible-playbook-wrapper
@@ -22,6 +22,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    yum -y install git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/centos7/Dockerfile b/centos7/Dockerfile
index b2cf91fecea03ad9f63d2d2215875f0b1fc802d5..cc2f1ef3717bdd9e68504abd6b3e246e2d561483 100644 (file)
--- a/centos7/Dockerfile
+++ b/centos7/Dockerfile
@@ -50,6 +50,10 @@ RUN echo "===> Enabling systemd..."  && \
     sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers  || true  && \
     \
     \
+    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                                 && \

diff --git a/debian7-onbuild/ansible-playbook-wrapper b/debian7-onbuild/ansible-playbook-wrapper
index 0ba45e6d33a5c8ac18d815a70807b630ece38444..afe4d97d9aa73298543855d7b154eac25345c3f7 100755 (executable)
--- a/debian7-onbuild/ansible-playbook-wrapper
+++ b/debian7-onbuild/ansible-playbook-wrapper
@@ -23,6 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    apt-get install -y git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/debian7/Dockerfile b/debian7/Dockerfile
index 25cc25b46ab4978cd2864f2cdd03b4dec3af6055..743d063f3b2f440e2a506810e5545710219a698a 100644 (file)
--- a/debian7/Dockerfile
+++ b/debian7/Dockerfile
@@ -25,6 +25,10 @@ RUN echo "===> Installing python, sudo, and supporting tools..."  && \
     pip install ansible                 && \
     \
     \
+    echo "===> Installing handy tools (not absolutely required)..."  && \
+    apt-get install -y sshpass openssh-client  && \
+    \
+    \
     echo "===> Removing unused APT resources..."                  && \
     apt-get -f -y --auto-remove remove \
                  gcc python-pip python-dev libffi-dev libssl-dev  && \

diff --git a/debian8-onbuild/ansible-playbook-wrapper b/debian8-onbuild/ansible-playbook-wrapper
index 0ba45e6d33a5c8ac18d815a70807b630ece38444..afe4d97d9aa73298543855d7b154eac25345c3f7 100755 (executable)
--- a/debian8-onbuild/ansible-playbook-wrapper
+++ b/debian8-onbuild/ansible-playbook-wrapper
@@ -23,6 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    apt-get install -y git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/debian8/Dockerfile b/debian8/Dockerfile
index 1a3023973dde8fc44d3e7912411bc85f298d4a6b..37a7219a78148dfb94c5ee35efd6407910e885ac 100644 (file)
--- a/debian8/Dockerfile
+++ b/debian8/Dockerfile
@@ -26,6 +26,10 @@ RUN echo "===> Installing python, sudo, and supporting tools..."  && \
     pip install ansible                 && \
     \
     \
+    echo "===> Installing handy tools (not absolutely required)..."  && \
+    apt-get install -y sshpass openssh-client  && \
+    \
+    \
     echo "===> Removing unused APT resources..."                  && \
     apt-get -f -y --auto-remove remove \
                  gcc python-pip python-dev libffi-dev libssl-dev  && \

diff --git a/master-centos6-onbuild/ansible-playbook-wrapper b/master-centos6-onbuild/ansible-playbook-wrapper
index 0ba45e6d33a5c8ac18d815a70807b630ece38444..dcc6723236ab68382b1cd8dcc1994cd97a5bd61d 100755 (executable)
--- a/master-centos6-onbuild/ansible-playbook-wrapper
+++ b/master-centos6-onbuild/ansible-playbook-wrapper
@@ -23,6 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    yum -y install git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/master-centos6/Dockerfile b/master-centos6/Dockerfile
index 8469d6545a8f73a3f0cc5b3fb21c0d47170845a0..b647a4c7539ac8552e0ad9435f93ae5c3e943e7a 100644 (file)
--- a/master-centos6/Dockerfile
+++ b/master-centos6/Dockerfile
@@ -59,6 +59,10 @@ RUN echo "===> Installing EPEL..."   && \
     sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers  && \
     \
     \
+    echo "===> Installing handy tools (not absolutely required)..."  && \
+    yum -y install sshpass openssh-clients  && \
+    \
+    \
     echo "===> Removing unused YUM resources..."              && \
     yum -y remove epel-release gcc git python-devel python-pip \
                   libffi-devel openssl-devel  || true         && \

diff --git a/master-centos7-onbuild/ansible-playbook-wrapper b/master-centos7-onbuild/ansible-playbook-wrapper
index 0ba45e6d33a5c8ac18d815a70807b630ece38444..dcc6723236ab68382b1cd8dcc1994cd97a5bd61d 100755 (executable)
--- a/master-centos7-onbuild/ansible-playbook-wrapper
+++ b/master-centos7-onbuild/ansible-playbook-wrapper
@@ -23,6 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    yum -y install git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/master-centos7/Dockerfile b/master-centos7/Dockerfile
index 75711d8537f9dfd4c9d329747e70c8f08cd6788b..eb120a5051996b0b136896f3f3508cdbd6ca6e20 100644 (file)
--- a/master-centos7/Dockerfile
+++ b/master-centos7/Dockerfile
@@ -74,6 +74,10 @@ RUN echo "===> Enabling systemd..."  && \
     sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers  && \
     \
     \
+    echo "===> Installing handy tools (not absolutely required)..."  && \
+    yum -y install sshpass openssh-clients  && \
+    \
+    \
     echo "===> Removing unused YUM resources..."              && \
     yum -y remove epel-release gcc git python-devel python-pip \
                   libffi-devel openssl-devel  || true         && \

diff --git a/master-debian7-onbuild/ansible-playbook-wrapper b/master-debian7-onbuild/ansible-playbook-wrapper
index 0ba45e6d33a5c8ac18d815a70807b630ece38444..afe4d97d9aa73298543855d7b154eac25345c3f7 100755 (executable)
--- a/master-debian7-onbuild/ansible-playbook-wrapper
+++ b/master-debian7-onbuild/ansible-playbook-wrapper
@@ -23,6 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    apt-get install -y git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/master-debian7/Dockerfile b/master-debian7/Dockerfile
index 8a81696795ca6e37f747fe20e78c13bc2670db7b..dd217c7ce49d83a4ccb8de8ad2f7216d4322236e 100644 (file)
--- a/master-debian7/Dockerfile
+++ b/master-debian7/Dockerfile
@@ -42,6 +42,10 @@ RUN echo "===> Adding Ansible's prerequisites..."         && \
     rm -rf /ansible                      && \
     \
     \
+    echo "===> Installing handy tools (not absolutely required)..."  && \
+    apt-get install -y sshpass openssh-client  && \
+    \
+    \
     echo "===> Clean up..."                                                  && \
     apt-get remove -y --auto-remove \
             build-essential python-pip python-dev git libffi-dev libssl-dev  && \

diff --git a/master-debian8-onbuild/ansible-playbook-wrapper b/master-debian8-onbuild/ansible-playbook-wrapper
index 0ba45e6d33a5c8ac18d815a70807b630ece38444..afe4d97d9aa73298543855d7b154eac25345c3f7 100755 (executable)
--- a/master-debian8-onbuild/ansible-playbook-wrapper
+++ b/master-debian8-onbuild/ansible-playbook-wrapper
@@ -23,6 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    apt-get install -y git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/master-debian8/Dockerfile b/master-debian8/Dockerfile
index d18b0f82f73973410f73cfed23071ef8e0bec49e..f5ea7979c7a87b67885f98587e3aa1109f1ba396 100644 (file)
--- a/master-debian8/Dockerfile
+++ b/master-debian8/Dockerfile
@@ -43,6 +43,10 @@ RUN echo "===> Adding Ansible's prerequisites..."         && \
     rm -rf /ansible                      && \
     \
     \
+    echo "===> Installing handy tools (not absolutely required)..."  && \
+    apt-get install -y sshpass openssh-client  && \
+    \
+    \
     echo "===> Clean up..."                                                  && \
     apt-get remove -y --auto-remove \
             build-essential python-pip python-dev git libffi-dev libssl-dev  && \

diff --git a/master-ubuntu12.04-onbuild/ansible-playbook-wrapper b/master-ubuntu12.04-onbuild/ansible-playbook-wrapper
index 0ba45e6d33a5c8ac18d815a70807b630ece38444..afe4d97d9aa73298543855d7b154eac25345c3f7 100755 (executable)
--- a/master-ubuntu12.04-onbuild/ansible-playbook-wrapper
+++ b/master-ubuntu12.04-onbuild/ansible-playbook-wrapper
@@ -23,6 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    apt-get install -y git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/master-ubuntu12.04/Dockerfile b/master-ubuntu12.04/Dockerfile
index ed11e78924f746c232639df9e7f63049f2dd5fc9..021eeb961388d40be895c25a46b3c5916961a390 100644 (file)
--- a/master-ubuntu12.04/Dockerfile
+++ b/master-ubuntu12.04/Dockerfile
@@ -40,6 +40,10 @@ RUN echo "===> Adding Ansible's prerequisites..."   && \
     rm -rf /ansible                      && \
     \
     \
+    echo "===> Installing handy tools (not absolutely required)..."  && \
+    apt-get install -y sshpass openssh-client  && \
+    \
+    \
     echo "===> Clean up..."                                         && \
     apt-get remove -y --auto-remove \
             build-essential python-pip python-dev git               && \

diff --git a/master-ubuntu14.04-onbuild/ansible-playbook-wrapper b/master-ubuntu14.04-onbuild/ansible-playbook-wrapper
index 0ba45e6d33a5c8ac18d815a70807b630ece38444..afe4d97d9aa73298543855d7b154eac25345c3f7 100755 (executable)
--- a/master-ubuntu14.04-onbuild/ansible-playbook-wrapper
+++ b/master-ubuntu14.04-onbuild/ansible-playbook-wrapper
@@ -23,6 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    apt-get install -y git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/master-ubuntu14.04/Dockerfile b/master-ubuntu14.04/Dockerfile
index 4c0a154db91f2257d4292b2a02fea28564e148b1..a727507bb031f3fc3960fdec414e9b7e8a321d69 100644 (file)
--- a/master-ubuntu14.04/Dockerfile
+++ b/master-ubuntu14.04/Dockerfile
@@ -40,6 +40,10 @@ RUN echo "===> Adding Ansible's prerequisites..."   && \
     rm -rf /ansible                      && \
     \
     \
+    echo "===> Installing handy tools (not absolutely required)..."  && \
+    apt-get install -y sshpass openssh-client  && \
+    \
+    \
     echo "===> Clean up..."                                         && \
     apt-get remove -y --auto-remove \
             build-essential python-pip python-dev git               && \

diff --git a/master-ubuntu16.04-onbuild/ansible-playbook-wrapper b/master-ubuntu16.04-onbuild/ansible-playbook-wrapper
index 0ba45e6d33a5c8ac18d815a70807b630ece38444..afe4d97d9aa73298543855d7b154eac25345c3f7 100755 (executable)
--- a/master-ubuntu16.04-onbuild/ansible-playbook-wrapper
+++ b/master-ubuntu16.04-onbuild/ansible-playbook-wrapper
@@ -23,6 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    apt-get install -y git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/master-ubuntu16.04/Dockerfile b/master-ubuntu16.04/Dockerfile
index 921af2341c7eb50e8a8b97478d9ac60163ba1c2a..6b601a6be22050a3125d18beb537113c283c7bf0 100644 (file)
--- a/master-ubuntu16.04/Dockerfile
+++ b/master-ubuntu16.04/Dockerfile
@@ -42,6 +42,10 @@ RUN echo "===> Adding Ansible's prerequisites..."   && \
     rm -rf /ansible                      && \
     \
     \
+    echo "===> Installing handy tools (not absolutely required)..."  && \
+    apt-get install -y sshpass openssh-client  && \
+    \
+    \
     echo "===> Clean up..."                                         && \
     apt-get remove -y --auto-remove \
             build-essential python-pip python-dev git libffi-dev libssl-dev  && \

diff --git a/mini-alpine3/apk-list b/mini-alpine3/apk-list
index eec27a418c43cc81bb0de17bac5f50a068427922..4c5a0cc5ce362d746668243c9d6f7c1681d8f1ca 100644 (file)
--- a/mini-alpine3/apk-list
+++ b/mini-alpine3/apk-list
@@ -12,3 +12,6 @@ python py-pip
 
 # build-dependencies
 python-dev libffi-dev openssl-dev build-base
+
+# may be required by ansible-galaxy
+git
\ No newline at end of file

diff --git a/mini-debian8/apt-list b/mini-debian8/apt-list
index 635e7d55bbc58bff89de076805ba6df79f0fadcc..7f23377392e36b19c0434b02a1c39513e2989dff 100644 (file)
--- a/mini-debian8/apt-list
+++ b/mini-debian8/apt-list
@@ -15,4 +15,7 @@ python
 #####python-pip python-yaml 
 
 # build-dependencies
-#####python-dev libffi-dev libssl-dev
\ No newline at end of file
+#####python-dev libffi-dev libssl-dev
+
+# may be required by ansible-galaxy
+git
\ No newline at end of file

diff --git a/ubuntu12.04-onbuild/ansible-playbook-wrapper b/ubuntu12.04-onbuild/ansible-playbook-wrapper
index 0ba45e6d33a5c8ac18d815a70807b630ece38444..afe4d97d9aa73298543855d7b154eac25345c3f7 100755 (executable)
--- a/ubuntu12.04-onbuild/ansible-playbook-wrapper
+++ b/ubuntu12.04-onbuild/ansible-playbook-wrapper
@@ -23,6 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    apt-get install -y git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/ubuntu12.04/Dockerfile b/ubuntu12.04/Dockerfile
index 42bb74328f67e8e7f11147b8cc2a6588dbe12621..1dd4c58efb37b19440425a7e3d2fee9307f337f8 100644 (file)
--- a/ubuntu12.04/Dockerfile
+++ b/ubuntu12.04/Dockerfile
@@ -23,6 +23,10 @@ RUN echo "===> Adding Ansible's PPA..."  && \
     apt-get install -y ansible sudo && \
     \
     \
+    echo "===> Installing handy tools (not absolutely required)..."  && \
+    apt-get install -y sshpass openssh-client  && \
+    \
+    \
     echo "===> Removing Ansible PPA..."  && \
     rm -rf /var/lib/apt/lists/*  /etc/apt/sources.list.d/ansible.list  && \
     \

diff --git a/ubuntu14.04-onbuild/ansible-playbook-wrapper b/ubuntu14.04-onbuild/ansible-playbook-wrapper
index 0ba45e6d33a5c8ac18d815a70807b630ece38444..afe4d97d9aa73298543855d7b154eac25345c3f7 100755 (executable)
--- a/ubuntu14.04-onbuild/ansible-playbook-wrapper
+++ b/ubuntu14.04-onbuild/ansible-playbook-wrapper
@@ -23,6 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    apt-get install -y git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/ubuntu14.04/Dockerfile b/ubuntu14.04/Dockerfile
index 187d39cab503df0244d00a355c67754b76434eba..ef29eb9e4daa8982894343a8fae75beef63fdcbb 100644 (file)
--- a/ubuntu14.04/Dockerfile
+++ b/ubuntu14.04/Dockerfile
@@ -23,6 +23,10 @@ RUN echo "===> Adding Ansible's PPA..."  && \
     apt-get install -y ansible  && \
     \
     \
+    echo "===> Installing handy tools (not absolutely required)..."  && \
+    apt-get install -y sshpass openssh-client  && \
+    \
+    \
     echo "===> Removing Ansible PPA..."  && \
     rm -rf /var/lib/apt/lists/*  /etc/apt/sources.list.d/ansible.list  && \
     \

diff --git a/ubuntu16.04-onbuild/ansible-playbook-wrapper b/ubuntu16.04-onbuild/ansible-playbook-wrapper
index 0ba45e6d33a5c8ac18d815a70807b630ece38444..afe4d97d9aa73298543855d7b154eac25345c3f7 100755 (executable)
--- a/ubuntu16.04-onbuild/ansible-playbook-wrapper
+++ b/ubuntu16.04-onbuild/ansible-playbook-wrapper
@@ -23,6 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
 fi
 
 if [ -f "$REQUIREMENTS" ]; then
+    apt-get install -y git
     ansible-galaxy install -r $REQUIREMENTS
 fi
 

diff --git a/ubuntu16.04/Dockerfile b/ubuntu16.04/Dockerfile
index 762c2daf47e92e1bf7d1118c2e82b1a7b02aaf76..201552e563ccc43d9bb477692ed529716ad25b26 100644 (file)
--- a/ubuntu16.04/Dockerfile
+++ b/ubuntu16.04/Dockerfile
@@ -23,6 +23,10 @@ RUN echo "===> Adding Ansible's PPA..."  && \
     apt-get install -y ansible  && \
     \
     \
+    echo "===> Installing handy tools (not absolutely required)..."  && \
+    apt-get install -y sshpass openssh-client  && \
+    \
+    \
     echo "===> Removing Ansible PPA..."  && \
     rm -rf /var/lib/apt/lists/*  /etc/apt/sources.list.d/ansible.list  && \
     \