Fix: keep "curl" for Debian 7/8 series.

Credit: https://github.com/William-Yeh/docker-ansible/pull/5

diff --git a/README.md b/README.md
index 26f03d423f7bdfbb1f7fae6ee4cba5e3d481087e..ee39d18838f2dc1475aa0cea0187bce90b66f495 100644 (file)
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ These are Docker images for [Ansible](https://github.com/ansible/ansible) softwa
   - `williamyeh/ansible:centos6`
   - `williamyeh/ansible:alpine3`
 
-- Onbuild series:
+- Onbuild series (*recommended for common cases*):
 
   - `williamyeh/ansible:debian8-onbuild`
   - `williamyeh/ansible:debian7-onbuild`
@@ -64,7 +64,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
 ```
 
@@ -169,7 +169,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
@@ -193,7 +193,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
 ```
 

diff --git a/debian7-onbuild/Dockerfile b/debian7-onbuild/Dockerfile
index 44ed6372f7e5b1f59be6adf5440e6ef5bd46961e..662289f6ef8c624771f576762f7f66ab7ee186d5 100644 (file)
--- a/debian7-onbuild/Dockerfile
+++ b/debian7-onbuild/Dockerfile
@@ -24,10 +24,10 @@ RUN echo "===> Installing python, sudo, and supporting tools..."  && \
     pip install ansible                 && \
     \
     \
-    echo "===> Removing unused APT resources..."                       && \
-    apt-get -f -y --auto-remove remove curl gcc python-pip python-dev  && \
-    apt-get clean                                                      && \
-    rm -rf /var/lib/apt/lists/*  /tmp/*                                && \
+    echo "===> Removing unused APT resources..."                  && \
+    apt-get -f -y --auto-remove remove gcc python-pip python-dev  && \
+    apt-get clean                                                 && \
+    rm -rf /var/lib/apt/lists/*  /tmp/*                           && \
     \
     \
     echo "===> Adding hosts for convenience..."        && \

diff --git a/debian7/Dockerfile b/debian7/Dockerfile
index afa69df97c13dde68bcb4ebd2c58245d85c7dadb..8fb30c8039556862b0a418b4fb87568c62040b57 100644 (file)
--- a/debian7/Dockerfile
+++ b/debian7/Dockerfile
@@ -24,10 +24,10 @@ RUN echo "===> Installing python, sudo, and supporting tools..."  && \
     pip install ansible                 && \
     \
     \
-    echo "===> Removing unused APT resources..."                       && \
-    apt-get -f -y --auto-remove remove curl gcc python-pip python-dev  && \
-    apt-get clean                                                      && \
-    rm -rf /var/lib/apt/lists/*  /tmp/*                                && \
+    echo "===> Removing unused APT resources..."                  && \
+    apt-get -f -y --auto-remove remove gcc python-pip python-dev  && \
+    apt-get clean                                                 && \
+    rm -rf /var/lib/apt/lists/*  /tmp/*                           && \
     \
     \
     echo "===> Adding hosts for convenience..."        && \

diff --git a/debian8-onbuild/Dockerfile b/debian8-onbuild/Dockerfile
index 65794be5c4479fb820ca386683c5c0d81b124d42..573e4983dd824fb8e3751b534b5e82d994d31f5c 100644 (file)
--- a/debian8-onbuild/Dockerfile
+++ b/debian8-onbuild/Dockerfile
@@ -24,10 +24,10 @@ RUN echo "===> Installing python, sudo, and supporting tools..."  && \
     pip install ansible                 && \
     \
     \
-    echo "===> Removing unused APT resources..."                       && \
-    apt-get -f -y --auto-remove remove curl gcc python-pip python-dev  && \
-    apt-get clean                                                      && \
-    rm -rf /var/lib/apt/lists/*  /tmp/*                                && \
+    echo "===> Removing unused APT resources..."                  && \
+    apt-get -f -y --auto-remove remove gcc python-pip python-dev  && \
+    apt-get clean                                                 && \
+    rm -rf /var/lib/apt/lists/*  /tmp/*                           && \
     \
     \
     echo "===> Adding hosts for convenience..."        && \

diff --git a/debian8/Dockerfile b/debian8/Dockerfile
index c49558af3f016523a84965bb0377f51dbfbe4253..7e0a8aae2e097d271b311f5fc65eada2941a88b7 100644 (file)
--- a/debian8/Dockerfile
+++ b/debian8/Dockerfile
@@ -24,10 +24,10 @@ RUN echo "===> Installing python, sudo, and supporting tools..."  && \
     pip install ansible                 && \
     \
     \
-    echo "===> Removing unused APT resources..."                       && \
-    apt-get -f -y --auto-remove remove curl gcc python-pip python-dev  && \
-    apt-get clean                                                      && \
-    rm -rf /var/lib/apt/lists/*  /tmp/*                                && \
+    echo "===> Removing unused APT resources..."                  && \
+    apt-get -f -y --auto-remove remove gcc python-pip python-dev  && \
+    apt-get clean                                                 && \
+    rm -rf /var/lib/apt/lists/*  /tmp/*                           && \
     \
     \
     echo "===> Adding hosts for convenience..."        && \