Merge pull request #12 from William-Yeh/systemd

[github/fretlink/docker-ansible.git] / README.md

diff --git a/README.md b/README.md
index 98db6eaf84eeb159e9371e8b39139d6fce452c14..89a7c2494e39a80d05ecb6312cb49f4f44afb8aa 100644 (file)
--- a/README.md
+++ b/README.md
@@ -16,13 +16,19 @@ This repository contains Dockerized [Ansible](https://github.com/ansible/ansible
 
 These are Docker images for [Ansible](https://github.com/ansible/ansible) software, installed in a selected Linux distributions.
 
-- OS: Debian (jessie, wheezy), Ubuntu (trusty, precise), CentOS (7, 6)
+- OS: Debian (jessie, wheezy), Ubuntu (trusty, precise), CentOS (7, 6), Alpine (3).
 
-- Ansible: usually the latest version (I didn't pin any specific version).
+- Ansible: three version series -
+
+  1. the most recent *stable* version;
+  2. old 1.9 version;
+  3. the *experimental* version.
 
 
 ## Images and tags
 
+### Stable version (installed from official PyPI repo):
+
 - Normal series:
 
   - `williamyeh/ansible:debian8`
@@ -31,8 +37,9 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
   - `williamyeh/ansible:ubuntu12.04`
   - `williamyeh/ansible:centos7`
   - `williamyeh/ansible:centos6`
+  - `williamyeh/ansible:alpine3`
 
-- Onbuild series:
+- Onbuild series (*recommended for common cases*):
 
   - `williamyeh/ansible:debian8-onbuild`
   - `williamyeh/ansible:debian7-onbuild`
@@ -40,6 +47,50 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
   - `williamyeh/ansible:ubuntu12.04-onbuild`
   - `williamyeh/ansible:centos7-onbuild`
   - `williamyeh/ansible:centos6-onbuild`
+  - `williamyeh/ansible:alpine3-onbuild`
+
+### Old 1.9 version:
+
+- Normal series:
+
+  - `williamyeh/ansible:1.9-debian8`
+  - `williamyeh/ansible:1.9-debian7`
+  - `williamyeh/ansible:1.9-ubuntu14.04`
+  - `williamyeh/ansible:1.9-ubuntu12.04`
+  - `williamyeh/ansible:1.9-centos7`
+  - `williamyeh/ansible:1.9-centos6`
+  - `williamyeh/ansible:1.9-alpine3`
+
+- Onbuild series (*recommended for common cases*):
+
+  - `williamyeh/ansible:1.9-debian8-onbuild`
+  - `williamyeh/ansible:1.9-debian7-onbuild`
+  - `williamyeh/ansible:1.9-ubuntu14.04-onbuild`
+  - `williamyeh/ansible:1.9-ubuntu12.04-onbuild`
+  - `williamyeh/ansible:1.9-centos7-onbuild`
+  - `williamyeh/ansible:1.9-centos6-onbuild`
+  - `williamyeh/ansible:1.9-alpine3-onbuild`
+
+### Experimental version (building directly from the git `master` source tree; use at your own risk!):
+
+- Normal series:
+
+  - `williamyeh/ansible:master-debian8`
+  - `williamyeh/ansible:master-debian7`
+  - `williamyeh/ansible:master-ubuntu14.04`
+  - `williamyeh/ansible:master-ubuntu12.04`
+  - `williamyeh/ansible:master-centos7`
+  - `williamyeh/ansible:master-centos6`
+
+- Onbuild series (*recommended for common cases*):
+
+  - `williamyeh/ansible:master-debian8-onbuild`
+  - `williamyeh/ansible:master-debian7-onbuild`
+  - `williamyeh/ansible:master-ubuntu14.04-onbuild`
+  - `williamyeh/ansible:master-ubuntu12.04-onbuild`
+  - `williamyeh/ansible:master-centos7-onbuild`
+  - `williamyeh/ansible:master-centos6-onbuild`
+
 
 
 ## For the impatient
@@ -62,7 +113,7 @@ FROM williamyeh/ansible:ubuntu14.04-onbuild
 # ==> Specify inventory filename;     default = "/etc/ansible/hosts"
 #ENV INVENTORY     inventory.ini
 
-# ==> Executing Ansible...
+# ==> Executing Ansible (with a simple wrapper)...
 RUN ansible-playbook-wrapper
 ```
 
@@ -70,7 +121,7 @@ Third, `docker build .`
 
 Done!
 
-For 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.
+For more advanced usage, the role in Ansible Galaxy [`williamyeh/nginx`](https://galaxy.ansible.com/williamyeh/nginx/) 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.
 
 
 
@@ -97,6 +148,7 @@ REPOSITORY                    TAG                   VIRTUAL SIZE
 ansible/centos7-ansible       stable                367.5 MB
 ansible/ubuntu14.04-ansible   stable                286.6 MB
 
+williamyeh/ansible            alpine3-onbuild        66.4 MB
 williamyeh/ansible            centos6-onbuild       264.2 MB
 williamyeh/ansible            centos7-onbuild       275.3 MB
 williamyeh/ansible            debian7-onbuild       134.4 MB
@@ -119,10 +171,12 @@ Vagrant.configure(2) do |config|
 
     # ==> Choose a Vagrant box to emulate Linux distribution...
     config.vm.box = "ubuntu/trusty64"
-    #config.vm.box = "hashicorp/precise64"
-    #config.vm.box = "chef/debian-7.8"
-    #config.vm.box = "chef/centos-7.0"
-    #config.vm.box = "chef/centos-6.6"
+    #config.vm.box = "ubuntu/precise64"
+    #config.vm.box = "debian/jessie64"
+    #config.vm.box = "debian/wheezy64"
+    #config.vm.box = "bento/centos-7.2"
+    #config.vm.box = "bento/centos-6.7"
+    #config.vm.box = "maier/alpine-3.3.1-x86_64"
 
 
     # ==> Executing Ansible...
@@ -149,6 +203,7 @@ FROM williamyeh/ansible:ubuntu14.04
 #FROM williamyeh/ansible:debian7
 #FROM williamyeh/ansible:centos7
 #FROM williamyeh/ansible:centos6
+#FROM williamyeh/ansible:alpine3
 
 
 # ==> Copying Ansible playbook...
@@ -163,7 +218,7 @@ RUN ansible-playbook -i inventory playbook.yml \
       --connection=local --sudo
 ```
 
-Or, more simple with `onbuild` series:
+You may also work with `onbuild` series, which take care of many routine steps for you:
 
 ```dockerfile
 # Dockerfile
@@ -175,6 +230,7 @@ FROM williamyeh/ansible:ubuntu14.04-onbuild
 #FROM williamyeh/ansible:debian7-onbuild
 #FROM williamyeh/ansible:centos7-onbuild
 #FROM williamyeh/ansible:centos6-onbuild
+#FROM williamyeh/ansible:alpine3-onbuild
 
 
 # ==> Specify requirements filename;  default = "requirements.yml"
@@ -186,7 +242,7 @@ FROM williamyeh/ansible:ubuntu14.04-onbuild
 # ==> Specify inventory filename;     default = "/etc/ansible/hosts"
 #ENV INVENTORY     inventory.ini
 
-# ==> Executing Ansible...
+# ==> Executing Ansible (with a simple wrapper)...
 RUN ansible-playbook-wrapper
 ```