From 85c12d98930ae17c782e4d30bae5b1c0dfaadd4f Mon Sep 17 00:00:00 2001 From: Avesh Agarwal Date: Fri, 14 Aug 2015 15:28:42 -0400 Subject: Updated Dockerfile not to clone openshift-ansible repo. Movied Dockerfile to openshift-ansible repo root and updated README_ANSIBLE_CONTAINER.md file. --- Dockerfile | 17 +++++++++++++++++ README_ANSIBLE_CONTAINER.md | 2 +- ansible-container/Dockerfile | 15 --------------- 3 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 Dockerfile delete mode 100644 ansible-container/Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..ab16ca609 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,17 @@ +FROM rhel7 + +MAINTAINER Aaron Weitekamp + +RUN yum -y install http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm + +# 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 git ansible + +ADD ./ /opt/openshift-ansible/ + +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. diff --git a/ansible-container/Dockerfile b/ansible-container/Dockerfile deleted file mode 100644 index 477ea6712..000000000 --- a/ansible-container/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM rhel7 - -MAINTAINER Aaron Weitekamp - -RUN yum -y install http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - -# 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 git clone https://github.com/openshift/openshift-ansible.git /opt/openshift-ansible - -ENTRYPOINT ["/usr/bin/ansible-playbook", "/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 -- cgit v1.2.3