diff options
-rw-r--r-- | README.md | 8 | ||||
-rw-r--r-- | debian7-onbuild/Dockerfile | 8 | ||||
-rw-r--r-- | debian7/Dockerfile | 8 | ||||
-rw-r--r-- | debian8-onbuild/Dockerfile | 8 | ||||
-rw-r--r-- | debian8/Dockerfile | 8 |
5 files changed, 20 insertions, 20 deletions
@@ -33,7 +33,7 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa | |||
33 | - `williamyeh/ansible:centos6` | 33 | - `williamyeh/ansible:centos6` |
34 | - `williamyeh/ansible:alpine3` | 34 | - `williamyeh/ansible:alpine3` |
35 | 35 | ||
36 | - Onbuild series: | 36 | - Onbuild series (*recommended for common cases*): |
37 | 37 | ||
38 | - `williamyeh/ansible:debian8-onbuild` | 38 | - `williamyeh/ansible:debian8-onbuild` |
39 | - `williamyeh/ansible:debian7-onbuild` | 39 | - `williamyeh/ansible:debian7-onbuild` |
@@ -64,7 +64,7 @@ FROM williamyeh/ansible:ubuntu14.04-onbuild | |||
64 | # ==> Specify inventory filename; default = "/etc/ansible/hosts" | 64 | # ==> Specify inventory filename; default = "/etc/ansible/hosts" |
65 | #ENV INVENTORY inventory.ini | 65 | #ENV INVENTORY inventory.ini |
66 | 66 | ||
67 | # ==> Executing Ansible... | 67 | # ==> Executing Ansible (with a simple wrapper)... |
68 | RUN ansible-playbook-wrapper | 68 | RUN ansible-playbook-wrapper |
69 | ``` | 69 | ``` |
70 | 70 | ||
@@ -169,7 +169,7 @@ RUN ansible-playbook -i inventory playbook.yml \ | |||
169 | --connection=local --sudo | 169 | --connection=local --sudo |
170 | ``` | 170 | ``` |
171 | 171 | ||
172 | Or, more simple with `onbuild` series: | 172 | You may also work with `onbuild` series, which take care of many routine steps for you: |
173 | 173 | ||
174 | ```dockerfile | 174 | ```dockerfile |
175 | # Dockerfile | 175 | # Dockerfile |
@@ -193,7 +193,7 @@ FROM williamyeh/ansible:ubuntu14.04-onbuild | |||
193 | # ==> Specify inventory filename; default = "/etc/ansible/hosts" | 193 | # ==> Specify inventory filename; default = "/etc/ansible/hosts" |
194 | #ENV INVENTORY inventory.ini | 194 | #ENV INVENTORY inventory.ini |
195 | 195 | ||
196 | # ==> Executing Ansible... | 196 | # ==> Executing Ansible (with a simple wrapper)... |
197 | RUN ansible-playbook-wrapper | 197 | RUN ansible-playbook-wrapper |
198 | ``` | 198 | ``` |
199 | 199 | ||
diff --git a/debian7-onbuild/Dockerfile b/debian7-onbuild/Dockerfile index 44ed637..662289f 100644 --- a/debian7-onbuild/Dockerfile +++ b/debian7-onbuild/Dockerfile | |||
@@ -24,10 +24,10 @@ RUN echo "===> Installing python, sudo, and supporting tools..." && \ | |||
24 | pip install ansible && \ | 24 | pip install ansible && \ |
25 | \ | 25 | \ |
26 | \ | 26 | \ |
27 | echo "===> Removing unused APT resources..." && \ | 27 | echo "===> Removing unused APT resources..." && \ |
28 | apt-get -f -y --auto-remove remove curl gcc python-pip python-dev && \ | 28 | apt-get -f -y --auto-remove remove gcc python-pip python-dev && \ |
29 | apt-get clean && \ | 29 | apt-get clean && \ |
30 | rm -rf /var/lib/apt/lists/* /tmp/* && \ | 30 | rm -rf /var/lib/apt/lists/* /tmp/* && \ |
31 | \ | 31 | \ |
32 | \ | 32 | \ |
33 | echo "===> Adding hosts for convenience..." && \ | 33 | echo "===> Adding hosts for convenience..." && \ |
diff --git a/debian7/Dockerfile b/debian7/Dockerfile index afa69df..8fb30c8 100644 --- a/debian7/Dockerfile +++ b/debian7/Dockerfile | |||
@@ -24,10 +24,10 @@ RUN echo "===> Installing python, sudo, and supporting tools..." && \ | |||
24 | pip install ansible && \ | 24 | pip install ansible && \ |
25 | \ | 25 | \ |
26 | \ | 26 | \ |
27 | echo "===> Removing unused APT resources..." && \ | 27 | echo "===> Removing unused APT resources..." && \ |
28 | apt-get -f -y --auto-remove remove curl gcc python-pip python-dev && \ | 28 | apt-get -f -y --auto-remove remove gcc python-pip python-dev && \ |
29 | apt-get clean && \ | 29 | apt-get clean && \ |
30 | rm -rf /var/lib/apt/lists/* /tmp/* && \ | 30 | rm -rf /var/lib/apt/lists/* /tmp/* && \ |
31 | \ | 31 | \ |
32 | \ | 32 | \ |
33 | echo "===> Adding hosts for convenience..." && \ | 33 | echo "===> Adding hosts for convenience..." && \ |
diff --git a/debian8-onbuild/Dockerfile b/debian8-onbuild/Dockerfile index 65794be..573e498 100644 --- a/debian8-onbuild/Dockerfile +++ b/debian8-onbuild/Dockerfile | |||
@@ -24,10 +24,10 @@ RUN echo "===> Installing python, sudo, and supporting tools..." && \ | |||
24 | pip install ansible && \ | 24 | pip install ansible && \ |
25 | \ | 25 | \ |
26 | \ | 26 | \ |
27 | echo "===> Removing unused APT resources..." && \ | 27 | echo "===> Removing unused APT resources..." && \ |
28 | apt-get -f -y --auto-remove remove curl gcc python-pip python-dev && \ | 28 | apt-get -f -y --auto-remove remove gcc python-pip python-dev && \ |
29 | apt-get clean && \ | 29 | apt-get clean && \ |
30 | rm -rf /var/lib/apt/lists/* /tmp/* && \ | 30 | rm -rf /var/lib/apt/lists/* /tmp/* && \ |
31 | \ | 31 | \ |
32 | \ | 32 | \ |
33 | echo "===> Adding hosts for convenience..." && \ | 33 | echo "===> Adding hosts for convenience..." && \ |
diff --git a/debian8/Dockerfile b/debian8/Dockerfile index c49558a..7e0a8aa 100644 --- a/debian8/Dockerfile +++ b/debian8/Dockerfile | |||
@@ -24,10 +24,10 @@ RUN echo "===> Installing python, sudo, and supporting tools..." && \ | |||
24 | pip install ansible && \ | 24 | pip install ansible && \ |
25 | \ | 25 | \ |
26 | \ | 26 | \ |
27 | echo "===> Removing unused APT resources..." && \ | 27 | echo "===> Removing unused APT resources..." && \ |
28 | apt-get -f -y --auto-remove remove curl gcc python-pip python-dev && \ | 28 | apt-get -f -y --auto-remove remove gcc python-pip python-dev && \ |
29 | apt-get clean && \ | 29 | apt-get clean && \ |
30 | rm -rf /var/lib/apt/lists/* /tmp/* && \ | 30 | rm -rf /var/lib/apt/lists/* /tmp/* && \ |
31 | \ | 31 | \ |
32 | \ | 32 | \ |
33 | echo "===> Adding hosts for convenience..." && \ | 33 | echo "===> Adding hosts for convenience..." && \ |