summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-06 15:45:57 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-06 15:45:57 -0400
commitf94ed0a965b4e2194a63598619099b43c6c73a32 (patch)
tree4a0efbe756413813d6c3542947c4896ca1a92813
parent188faeaf02e4081494571f21a2e224510b944e4d (diff)
parenta92a843ad2aaa45b307126d9330597123ee76053 (diff)
downloadopenshift-f94ed0a965b4e2194a63598619099b43c6c73a32.tar.gz
openshift-f94ed0a965b4e2194a63598619099b43c6c73a32.tar.bz2
openshift-f94ed0a965b4e2194a63598619099b43c6c73a32.tar.xz
openshift-f94ed0a965b4e2194a63598619099b43c6c73a32.zip
Merge pull request #1723 from dgoodwin/osbs-dockerfile
Replace unused Dockerfile with one used for official builds.
-rw-r--r--Dockerfile26
1 files changed, 16 insertions, 10 deletions
diff --git a/Dockerfile b/Dockerfile
index 02ab51680..70f6f8a18 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,23 @@
FROM rhel7
-MAINTAINER Aaron Weitekamp <aweiteka@redhat.com>
+MAINTAINER Troy Dawson <tdawson@redhat.com>
-RUN yum -y install http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+LABEL Name="openshift3/installer"
+LABEL Vendor="Red Hat" License=GPLv2+
+LABEL Version="v3.1.1.901"
+LABEL Release="6"
+LABEL BZComponent="aos3-installation-docker"
+LABEL Architecture="x86_64"
-# 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 pyOpenSSL
+RUN INSTALL_PKGS="atomic-openshift-utils" && \
+ yum install -y --enablerepo=rhel-7-server-ose-3.2-rpms $INSTALL_PKGS && \
+ rpm -V $INSTALL_PKGS && \
+ yum clean all
-ADD ./ /opt/openshift-ansible/
+# Expect user to mount a workdir for container output (installer.cfg, hosts inventory, ansible log)
+VOLUME /var/lib/openshift-installer/
+WORKDIR /var/lib/openshift-installer/
-ENTRYPOINT ["/usr/bin/ansible-playbook"]
+RUN mkdir -p /var/lib/openshift-installer/
-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
+ENTRYPOINT ["/usr/bin/atomic-openshift-installer", "-c", "/var/lib/openshift-installer/installer.cfg", "--ansible-log-path", "/var/lib/openshift-installer/ansible.log"]