aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorWilliam Yeh <william.pjyeh@gmail.com>2016-06-14 15:59:32 +0800
committerWilliam Yeh <william.pjyeh@gmail.com>2016-06-14 15:59:32 +0800
commitb1f3718d07a6a68116eb98bcb2156af7b39c2259 (patch)
tree66d2b0faf0f33d7ac0257c786df9f445fbeff024
parentd707bce5e4201a69438ba58c6500346999fa68df (diff)
downloaddocker-ansible-b1f3718d07a6a68116eb98bcb2156af7b39c2259.tar.gz
docker-ansible-b1f3718d07a6a68116eb98bcb2156af7b39c2259.tar.zst
docker-ansible-b1f3718d07a6a68116eb98bcb2156af7b39c2259.zip
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
-rwxr-xr-x1.9-alpine3-onbuild/ansible-playbook-wrapper1
-rw-r--r--1.9-alpine3/Dockerfile4
-rwxr-xr-x1.9-centos6-onbuild/ansible-playbook-wrapper1
-rw-r--r--1.9-centos6/Dockerfile4
-rwxr-xr-x1.9-centos7-onbuild/ansible-playbook-wrapper1
-rw-r--r--1.9-centos7/Dockerfile4
-rwxr-xr-x1.9-debian7-onbuild/ansible-playbook-wrapper1
-rw-r--r--1.9-debian7/Dockerfile4
-rwxr-xr-x1.9-debian8-onbuild/ansible-playbook-wrapper1
-rw-r--r--1.9-debian8/Dockerfile4
-rwxr-xr-x1.9-ubuntu12.04-onbuild/ansible-playbook-wrapper1
-rw-r--r--1.9-ubuntu12.04/Dockerfile4
-rwxr-xr-x1.9-ubuntu14.04-onbuild/ansible-playbook-wrapper1
-rw-r--r--1.9-ubuntu14.04/Dockerfile4
-rw-r--r--README.md34
-rwxr-xr-xalpine3-onbuild/ansible-playbook-wrapper1
-rw-r--r--alpine3/Dockerfile4
-rwxr-xr-xcentos6-onbuild/ansible-playbook-wrapper1
-rw-r--r--centos6/Dockerfile4
-rwxr-xr-xcentos7-onbuild/ansible-playbook-wrapper1
-rw-r--r--centos7/Dockerfile4
-rwxr-xr-xdebian7-onbuild/ansible-playbook-wrapper1
-rw-r--r--debian7/Dockerfile4
-rwxr-xr-xdebian8-onbuild/ansible-playbook-wrapper1
-rw-r--r--debian8/Dockerfile4
-rwxr-xr-xmaster-centos6-onbuild/ansible-playbook-wrapper1
-rw-r--r--master-centos6/Dockerfile4
-rwxr-xr-xmaster-centos7-onbuild/ansible-playbook-wrapper1
-rw-r--r--master-centos7/Dockerfile4
-rwxr-xr-xmaster-debian7-onbuild/ansible-playbook-wrapper1
-rw-r--r--master-debian7/Dockerfile4
-rwxr-xr-xmaster-debian8-onbuild/ansible-playbook-wrapper1
-rw-r--r--master-debian8/Dockerfile4
-rwxr-xr-xmaster-ubuntu12.04-onbuild/ansible-playbook-wrapper1
-rw-r--r--master-ubuntu12.04/Dockerfile4
-rwxr-xr-xmaster-ubuntu14.04-onbuild/ansible-playbook-wrapper1
-rw-r--r--master-ubuntu14.04/Dockerfile4
-rwxr-xr-xmaster-ubuntu16.04-onbuild/ansible-playbook-wrapper1
-rw-r--r--master-ubuntu16.04/Dockerfile4
-rw-r--r--mini-alpine3/apk-list3
-rw-r--r--mini-debian8/apt-list5
-rwxr-xr-xubuntu12.04-onbuild/ansible-playbook-wrapper1
-rw-r--r--ubuntu12.04/Dockerfile4
-rwxr-xr-xubuntu14.04-onbuild/ansible-playbook-wrapper1
-rw-r--r--ubuntu14.04/Dockerfile4
-rwxr-xr-xubuntu16.04-onbuild/ansible-playbook-wrapper1
-rw-r--r--ubuntu16.04/Dockerfile4
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
23fi 23fi
24 24
25if [ -f "$REQUIREMENTS" ]; then 25if [ -f "$REQUIREMENTS" ]; then
26 apk --update add git
26 ansible-galaxy install -r $REQUIREMENTS 27 ansible-galaxy install -r $REQUIREMENTS
27fi 28fi
28 29
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..." && \
23 pip install ansible==1.9.4 && \ 23 pip install ansible==1.9.4 && \
24 \ 24 \
25 \ 25 \
26 echo "===> Installing handy tools (not absolutely required)..." && \
27 apk --update add sshpass openssh-client && \
28 \
29 \
26 echo "===> Removing package list..." && \ 30 echo "===> Removing package list..." && \
27 apk del build-dependencies && \ 31 apk del build-dependencies && \
28 rm -rf /var/cache/apk/* && \ 32 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
23fi 23fi
24 24
25if [ -f "$REQUIREMENTS" ]; then 25if [ -f "$REQUIREMENTS" ]; then
26 yum -y install git
26 ansible-galaxy install -r $REQUIREMENTS 27 ansible-galaxy install -r $REQUIREMENTS
27fi 28fi
28 29
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..." && \
35 sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers || true && \ 35 sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers || true && \
36 \ 36 \
37 \ 37 \
38 echo "===> Installing handy tools (not absolutely required)..." && \
39 yum -y install sshpass openssh-clients && \
40 \
41 \
38 echo "===> Removing unused YUM resources..." && \ 42 echo "===> Removing unused YUM resources..." && \
39 yum -y remove epel-release && \ 43 yum -y remove epel-release && \
40 yum clean all && \ 44 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
23fi 23fi
24 24
25if [ -f "$REQUIREMENTS" ]; then 25if [ -f "$REQUIREMENTS" ]; then
26 yum -y install git
26 ansible-galaxy install -r $REQUIREMENTS 27 ansible-galaxy install -r $REQUIREMENTS
27fi 28fi
28 29
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..." && \
50 sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers || true && \ 50 sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers || true && \
51 \ 51 \
52 \ 52 \
53 echo "===> Installing handy tools (not absolutely required)..." && \
54 yum -y install sshpass openssh-clients && \
55 \
56 \
53 echo "===> Removing unused YUM resources..." && \ 57 echo "===> Removing unused YUM resources..." && \
54 yum -y remove epel-release && \ 58 yum -y remove epel-release && \
55 yum clean all && \ 59 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
23fi 23fi
24 24
25if [ -f "$REQUIREMENTS" ]; then 25if [ -f "$REQUIREMENTS" ]; then
26 apt-get install -y git
26 ansible-galaxy install -r $REQUIREMENTS 27 ansible-galaxy install -r $REQUIREMENTS
27fi 28fi
28 29
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..." && \
25 pip install ansible==1.9.4 && \ 25 pip install ansible==1.9.4 && \
26 \ 26 \
27 \ 27 \
28 echo "===> Installing handy tools (not absolutely required)..." && \
29 apt-get install -y sshpass openssh-client && \
30 \
31 \
28 echo "===> Removing unused APT resources..." && \ 32 echo "===> Removing unused APT resources..." && \
29 apt-get -f -y --auto-remove remove \ 33 apt-get -f -y --auto-remove remove \
30 gcc python-pip python-dev libffi-dev libssl-dev && \ 34 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
23fi 23fi
24 24
25if [ -f "$REQUIREMENTS" ]; then 25if [ -f "$REQUIREMENTS" ]; then
26 apt-get install -y git
26 ansible-galaxy install -r $REQUIREMENTS 27 ansible-galaxy install -r $REQUIREMENTS
27fi 28fi
28 29
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..." && \
26 pip install ansible==1.9.4 && \ 26 pip install ansible==1.9.4 && \
27 \ 27 \
28 \ 28 \
29 echo "===> Installing handy tools (not absolutely required)..." && \
30 apt-get install -y sshpass openssh-client && \
31 \
32 \
29 echo "===> Removing unused APT resources..." && \ 33 echo "===> Removing unused APT resources..." && \
30 apt-get -f -y --auto-remove remove \ 34 apt-get -f -y --auto-remove remove \
31 gcc python-pip python-dev libffi-dev libssl-dev && \ 35 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
23fi 23fi
24 24
25if [ -f "$REQUIREMENTS" ]; then 25if [ -f "$REQUIREMENTS" ]; then
26 apt-get install -y git
26 ansible-galaxy install -r $REQUIREMENTS 27 ansible-galaxy install -r $REQUIREMENTS
27fi 28fi
28 29
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..." && \
23 apt-get install -y ansible sudo && \ 23 apt-get install -y ansible sudo && \
24 \ 24 \
25 \ 25 \
26 echo "===> Installing handy tools (not absolutely required)..." && \
27 apt-get install -y sshpass openssh-client && \
28 \
29 \
26 echo "===> Removing Ansible PPA..." && \ 30 echo "===> Removing Ansible PPA..." && \
27 rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/ansible.list && \ 31 rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/ansible.list && \
28 \ 32 \
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
23fi 23fi
24 24
25if [ -f "$REQUIREMENTS" ]; then 25if [ -f "$REQUIREMENTS" ]; then
26 apt-get install -y git
26 ansible-galaxy install -r $REQUIREMENTS 27 ansible-galaxy install -r $REQUIREMENTS
27fi 28fi
28 29
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..." && \
23 apt-get install -y ansible && \ 23 apt-get install -y ansible && \
24 \ 24 \
25 \ 25 \
26 echo "===> Installing handy tools (not absolutely required)..." && \
27 apt-get install -y sshpass openssh-client && \
28 \
29 \
26 echo "===> Removing Ansible PPA..." && \ 30 echo "===> Removing Ansible PPA..." && \
27 rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/ansible.list && \ 31 rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/ansible.list && \
28 \ 32 \
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
6 6
7## Summary 7## Summary
8 8
9Repository name in Docker Hub: **[williamyeh/ansible](https://registry.hub.docker.com/u/williamyeh/ansible/)** 9Repository name in Docker Hub: **[williamyeh/ansible](https://hub.docker.com/r/williamyeh/ansible/)**
10 10
11This repository contains Dockerized [Ansible](https://github.com/ansible/ansible), published to the public [Docker Hub](https://registry.hub.docker.com/) via **automated build** mechanism. 11This repository contains Dockerized [Ansible](https://github.com/ansible/ansible), published to the public [Docker Hub](https://hub.docker.com/) via **automated build** mechanism.
12 12
13 13
14 14
@@ -18,19 +18,25 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
18 18
19- OS: Debian (jessie, wheezy), Ubuntu (xenial, trusty, precise), CentOS (7, 6), Alpine (3). 19- OS: Debian (jessie, wheezy), Ubuntu (xenial, trusty, precise), CentOS (7, 6), Alpine (3).
20 20
21- Ansible: four variants - 21- Ansible: four versions -
22 22
23 1. provides the most recent *stable* version of Ansible; suitable for most people. 23 1. provides the most recent *stable* version of Ansible; suitable for most people.
24 2. this variant is designed for building *minimal* images out of playbooks; i.e., the Ansible body will be removed when mission completed. 24 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.
25 3. provides the old 1.9 version of Ansible. 25 3. provides the old 1.9 version of Ansible.
26 4. provides the *experimental* version of Ansible. 26 4. provides the *experimental* version of Ansible; i.e., the master branch of git.
27
28
29Each version is further divided into two variants:
30
31- Normal variant: intended to be used as Ansible *control machines*, or in cases that is unsuitable in the onbuild variants.
32- Onbuild variant: intended to be used to build Docker images.
27 33
28 34
29## Images and tags 35## Images and tags
30 36
31### Stable version (installed from official PyPI repo): 37### Stable version (installed from official PyPI repo):
32 38
33- Normal series: 39- Normal variants:
34 40
35 - `williamyeh/ansible:debian8` 41 - `williamyeh/ansible:debian8`
36 - `williamyeh/ansible:debian7` 42 - `williamyeh/ansible:debian7`
@@ -41,7 +47,7 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
41 - `williamyeh/ansible:centos6` 47 - `williamyeh/ansible:centos6`
42 - `williamyeh/ansible:alpine3` 48 - `williamyeh/ansible:alpine3`
43 49
44- Onbuild series (*recommended for common cases*): 50- Onbuild variants (*recommended for common cases*):
45 51
46 - `williamyeh/ansible:debian8-onbuild` 52 - `williamyeh/ansible:debian8-onbuild`
47 - `williamyeh/ansible:debian7-onbuild` 53 - `williamyeh/ansible:debian7-onbuild`
@@ -55,7 +61,7 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
55 61
56### Minimal configuration (the Ansible body will be removed when mission completed): 62### Minimal configuration (the Ansible body will be removed when mission completed):
57 63
58- Onbuild series: 64- Onbuild variants:
59 65
60 - `williamyeh/ansible:mini-alpine3` 66 - `williamyeh/ansible:mini-alpine3`
61 - `williamyeh/ansible:mini-debian8` 67 - `williamyeh/ansible:mini-debian8`
@@ -63,7 +69,7 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
63 69
64### Old 1.9 version: 70### Old 1.9 version:
65 71
66- Normal series: 72- Normal variants:
67 73
68 - `williamyeh/ansible:1.9-debian8` 74 - `williamyeh/ansible:1.9-debian8`
69 - `williamyeh/ansible:1.9-debian7` 75 - `williamyeh/ansible:1.9-debian7`
@@ -73,7 +79,7 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
73 - `williamyeh/ansible:1.9-centos6` 79 - `williamyeh/ansible:1.9-centos6`
74 - `williamyeh/ansible:1.9-alpine3` 80 - `williamyeh/ansible:1.9-alpine3`
75 81
76- Onbuild series (*recommended for common cases*): 82- Onbuild variants (*recommended for common cases*):
77 83
78 - `williamyeh/ansible:1.9-debian8-onbuild` 84 - `williamyeh/ansible:1.9-debian8-onbuild`
79 - `williamyeh/ansible:1.9-debian7-onbuild` 85 - `williamyeh/ansible:1.9-debian7-onbuild`
@@ -86,7 +92,7 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
86 92
87### Experimental version (building directly from the git `master` source tree; use at your own risk!): 93### Experimental version (building directly from the git `master` source tree; use at your own risk!):
88 94
89- Normal series: 95- Normal variants:
90 96
91 - `williamyeh/ansible:master-debian8` 97 - `williamyeh/ansible:master-debian8`
92 - `williamyeh/ansible:master-debian7` 98 - `williamyeh/ansible:master-debian7`
@@ -96,7 +102,7 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
96 - `williamyeh/ansible:master-centos7` 102 - `williamyeh/ansible:master-centos7`
97 - `williamyeh/ansible:master-centos6` 103 - `williamyeh/ansible:master-centos6`
98 104
99- Onbuild series (*recommended for common cases*): 105- Onbuild variants (*recommended for common cases*):
100 106
101 - `williamyeh/ansible:master-debian8-onbuild` 107 - `williamyeh/ansible:master-debian8-onbuild`
102 - `williamyeh/ansible:master-debian7-onbuild` 108 - `williamyeh/ansible:master-debian7-onbuild`
@@ -143,7 +149,7 @@ For more advanced usage, the role in Ansible Galaxy [`williamyeh/nginx`](https:/
143 149
144## Why yet another Ansible image for Docker? 150## Why yet another Ansible image for Docker?
145 151
146There 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? 152There 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?
147 153
148In 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: 154In 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:
149 155
@@ -235,7 +241,7 @@ RUN ansible-playbook -i inventory playbook.yml \
235 --connection=local --sudo 241 --connection=local --sudo
236``` 242```
237 243
238You may also work with `onbuild` series, which take care of many routine steps for you: 244You may also work with `onbuild` variants, which take care of many routine steps for you:
239 245
240```dockerfile 246```dockerfile
241# Dockerfile 247# 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
23fi 23fi
24 24
25if [ -f "$REQUIREMENTS" ]; then 25if [ -f "$REQUIREMENTS" ]; then
26 apk --update add git
26 ansible-galaxy install -r $REQUIREMENTS 27 ansible-galaxy install -r $REQUIREMENTS
27fi 28fi
28 29
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..." && \
23 pip install ansible && \ 23 pip install ansible && \
24 \ 24 \
25 \ 25 \
26 echo "===> Installing handy tools (not absolutely required)..." && \
27 apk --update add sshpass openssh-client && \
28 \
29 \
26 echo "===> Removing package list..." && \ 30 echo "===> Removing package list..." && \
27 apk del build-dependencies && \ 31 apk del build-dependencies && \
28 rm -rf /var/cache/apk/* && \ 32 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
23fi 23fi
24 24
25if [ -f "$REQUIREMENTS" ]; then 25if [ -f "$REQUIREMENTS" ]; then
26 yum -y install git
26 ansible-galaxy install -r $REQUIREMENTS 27 ansible-galaxy install -r $REQUIREMENTS
27fi 28fi
28 29
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..." && \
35 sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers || true && \ 35 sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers || true && \
36 \ 36 \
37 \ 37 \
38 echo "===> Installing handy tools (not absolutely required)..." && \
39 yum -y install sshpass openssh-clients && \
40 \
41 \
38 echo "===> Removing unused YUM resources..." && \ 42 echo "===> Removing unused YUM resources..." && \
39 yum -y remove epel-release && \ 43 yum -y remove epel-release && \
40 yum clean all && \ 44 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
22fi 22fi
23 23
24if [ -f "$REQUIREMENTS" ]; then 24if [ -f "$REQUIREMENTS" ]; then
25 yum -y install git
25 ansible-galaxy install -r $REQUIREMENTS 26 ansible-galaxy install -r $REQUIREMENTS
26fi 27fi
27 28
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..." && \
50 sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers || true && \ 50 sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers || true && \
51 \ 51 \
52 \ 52 \
53 echo "===> Installing handy tools (not absolutely required)..." && \
54 yum -y install sshpass openssh-clients && \
55 \
56 \
53 echo "===> Removing unused YUM resources..." && \ 57 echo "===> Removing unused YUM resources..." && \
54 yum -y remove epel-release && \ 58 yum -y remove epel-release && \
55 yum clean all && \ 59 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
23fi 23fi
24 24
25if [ -f "$REQUIREMENTS" ]; then 25if [ -f "$REQUIREMENTS" ]; then
26 apt-get install -y git
26 ansible-galaxy install -r $REQUIREMENTS 27 ansible-galaxy install -r $REQUIREMENTS
27fi 28fi
28 29
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..." && \
25 pip install ansible && \ 25 pip install ansible && \
26 \ 26 \
27 \ 27 \
28 echo "===> Installing handy tools (not absolutely required)..." && \
29 apt-get install -y sshpass openssh-client && \
30 \
31 \
28 echo "===> Removing unused APT resources..." && \ 32 echo "===> Removing unused APT resources..." && \
29 apt-get -f -y --auto-remove remove \ 33 apt-get -f -y --auto-remove remove \
30 gcc python-pip python-dev libffi-dev libssl-dev && \ 34 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
23fi 23fi
24 24
25if [ -f "$REQUIREMENTS" ]; then 25if [ -f "$REQUIREMENTS" ]; then
26 apt-get install -y git
26 ansible-galaxy install -r $REQUIREMENTS 27 ansible-galaxy install -r $REQUIREMENTS
27fi 28fi
28 29
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..." && \
26 pip install ansible && \ 26 pip install ansible && \
27 \ 27 \
28 \ 28 \
29 echo "===> Installing handy tools (not absolutely required)..." && \
30 apt-get install -y sshpass openssh-client && \
31 \
32 \
29 echo "===> Removing unused APT resources..." && \ 33 echo "===> Removing unused APT resources..." && \
30 apt-get -f -y --auto-remove remove \ 34 apt-get -f -y --auto-remove remove \
31 gcc python-pip python-dev libffi-dev libssl-dev && \ 35 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
23fi 23fi
24 24
25if [ -f "$REQUIREMENTS" ]; then 25if [ -f "$REQUIREMENTS" ]; then
26 yum -y install git
26 ansible-galaxy install -r $REQUIREMENTS 27 ansible-galaxy install -r $REQUIREMENTS
27fi 28fi
28 29
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..." && \
59 sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers && \ 59 sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers && \
60 \ 60 \
61 \ 61 \
62 echo "===> Installing handy tools (not absolutely required)..." && \
63 yum -y install sshpass openssh-clients && \
64 \
65 \
62 echo "===> Removing unused YUM resources..." && \ 66 echo "===> Removing unused YUM resources..." && \
63 yum -y remove epel-release gcc git python-devel python-pip \ 67 yum -y remove epel-release gcc git python-devel python-pip \
64 libffi-devel openssl-devel || true && \ 68 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
23fi 23fi
24 24
25if [ -f "$REQUIREMENTS" ]; then 25if [ -f "$REQUIREMENTS" ]; then
26 yum -y install git
26 ansible-galaxy install -r $REQUIREMENTS 27 ansible-galaxy install -r $REQUIREMENTS
27fi 28fi
28 29
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..." && \
74 sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers && \ 74 sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers && \
75 \ 75 \
76 \ 76 \
77 echo "===> Installing handy tools (not absolutely required)..." && \
78 yum -y install sshpass openssh-clients && \
79 \
80 \
77 echo "===> Removing unused YUM resources..." && \ 81 echo "===> Removing unused YUM resources..." && \
78 yum -y remove epel-release gcc git python-devel python-pip \ 82 yum -y remove epel-release gcc git python-devel python-pip \
79 libffi-devel openssl-devel || true && \ 83 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
23fi 23fi
24 24
25if [ -f "$REQUIREMENTS" ]; then 25if [ -f "$REQUIREMENTS" ]; then
26 apt-get install -y git
26 ansible-galaxy install -r $REQUIREMENTS 27 ansible-galaxy install -r $REQUIREMENTS
27fi 28fi
28 29
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..." && \
42 rm -rf /ansible && \ 42 rm -rf /ansible && \
43 \ 43 \
44 \ 44 \
45 echo "===> Installing handy tools (not absolutely required)..." && \
46 apt-get install -y sshpass openssh-client && \
47 \
48 \
45 echo "===> Clean up..." && \ 49 echo "===> Clean up..." && \
46 apt-get remove -y --auto-remove \ 50 apt-get remove -y --auto-remove \
47 build-essential python-pip python-dev git libffi-dev libssl-dev && \ 51 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
23fi 23fi
24 24
25if [ -f "$REQUIREMENTS" ]; then 25if [ -f "$REQUIREMENTS" ]; then
26 apt-get install -y git
26 ansible-galaxy install -r $REQUIREMENTS 27 ansible-galaxy install -r $REQUIREMENTS
27fi 28fi
28 29
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..." && \
43 rm -rf /ansible && \ 43 rm -rf /ansible && \
44 \ 44 \
45 \ 45 \
46 echo "===> Installing handy tools (not absolutely required)..." && \
47 apt-get install -y sshpass openssh-client && \
48 \
49 \
46 echo "===> Clean up..." && \ 50 echo "===> Clean up..." && \
47 apt-get remove -y --auto-remove \ 51 apt-get remove -y --auto-remove \
48 build-essential python-pip python-dev git libffi-dev libssl-dev && \ 52 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
23fi 23fi
24 24
25if [ -f "$REQUIREMENTS" ]; then 25if [ -f "$REQUIREMENTS" ]; then
26 apt-get install -y git
26 ansible-galaxy install -r $REQUIREMENTS 27 ansible-galaxy install -r $REQUIREMENTS
27fi 28fi
28 29
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..." && \
40 rm -rf /ansible && \ 40 rm -rf /ansible && \
41 \ 41 \
42 \ 42 \
43 echo "===> Installing handy tools (not absolutely required)..." && \
44 apt-get install -y sshpass openssh-client && \
45 \
46 \
43 echo "===> Clean up..." && \ 47 echo "===> Clean up..." && \
44 apt-get remove -y --auto-remove \ 48 apt-get remove -y --auto-remove \
45 build-essential python-pip python-dev git && \ 49 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
23fi 23fi
24 24
25if [ -f "$REQUIREMENTS" ]; then 25if [ -f "$REQUIREMENTS" ]; then
26 apt-get install -y git
26 ansible-galaxy install -r $REQUIREMENTS 27 ansible-galaxy install -r $REQUIREMENTS
27fi 28fi
28 29
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..." && \
40 rm -rf /ansible && \ 40 rm -rf /ansible && \
41 \ 41 \
42 \ 42 \
43 echo "===> Installing handy tools (not absolutely required)..." && \
44 apt-get install -y sshpass openssh-client && \
45 \
46 \
43 echo "===> Clean up..." && \ 47 echo "===> Clean up..." && \
44 apt-get remove -y --auto-remove \ 48 apt-get remove -y --auto-remove \
45 build-essential python-pip python-dev git && \ 49 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
23fi 23fi
24 24
25if [ -f "$REQUIREMENTS" ]; then 25if [ -f "$REQUIREMENTS" ]; then
26 apt-get install -y git
26 ansible-galaxy install -r $REQUIREMENTS 27 ansible-galaxy install -r $REQUIREMENTS
27fi 28fi
28 29
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..." && \
42 rm -rf /ansible && \ 42 rm -rf /ansible && \
43 \ 43 \
44 \ 44 \
45 echo "===> Installing handy tools (not absolutely required)..." && \
46 apt-get install -y sshpass openssh-client && \
47 \
48 \
45 echo "===> Clean up..." && \ 49 echo "===> Clean up..." && \
46 apt-get remove -y --auto-remove \ 50 apt-get remove -y --auto-remove \
47 build-essential python-pip python-dev git libffi-dev libssl-dev && \ 51 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
12 12
13# build-dependencies 13# build-dependencies
14python-dev libffi-dev openssl-dev build-base 14python-dev libffi-dev openssl-dev build-base
15
16# may be required by ansible-galaxy
17git \ 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
15#####python-pip python-yaml 15#####python-pip python-yaml
16 16
17# build-dependencies 17# build-dependencies
18#####python-dev libffi-dev libssl-dev \ No newline at end of file 18#####python-dev libffi-dev libssl-dev
19
20# may be required by ansible-galaxy
21git \ 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
23fi 23fi
24 24
25if [ -f "$REQUIREMENTS" ]; then 25if [ -f "$REQUIREMENTS" ]; then
26 apt-get install -y git
26 ansible-galaxy install -r $REQUIREMENTS 27 ansible-galaxy install -r $REQUIREMENTS
27fi 28fi
28 29
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..." && \
23 apt-get install -y ansible sudo && \ 23 apt-get install -y ansible sudo && \
24 \ 24 \
25 \ 25 \
26 echo "===> Installing handy tools (not absolutely required)..." && \
27 apt-get install -y sshpass openssh-client && \
28 \
29 \
26 echo "===> Removing Ansible PPA..." && \ 30 echo "===> Removing Ansible PPA..." && \
27 rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/ansible.list && \ 31 rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/ansible.list && \
28 \ 32 \
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
23fi 23fi
24 24
25if [ -f "$REQUIREMENTS" ]; then 25if [ -f "$REQUIREMENTS" ]; then
26 apt-get install -y git
26 ansible-galaxy install -r $REQUIREMENTS 27 ansible-galaxy install -r $REQUIREMENTS
27fi 28fi
28 29
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..." && \
23 apt-get install -y ansible && \ 23 apt-get install -y ansible && \
24 \ 24 \
25 \ 25 \
26 echo "===> Installing handy tools (not absolutely required)..." && \
27 apt-get install -y sshpass openssh-client && \
28 \
29 \
26 echo "===> Removing Ansible PPA..." && \ 30 echo "===> Removing Ansible PPA..." && \
27 rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/ansible.list && \ 31 rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/ansible.list && \
28 \ 32 \
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
23fi 23fi
24 24
25if [ -f "$REQUIREMENTS" ]; then 25if [ -f "$REQUIREMENTS" ]; then
26 apt-get install -y git
26 ansible-galaxy install -r $REQUIREMENTS 27 ansible-galaxy install -r $REQUIREMENTS
27fi 28fi
28 29
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..." && \
23 apt-get install -y ansible && \ 23 apt-get install -y ansible && \
24 \ 24 \
25 \ 25 \
26 echo "===> Installing handy tools (not absolutely required)..." && \
27 apt-get install -y sshpass openssh-client && \
28 \
29 \
26 echo "===> Removing Ansible PPA..." && \ 30 echo "===> Removing Ansible PPA..." && \
27 rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/ansible.list && \ 31 rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/ansible.list && \
28 \ 32 \