summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Dockerfile (renamed from ansible-container/Dockerfile)8
-rw-r--r--README_ANSIBLE_CONTAINER.md2
2 files changed, 6 insertions, 4 deletions
diff --git a/ansible-container/Dockerfile b/Dockerfile
index 477ea6712..ab16ca609 100644
--- a/ansible-container/Dockerfile
+++ b/Dockerfile
@@ -6,10 +6,12 @@ RUN yum -y install http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.no
# Not sure if all of these packages are necessary
# only git and ansible are known requirements
-RUN yum install -y --enablerepo rhel-7-server-extras-rpms net-tools bind-utils tmux git ansible
+RUN yum install -y --enablerepo rhel-7-server-extras-rpms net-tools bind-utils git ansible
-RUN git clone https://github.com/openshift/openshift-ansible.git /opt/openshift-ansible
+ADD ./ /opt/openshift-ansible/
-ENTRYPOINT ["/usr/bin/ansible-playbook", "/opt/openshift-ansible/playbooks/byo/config.yml"]
+ENTRYPOINT ["/usr/bin/ansible-playbook"]
+
+CMD ["/opt/openshift-ansible/playbooks/byo/config.yml"]
LABEL RUN docker run -it --rm --privileged --net=host -v ~/.ssh:/root/.ssh -v /etc/ansible:/etc/ansible --name NAME -e NAME=NAME -e IMAGE=IMAGE IMAGE
diff --git a/README_ANSIBLE_CONTAINER.md b/README_ANSIBLE_CONTAINER.md
index 0541aef26..30c5f8503 100644
--- a/README_ANSIBLE_CONTAINER.md
+++ b/README_ANSIBLE_CONTAINER.md
@@ -3,7 +3,7 @@
```sh
git clone https://github.com/openshift/openshift-ansible.git
- cd openshift-ansible/ansible-container
+ cd openshift-ansible
docker build --rm -t ansible .
```
* Create /etc/ansible directory on the host machine and copy inventory file (hosts) into it.