aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorWilliam Yeh <william.pjyeh@gmail.com>2015-09-17 12:06:06 +0800
committerWilliam Yeh <william.pjyeh@gmail.com>2015-09-17 12:06:06 +0800
commitaa3cb4d5e3a74a02a65b4b350251085e47d5eea4 (patch)
tree13e3715c44285e91f44c1181c8558fe8c9a22462
parent82a3ca56136c9f09be6ff62463a0538043a4c807 (diff)
downloaddocker-ansible-aa3cb4d5e3a74a02a65b4b350251085e47d5eea4.tar.gz
docker-ansible-aa3cb4d5e3a74a02a65b4b350251085e47d5eea4.tar.zst
docker-ansible-aa3cb4d5e3a74a02a65b4b350251085e47d5eea4.zip
Update: some wording.
-rw-r--r--README.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/README.md b/README.md
index 3670854..98db6ea 100644
--- a/README.md
+++ b/README.md
@@ -18,12 +18,12 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
18 18
19- OS: Debian (jessie, wheezy), Ubuntu (trusty, precise), CentOS (7, 6) 19- OS: Debian (jessie, wheezy), Ubuntu (trusty, precise), CentOS (7, 6)
20 20
21- Ansible: usually the latest version. 21- Ansible: usually the latest version (I didn't pin any specific version).
22 22
23 23
24## Images and tags 24## Images and tags
25 25
26- normal series: 26- Normal series:
27 27
28 - `williamyeh/ansible:debian8` 28 - `williamyeh/ansible:debian8`
29 - `williamyeh/ansible:debian7` 29 - `williamyeh/ansible:debian7`
@@ -32,7 +32,7 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
32 - `williamyeh/ansible:centos7` 32 - `williamyeh/ansible:centos7`
33 - `williamyeh/ansible:centos6` 33 - `williamyeh/ansible:centos6`
34 34
35- onbuild series: 35- Onbuild series:
36 36
37 - `williamyeh/ansible:debian8-onbuild` 37 - `williamyeh/ansible:debian8-onbuild`
38 - `williamyeh/ansible:debian7-onbuild` 38 - `williamyeh/ansible:debian7-onbuild`
@@ -70,7 +70,7 @@ Third, `docker build .`
70 70
71Done! 71Done!
72 72
73For more advanced usage, the role in Ansible Galaxy [`williamyeh/nginx`](https://galaxy.ansible.com/list#/roles/2245) also demonstrates how to do a simple integration test for a variety of Linux distributions on [CircleCI](https://circleci.com/)'s and [Travis CI](https://travis-ci.org/)’s Ubuntu 12.04 worker instances. 73For more advanced usage, the role in Ansible Galaxy [`williamyeh/nginx`](https://galaxy.ansible.com/list#/roles/2245) demonstrates how to perform a simple smoke test (*configuration needs test, too!*) on a variety of (*containerized*) Linux distributions via [CircleCI](https://circleci.com/)'s Ubuntu 12.04 and [Travis CI](https://travis-ci.org/)’s Ubuntu 14.04 worker instances.
74 74
75 75
76 76
@@ -108,7 +108,7 @@ williamyeh/ansible ubuntu14.04-onbuild 238.3 MB
108 108
109## Usage 109## Usage
110 110
111Used mostly as a *base image* for configuring, with Ansible, other software stack on some specified Linux distribution. 111Used mostly as a *base image* for configuring other software stack on some specified Linux distribution(s).
112 112
113Take Debian/Ubuntu/CentOS for example. To test an Ansible `playbook.yml` against a variety of Linux distributions, we may use [Vagrant](https://www.vagrantup.com/) as follows: 113Take Debian/Ubuntu/CentOS for example. To test an Ansible `playbook.yml` against a variety of Linux distributions, we may use [Vagrant](https://www.vagrantup.com/) as follows:
114 114