diff options
-rw-r--r-- | ubuntu16.04-onbuild/Dockerfile | 10 | ||||
-rw-r--r-- | 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 | |||
12 | MAINTAINER William Yeh <william.pjyeh@gmail.com> | 12 | MAINTAINER William Yeh <william.pjyeh@gmail.com> |
13 | 13 | ||
14 | 14 | ||
15 | RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ | 15 | RUN echo "===> Adding Ansible's PPA..." && \ |
16 | echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" | tee /etc/apt/sources.list.d/ansible.list && \ | ||
17 | echo "deb-src http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" | tee -a /etc/apt/sources.list.d/ansible.list && \ | ||
18 | apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 7BB9C367 && \ | ||
19 | DEBIAN_FRONTEND=noninteractive apt-get update && \ | ||
16 | \ | 20 | \ |
17 | \ | 21 | \ |
18 | echo "===> Installing Ansible..." && \ | 22 | echo "===> Installing Ansible..." && \ |
19 | apt-get install -y ansible && \ | 23 | apt-get install -y ansible && \ |
20 | \ | 24 | \ |
21 | \ | 25 | \ |
22 | echo "===> Clean up..." && \ | 26 | echo "===> Removing Ansible PPA..." && \ |
23 | rm -rf /var/lib/apt/lists/* && \ | 27 | rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/ansible.list && \ |
24 | \ | 28 | \ |
25 | \ | 29 | \ |
26 | echo "===> Adding hosts for convenience..." && \ | 30 | 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 | |||
11 | 11 | ||
12 | MAINTAINER William Yeh <william.pjyeh@gmail.com> | 12 | MAINTAINER William Yeh <william.pjyeh@gmail.com> |
13 | 13 | ||
14 | RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ | 14 | |
15 | RUN echo "===> Adding Ansible's PPA..." && \ | ||
16 | echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" | tee /etc/apt/sources.list.d/ansible.list && \ | ||
17 | echo "deb-src http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" | tee -a /etc/apt/sources.list.d/ansible.list && \ | ||
18 | apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 7BB9C367 && \ | ||
19 | DEBIAN_FRONTEND=noninteractive apt-get update && \ | ||
15 | \ | 20 | \ |
16 | \ | 21 | \ |
17 | echo "===> Installing Ansible..." && \ | 22 | echo "===> Installing Ansible..." && \ |
18 | apt-get install -y ansible && \ | 23 | apt-get install -y ansible && \ |
19 | \ | 24 | \ |
20 | \ | 25 | \ |
21 | echo "===> Clean up..." && \ | 26 | echo "===> Removing Ansible PPA..." && \ |
22 | rm -rf /var/lib/apt/lists/* && \ | 27 | rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/ansible.list && \ |
23 | \ | 28 | \ |
24 | \ | 29 | \ |
25 | echo "===> Adding hosts for convenience..." && \ | 30 | echo "===> Adding hosts for convenience..." && \ |