From e552ec9f583f243b43d270e6fa3213419fbfab98 Mon Sep 17 00:00:00 2001 From: William Yeh Date: Fri, 3 Jun 2016 10:36:33 +0800 Subject: [PATCH 1/2] Update: more detailed explanation about the differences among variants. --- README.md | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index d982543..83c1ea3 100644 --- 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 From 43ad0e3259c7826baa846718d13ff87d2f089783 Mon Sep 17 00:00:00 2001 From: William Yeh Date: Tue, 7 Jun 2016 10:56:35 +0800 Subject: [PATCH 2/2] Update: Alpine 3.3 to 3.4 --- 1.9-alpine3-onbuild/Dockerfile | 2 +- 1.9-alpine3/Dockerfile | 2 +- alpine3-onbuild/Dockerfile | 2 +- alpine3/Dockerfile | 2 +- mini-alpine3/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/1.9-alpine3-onbuild/Dockerfile b/1.9-alpine3-onbuild/Dockerfile index aefffe7..18c075d 100644 --- 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 diff --git a/1.9-alpine3/Dockerfile b/1.9-alpine3/Dockerfile index bf6d3ae..a6367b7 100644 --- 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 diff --git a/alpine3-onbuild/Dockerfile b/alpine3-onbuild/Dockerfile index a11dc9e..c498189 100644 --- 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 diff --git a/alpine3/Dockerfile b/alpine3/Dockerfile index 87b22c7..517484b 100644 --- a/alpine3/Dockerfile +++ b/alpine3/Dockerfile @@ -7,7 +7,7 @@ # pull base image -FROM alpine:3.3 +FROM alpine:3.4 MAINTAINER William Yeh diff --git a/mini-alpine3/Dockerfile b/mini-alpine3/Dockerfile index 2287deb..76f0a19 100644 --- 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