From b1f3718d07a6a68116eb98bcb2156af7b39c2259 Mon Sep 17 00:00:00 2001 From: William Yeh Date: Tue, 14 Jun 2016 15:59:32 +0800 Subject: [PATCH] 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 --- 1.9-alpine3-onbuild/ansible-playbook-wrapper | 1 + 1.9-alpine3/Dockerfile | 4 +++ 1.9-centos6-onbuild/ansible-playbook-wrapper | 1 + 1.9-centos6/Dockerfile | 4 +++ 1.9-centos7-onbuild/ansible-playbook-wrapper | 1 + 1.9-centos7/Dockerfile | 4 +++ 1.9-debian7-onbuild/ansible-playbook-wrapper | 1 + 1.9-debian7/Dockerfile | 4 +++ 1.9-debian8-onbuild/ansible-playbook-wrapper | 1 + 1.9-debian8/Dockerfile | 4 +++ .../ansible-playbook-wrapper | 1 + 1.9-ubuntu12.04/Dockerfile | 4 +++ .../ansible-playbook-wrapper | 1 + 1.9-ubuntu14.04/Dockerfile | 4 +++ README.md | 34 +++++++++++-------- alpine3-onbuild/ansible-playbook-wrapper | 1 + alpine3/Dockerfile | 4 +++ centos6-onbuild/ansible-playbook-wrapper | 1 + centos6/Dockerfile | 4 +++ centos7-onbuild/ansible-playbook-wrapper | 1 + centos7/Dockerfile | 4 +++ debian7-onbuild/ansible-playbook-wrapper | 1 + debian7/Dockerfile | 4 +++ debian8-onbuild/ansible-playbook-wrapper | 1 + debian8/Dockerfile | 4 +++ .../ansible-playbook-wrapper | 1 + master-centos6/Dockerfile | 4 +++ .../ansible-playbook-wrapper | 1 + master-centos7/Dockerfile | 4 +++ .../ansible-playbook-wrapper | 1 + master-debian7/Dockerfile | 4 +++ .../ansible-playbook-wrapper | 1 + master-debian8/Dockerfile | 4 +++ .../ansible-playbook-wrapper | 1 + master-ubuntu12.04/Dockerfile | 4 +++ .../ansible-playbook-wrapper | 1 + master-ubuntu14.04/Dockerfile | 4 +++ .../ansible-playbook-wrapper | 1 + master-ubuntu16.04/Dockerfile | 4 +++ mini-alpine3/apk-list | 3 ++ mini-debian8/apt-list | 5 ++- ubuntu12.04-onbuild/ansible-playbook-wrapper | 1 + ubuntu12.04/Dockerfile | 4 +++ ubuntu14.04-onbuild/ansible-playbook-wrapper | 1 + ubuntu14.04/Dockerfile | 4 +++ ubuntu16.04-onbuild/ansible-playbook-wrapper | 1 + ubuntu16.04/Dockerfile | 4 +++ 47 files changed, 137 insertions(+), 15 deletions(-) diff --git a/1.9-alpine3-onbuild/ansible-playbook-wrapper b/1.9-alpine3-onbuild/ansible-playbook-wrapper index 0ba45e6..73035d9 100755 --- 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 a6367b7..4aae495 100644 --- 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 0ba45e6..dcc6723 100755 --- 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 da87e7b..628ea93 100644 --- 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 0ba45e6..dcc6723 100755 --- 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 627f20d..ab63d07 100644 --- 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 0ba45e6..afe4d97 100755 --- 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 5033911..7e7121e 100644 --- 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 0ba45e6..afe4d97 100755 --- 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 c76477d..416da2c 100644 --- 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 0ba45e6..afe4d97 100755 --- 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 1bfbbb3..bb78b18 100644 --- 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 0ba45e6..afe4d97 100755 --- 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 5791f1c..42c3ac4 100644 --- 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 83c1ea3..de9a362 100644 --- 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 0ba45e6..73035d9 100755 --- 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 517484b..cb3bd66 100644 --- 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 0ba45e6..dcc6723 100755 --- 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 ddf01f8..6ebaad9 100644 --- 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 002158d..7f4be5c 100755 --- 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 b2cf91f..cc2f1ef 100644 --- 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 0ba45e6..afe4d97 100755 --- 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 25cc25b..743d063 100644 --- 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 0ba45e6..afe4d97 100755 --- 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 1a30239..37a7219 100644 --- 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 0ba45e6..dcc6723 100755 --- 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 8469d65..b647a4c 100644 --- 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 0ba45e6..dcc6723 100755 --- 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 75711d8..eb120a5 100644 --- 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 0ba45e6..afe4d97 100755 --- 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 8a81696..dd217c7 100644 --- 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 0ba45e6..afe4d97 100755 --- 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 d18b0f8..f5ea797 100644 --- 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 0ba45e6..afe4d97 100755 --- 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 ed11e78..021eeb9 100644 --- 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 0ba45e6..afe4d97 100755 --- 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 4c0a154..a727507 100644 --- 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 0ba45e6..afe4d97 100755 --- 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 921af23..6b601a6 100644 --- 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 eec27a4..4c5a0cc 100644 --- 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 635e7d5..7f23377 100644 --- 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 0ba45e6..afe4d97 100755 --- 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 42bb743..1dd4c58 100644 --- 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 0ba45e6..afe4d97 100755 --- 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 187d39c..ef29eb9 100644 --- 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 0ba45e6..afe4d97 100755 --- 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 762c2da..201552e 100644 --- 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 && \ \ -- 2.41.0