Update: more detailed explanation about the differences among variants.

diff --git a/1.9-alpine3-onbuild/Dockerfile b/1.9-alpine3-onbuild/Dockerfile
index aefffe79c693290dbe0db8f9c0de1640e8c2697d..18c075d36ce1d37866118a73423d0f190b352529 100644 (file)
--- a/1.9-alpine3-onbuild/Dockerfile
+++ b/1.9-alpine3-onbuild/Dockerfile
@@ -7,7 +7,7 @@
 
 
 # pull base image
-FROM alpine:3.3
+FROM alpine:3.4
 
 MAINTAINER William Yeh <william.pjyeh@gmail.com>
 

diff --git a/1.9-alpine3/Dockerfile b/1.9-alpine3/Dockerfile
index bf6d3ae14981bf9df9f7bf5eef4aeab456d16b48..a6367b71ed6692f0456688df97b5adec03a7cd5c 100644 (file)
--- a/1.9-alpine3/Dockerfile
+++ b/1.9-alpine3/Dockerfile
@@ -7,7 +7,7 @@
 
 
 # pull base image
-FROM alpine:3.3
+FROM alpine:3.4
 
 MAINTAINER William Yeh <william.pjyeh@gmail.com>
 

diff --git a/README.md b/README.md
index d982543b0c3d8d15eac9a2dfaac411d9f4e47552..83c1ea301bbb3e170b0bd24c12de8ed9a8ae5256 100644 (file)
--- a/README.md
+++ b/README.md
@@ -18,12 +18,12 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
 
 - OS: Debian (jessie, wheezy), Ubuntu (xenial, trusty, precise), CentOS (7, 6), Alpine (3).
 
-- Ansible: four series -
+- Ansible: four variants -
 
-  1. the most recent *stable* version;
-  2. old 1.9 version;
-  3. the *experimental* version;
-  4. for building *minimal* images from playbooks; i.e., the Ansible body will be removed when mission completed.
+  1. provides the most recent *stable* version of Ansible; suitable for most people.
+  2. this variant is designed for building *minimal* images out of playbooks; i.e., the Ansible body will be removed when mission completed.
+  3. provides the old 1.9 version of Ansible.
+  4. provides the *experimental* version of Ansible.
 
 
 ## Images and tags
@@ -52,6 +52,15 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
   - `williamyeh/ansible:centos6-onbuild`
   - `williamyeh/ansible:alpine3-onbuild`
 
+
+### Minimal configuration (the Ansible body will be removed when mission completed):
+
+- Onbuild series:
+
+  - `williamyeh/ansible:mini-alpine3`
+  - `williamyeh/ansible:mini-debian8`
+
+
 ### Old 1.9 version:
 
 - Normal series:
@@ -74,6 +83,7 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
   - `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:
@@ -97,14 +107,6 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
   - `williamyeh/ansible:master-centos6-onbuild`
 
 
-### Minimal series (the Ansible body will be removed when mission completed):
-
-- Onbuild series:
-
-  - `williamyeh/ansible:mini-alpine3`
-  - `williamyeh/ansible:mini-debian8`
-
-
 
 ## For the impatient
 

diff --git a/alpine3-onbuild/Dockerfile b/alpine3-onbuild/Dockerfile
index a11dc9e8f755ca4620e519743f6293cf26232b8c..c4981896d4362e9aa7fbcb1bda987fbe731536cb 100644 (file)
--- a/alpine3-onbuild/Dockerfile
+++ b/alpine3-onbuild/Dockerfile
@@ -7,7 +7,7 @@
 
 
 # pull base image
-FROM alpine:3.3
+FROM alpine:3.4
 
 MAINTAINER William Yeh <william.pjyeh@gmail.com>
 

diff --git a/alpine3/Dockerfile b/alpine3/Dockerfile
index 87b22c7acb2e0f621aebae3e7d631a9b1cd277d5..517484be08d15de6f4dfdff2495f3c52ae07c651 100644 (file)
--- a/alpine3/Dockerfile
+++ b/alpine3/Dockerfile
@@ -7,7 +7,7 @@
 
 
 # pull base image
-FROM alpine:3.3
+FROM alpine:3.4
 
 MAINTAINER William Yeh <william.pjyeh@gmail.com>
 

diff --git a/mini-alpine3/Dockerfile b/mini-alpine3/Dockerfile
index 2287deb8ebe072e244c134fc14497233e0df9d10..76f0a19abeb2649d65675a794e8860684c74fa04 100644 (file)
--- a/mini-alpine3/Dockerfile
+++ b/mini-alpine3/Dockerfile
@@ -7,7 +7,7 @@
 
 
 # pull base image
-FROM alpine:3.3
+FROM alpine:3.4
 
 MAINTAINER William Yeh <william.pjyeh@gmail.com>