summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvesh Agarwal <avagarwa@redhat.com>2015-08-12 17:30:52 -0400
committerAvesh Agarwal <avagarwa@redhat.com>2015-08-14 15:29:24 -0400
commit4fc01f5d73547da931f8ab822a3709e94280d7b1 (patch)
treec144d120d3375fd9284a39c55575b1085f406fdc
parent4fbdbe08f2560073a8b30801325d63f8de3cb9d6 (diff)
downloadopenshift-4fc01f5d73547da931f8ab822a3709e94280d7b1.tar.gz
openshift-4fc01f5d73547da931f8ab822a3709e94280d7b1.tar.bz2
openshift-4fc01f5d73547da931f8ab822a3709e94280d7b1.tar.xz
openshift-4fc01f5d73547da931f8ab822a3709e94280d7b1.zip
Changes to Dockerfile to make it work with openshift-ansible and
also added privileged flag to allow sharing host network and host dirs.
-rw-r--r--Dockerfile13
1 files changed, 3 insertions, 10 deletions
diff --git a/Dockerfile b/Dockerfile
index 7fac1f0c2..7fca42b9b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,15 +8,8 @@ RUN yum -y install http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.no
# only git and ansible are known requirements
RUN yum install -y --enablerepo rhel-7-server-extras-rpms net-tools bind-utils tmux git ansible
-# Not sure if this repo is required
-RUN curl -o /etc/yum.repos.d/atomic-enterprise.repo http://mirror.ops.rhcloud.com/atomic/mirror/.atomic-enterprise-early-1/atomic-enterprise.repo
+RUN git clone https://github.com/openshift/openshift-ansible.git /opt/openshift-ansible
-RUN git clone https://github.com/projectatomic/atomic-enterprise-training.git \
- /opt/training && \
- git clone https://github.com/projectatomic/atomic-enterprise-ansible.git \
- /opt/atomic-enterprise-ansible
-
-CMD ansible-playbook /opt/atomic-enterprise-ansible/playbooks/byo/config.yml
-
-LABEL RUN docker run -it --rm --net=host -v ~/.ssh/id_rsa:/root/.ssh/id_rsa -v /etc/ansible/hosts:/etc/ansible/hosts --name NAME -e NAME=NAME -e IMAGE=IMAGE IMAGE
+CMD 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/hosts:/etc/ansible/hosts --name NAME -e NAME=NAME -e IMAGE=IMAGE IMAGE