aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorWilliam Yeh <william.pjyeh@gmail.com>2016-06-03 10:36:33 +0800
committerWilliam Yeh <william.pjyeh@gmail.com>2016-06-07 13:56:00 +0800
commit13375974dcc6bdcc1c1d9c841bdbaf73a9dfc73d (patch)
tree024ac6724a14a29a6749e088724bdead3b1f4a56
parent042ddec8383b0755e60bb01dc93ae3378374b637 (diff)
downloaddocker-ansible-13375974dcc6bdcc1c1d9c841bdbaf73a9dfc73d.tar.gz
docker-ansible-13375974dcc6bdcc1c1d9c841bdbaf73a9dfc73d.tar.zst
docker-ansible-13375974dcc6bdcc1c1d9c841bdbaf73a9dfc73d.zip
Update: more detailed explanation about the differences among variants.
-rw-r--r--1.9-alpine3-onbuild/Dockerfile2
-rw-r--r--1.9-alpine3/Dockerfile2
-rw-r--r--README.md28
-rw-r--r--alpine3-onbuild/Dockerfile2
-rw-r--r--alpine3/Dockerfile2
-rw-r--r--mini-alpine3/Dockerfile2
6 files changed, 20 insertions, 18 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 @@
7 7
8 8
9# pull base image 9# pull base image
10FROM alpine:3.3 10FROM alpine:3.4
11 11
12MAINTAINER William Yeh <william.pjyeh@gmail.com> 12MAINTAINER William Yeh <william.pjyeh@gmail.com>
13 13
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 @@
7 7
8 8
9# pull base image 9# pull base image
10FROM alpine:3.3 10FROM alpine:3.4
11 11
12MAINTAINER William Yeh <william.pjyeh@gmail.com> 12MAINTAINER William Yeh <william.pjyeh@gmail.com>
13 13
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
18 18
19- OS: Debian (jessie, wheezy), Ubuntu (xenial, trusty, precise), CentOS (7, 6), Alpine (3). 19- OS: Debian (jessie, wheezy), Ubuntu (xenial, trusty, precise), CentOS (7, 6), Alpine (3).
20 20
21- Ansible: four series - 21- Ansible: four variants -
22 22
23 1. the most recent *stable* version; 23 1. provides the most recent *stable* version of Ansible; suitable for most people.
24 2. old 1.9 version; 24 2. this variant is designed for building *minimal* images out of playbooks; i.e., the Ansible body will be removed when mission completed.
25 3. the *experimental* version; 25 3. provides the old 1.9 version of Ansible.
26 4. for building *minimal* images from playbooks; i.e., the Ansible body will be removed when mission completed. 26 4. provides the *experimental* version of Ansible.
27 27
28 28
29## Images and tags 29## Images and tags
@@ -52,6 +52,15 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
52 - `williamyeh/ansible:centos6-onbuild` 52 - `williamyeh/ansible:centos6-onbuild`
53 - `williamyeh/ansible:alpine3-onbuild` 53 - `williamyeh/ansible:alpine3-onbuild`
54 54
55
56### Minimal configuration (the Ansible body will be removed when mission completed):
57
58- Onbuild series:
59
60 - `williamyeh/ansible:mini-alpine3`
61 - `williamyeh/ansible:mini-debian8`
62
63
55### Old 1.9 version: 64### Old 1.9 version:
56 65
57- Normal series: 66- Normal series:
@@ -74,6 +83,7 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
74 - `williamyeh/ansible:1.9-centos6-onbuild` 83 - `williamyeh/ansible:1.9-centos6-onbuild`
75 - `williamyeh/ansible:1.9-alpine3-onbuild` 84 - `williamyeh/ansible:1.9-alpine3-onbuild`
76 85
86
77### Experimental version (building directly from the git `master` source tree; use at your own risk!): 87### Experimental version (building directly from the git `master` source tree; use at your own risk!):
78 88
79- Normal series: 89- Normal series:
@@ -97,14 +107,6 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
97 - `williamyeh/ansible:master-centos6-onbuild` 107 - `williamyeh/ansible:master-centos6-onbuild`
98 108
99 109
100### Minimal series (the Ansible body will be removed when mission completed):
101
102- Onbuild series:
103
104 - `williamyeh/ansible:mini-alpine3`
105 - `williamyeh/ansible:mini-debian8`
106
107
108 110
109## For the impatient 111## For the impatient
110 112
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 @@
7 7
8 8
9# pull base image 9# pull base image
10FROM alpine:3.3 10FROM alpine:3.4
11 11
12MAINTAINER William Yeh <william.pjyeh@gmail.com> 12MAINTAINER William Yeh <william.pjyeh@gmail.com>
13 13
diff --git a/alpine3/Dockerfile b/alpine3/Dockerfile
index 87b22c7..517484b 100644
--- a/alpine3/Dockerfile
+++ b/alpine3/Dockerfile
@@ -7,7 +7,7 @@
7 7
8 8
9# pull base image 9# pull base image
10FROM alpine:3.3 10FROM alpine:3.4
11 11
12MAINTAINER William Yeh <william.pjyeh@gmail.com> 12MAINTAINER William Yeh <william.pjyeh@gmail.com>
13 13
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 @@
7 7
8 8
9# pull base image 9# pull base image
10FROM alpine:3.3 10FROM alpine:3.4
11 11
12MAINTAINER William Yeh <william.pjyeh@gmail.com> 12MAINTAINER William Yeh <william.pjyeh@gmail.com>
13 13