From 84d31fd8edaec467b7a22c9fcf9b0f3097539e6a Mon Sep 17 00:00:00 2001 From: William Yeh Date: Thu, 26 May 2016 14:44:21 +0800 Subject: [PATCH] Update: Ansible PPA now supports the most recent version for Ubuntu 16.04 LTS (Xenial). --- ubuntu16.04-onbuild/Dockerfile | 10 +++++++--- ubuntu16.04/Dockerfile | 11 ++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ubuntu16.04-onbuild/Dockerfile b/ubuntu16.04-onbuild/Dockerfile index cc28d8c..6b53763 100644 --- a/ubuntu16.04-onbuild/Dockerfile +++ b/ubuntu16.04-onbuild/Dockerfile @@ -12,15 +12,19 @@ FROM ubuntu:16.04 MAINTAINER William Yeh -RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ +RUN echo "===> Adding Ansible's PPA..." && \ + echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" | tee /etc/apt/sources.list.d/ansible.list && \ + echo "deb-src http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" | tee -a /etc/apt/sources.list.d/ansible.list && \ + apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 7BB9C367 && \ + DEBIAN_FRONTEND=noninteractive apt-get update && \ \ \ echo "===> Installing Ansible..." && \ apt-get install -y ansible && \ \ \ - echo "===> Clean up..." && \ - rm -rf /var/lib/apt/lists/* && \ + echo "===> Removing Ansible PPA..." && \ + rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/ansible.list && \ \ \ echo "===> Adding hosts for convenience..." && \ diff --git a/ubuntu16.04/Dockerfile b/ubuntu16.04/Dockerfile index cd27d3a..762c2da 100644 --- a/ubuntu16.04/Dockerfile +++ b/ubuntu16.04/Dockerfile @@ -11,15 +11,20 @@ FROM ubuntu:16.04 MAINTAINER William Yeh -RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ + +RUN echo "===> Adding Ansible's PPA..." && \ + echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" | tee /etc/apt/sources.list.d/ansible.list && \ + echo "deb-src http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" | tee -a /etc/apt/sources.list.d/ansible.list && \ + apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 7BB9C367 && \ + DEBIAN_FRONTEND=noninteractive apt-get update && \ \ \ echo "===> Installing Ansible..." && \ apt-get install -y ansible && \ \ \ - echo "===> Clean up..." && \ - rm -rf /var/lib/apt/lists/* && \ + echo "===> Removing Ansible PPA..." && \ + rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/ansible.list && \ \ \ echo "===> Adding hosts for convenience..." && \ -- 2.41.0