mirror of
https://github.com/geerlingguy/ansible-role-apache
synced 2025-01-03 00:30:18 +01:00
Fix a couple missed merge conflicts.
This commit is contained in:
parent
a8e0f1c72a
commit
2387c79d75
2 changed files with 3 additions and 7 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue