From 2387c79d756506775f01def749dae6dad7029b35 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Mon, 14 Dec 2015 09:17:30 -0600 Subject: [PATCH] Fix a couple missed merge conflicts. --- tests/Dockerfile.ubuntu-12.04 | 7 +------ tests/Dockerfile.ubuntu-14.04 | 3 ++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/tests/Dockerfile.ubuntu-12.04 b/tests/Dockerfile.ubuntu-12.04 index acd0a84..40be740 100644 --- a/tests/Dockerfile.ubuntu-12.04 +++ b/tests/Dockerfile.ubuntu-12.04 @@ -1,15 +1,10 @@ FROM ubuntu:12.04 -<<<<<<< HEAD:tests/Dockerfile.ubuntu-12 # Install Ansible RUN apt-get install -y software-properties-common python-software-properties git -======= -# Install Ansible -RUN apt-get install -y python-software-properties software-properties-common git ->>>>>>> 3a993606b22d1162ecea3a8f595b3d17410a8450:tests/Dockerfile.ubuntu-12.04 RUN apt-add-repository -y ppa:ansible/ansible RUN apt-get update RUN apt-get install -y ansible + # Install Ansible inventory file RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts - diff --git a/tests/Dockerfile.ubuntu-14.04 b/tests/Dockerfile.ubuntu-14.04 index 3dd5383..1475a46 100644 --- a/tests/Dockerfile.ubuntu-14.04 +++ b/tests/Dockerfile.ubuntu-14.04 @@ -1,9 +1,10 @@ FROM ubuntu:14.04 + # Install Ansible RUN apt-get install -y software-properties-common git RUN apt-add-repository -y ppa:ansible/ansible RUN apt-get update RUN apt-get install -y ansible + # Install Ansible inventory file RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts -