aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorWilliam Yeh <william.pjyeh@gmail.com>2016-08-29 11:32:52 +0800
committerWilliam Yeh <william.pjyeh@gmail.com>2016-08-29 11:32:52 +0800
commit7d885c87026bc44450b79f504b9a5becf0969783 (patch)
treed50301627d096bedc2786874f3ae4c5b11c68361
parent091f78b5ddee77b5c3e094f3847406c8559a659b (diff)
downloaddocker-ansible-7d885c87026bc44450b79f504b9a5becf0969783.tar.gz
docker-ansible-7d885c87026bc44450b79f504b9a5becf0969783.tar.zst
docker-ansible-7d885c87026bc44450b79f504b9a5becf0969783.zip
Add: rsync for some Alpine images to make it convenient for "synchronize" module.
-rw-r--r--1.9-alpine3/Dockerfile2
-rw-r--r--README.md13
-rw-r--r--alpine3/Dockerfile2
3 files changed, 9 insertions, 8 deletions
diff --git a/1.9-alpine3/Dockerfile b/1.9-alpine3/Dockerfile
index dd0f536..7c32844 100644
--- a/1.9-alpine3/Dockerfile
+++ b/1.9-alpine3/Dockerfile
@@ -28,7 +28,7 @@ RUN echo "===> Installing sudo to emulate normal OS behavior..." && \
28 \ 28 \
29 \ 29 \
30 echo "===> Installing handy tools (not absolutely required)..." && \ 30 echo "===> Installing handy tools (not absolutely required)..." && \
31 apk --update add sshpass openssh-client && \ 31 apk --update add sshpass openssh-client rsync && \
32 \ 32 \
33 \ 33 \
34 echo "===> Removing package list..." && \ 34 echo "===> Removing package list..." && \
diff --git a/README.md b/README.md
index de9a362..a160dfb 100644
--- a/README.md
+++ b/README.md
@@ -16,20 +16,19 @@ This repository contains Dockerized [Ansible](https://github.com/ansible/ansible
16 16
17These are Docker images for [Ansible](https://github.com/ansible/ansible) software, installed in a selected Linux distributions. 17These are Docker images for [Ansible](https://github.com/ansible/ansible) software, installed in a selected Linux distributions.
18 18
19- OS: Debian (jessie, wheezy), Ubuntu (xenial, trusty, precise), CentOS (7, 6), Alpine (3). 19Base OS: Debian (jessie, wheezy), Ubuntu (xenial, trusty, precise), CentOS (7, 6), Alpine (3).
20 20
21- Ansible: four versions - 21Ansible: four versions are provided -
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. 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. 24 2. same as stable version, but is designed for building (near-)*minimal* images out of playbooks; i.e., the Ansible body will be removed when mission completed. Refer to “[Build Docker images with Ansible: A half-blood approach](https://github.com/William-Yeh/build-docker-with-ansible)” for working examples and slides.
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; i.e., the master branch of git. 26 4. provides the *experimental* version of Ansible; i.e., the master branch of git.
27 27
28
29Each version is further divided into two variants: 28Each version is further divided into two variants:
30 29
31- Normal variant: intended to be used as Ansible *control machines*, or in cases that is unsuitable in the onbuild variants. 30- *Normal* variant: intended to be used as Ansible *control machines*, or in cases that is inadequate in the onbuild variants.
32- Onbuild variant: intended to be used to build Docker images. 31- *Onbuild* variant: intended to be used to build Docker images.
33 32
34 33
35## Images and tags 34## Images and tags
@@ -61,6 +60,8 @@ Each version is further divided into two variants:
61 60
62### Minimal configuration (the Ansible body will be removed when mission completed): 61### Minimal configuration (the Ansible body will be removed when mission completed):
63 62
63Refer to “[Build Docker images with Ansible: A half-blood approach](https://github.com/William-Yeh/build-docker-with-ansible)” for working examples and slides.
64
64- Onbuild variants: 65- Onbuild variants:
65 66
66 - `williamyeh/ansible:mini-alpine3` 67 - `williamyeh/ansible:mini-alpine3`
diff --git a/alpine3/Dockerfile b/alpine3/Dockerfile
index f15b44e..f99b7fc 100644
--- a/alpine3/Dockerfile
+++ b/alpine3/Dockerfile
@@ -28,7 +28,7 @@ RUN echo "===> Installing sudo to emulate normal OS behavior..." && \
28 \ 28 \
29 \ 29 \
30 echo "===> Installing handy tools (not absolutely required)..." && \ 30 echo "===> Installing handy tools (not absolutely required)..." && \
31 apk --update add sshpass openssh-client && \ 31 apk --update add sshpass openssh-client rsync && \
32 \ 32 \
33 \ 33 \
34 echo "===> Removing package list..." && \ 34 echo "===> Removing package list..." && \