From ffe10e8179d088334ea1aab4acfef21886989e98 Mon Sep 17 00:00:00 2001 From: William Yeh Date: Mon, 19 Oct 2015 12:02:03 +0800 Subject: Fix: keep "curl" for Debian 7/8 series. Credit: https://github.com/William-Yeh/docker-ansible/pull/5 --- README.md | 8 ++++---- debian7-onbuild/Dockerfile | 8 ++++---- debian7/Dockerfile | 8 ++++---- debian8-onbuild/Dockerfile | 8 ++++---- debian8/Dockerfile | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 26f03d4..ee39d18 100644 --- 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 44ed637..662289f 100644 --- 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 afa69df..8fb30c8 100644 --- 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 65794be..573e498 100644 --- 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 c49558a..7e0a8aa 100644 --- 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..." && \ -- cgit v1.2.3