libretic/ansible-role-apache
6
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-apache synced 2025-01-03 00:30:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix a couple missed merge conflicts.

Browse source
This commit is contained in:
Jeff Geerling 2015-12-14 09:17:30 -06:00
parent a8e0f1c72a
commit 2387c79d75
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/Dockerfile.ubuntu-12.04
View file

@ -1,15 +1,10 @@
FROM ubuntu:12.04 FROM ubuntu:12.04
<<<<<<< HEAD:tests/Dockerfile.ubuntu-12
# Install Ansible # Install Ansible
RUN apt-get install -y software-properties-common python-software-properties git 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-add-repository -y ppa:ansible/ansible
RUN apt-get update RUN apt-get update
RUN apt-get install -y ansible RUN apt-get install -y ansible
# Install Ansible inventory file # Install Ansible inventory file
RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts

3
tests/Dockerfile.ubuntu-14.04
View file

@ -1,9 +1,10 @@
FROM ubuntu:14.04 FROM ubuntu:14.04
# Install Ansible # Install Ansible
RUN apt-get install -y software-properties-common git RUN apt-get install -y software-properties-common git
RUN apt-add-repository -y ppa:ansible/ansible RUN apt-add-repository -y ppa:ansible/ansible
RUN apt-get update RUN apt-get update
RUN apt-get install -y ansible RUN apt-get install -y ansible
# Install Ansible inventory file # Install Ansible inventory file
RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts