diff options
author | Thomas Wiest <twiest@redhat.com> | 2014-12-15 16:00:47 -0500 |
---|---|---|
committer | Thomas Wiest <twiest@redhat.com> | 2014-12-15 16:00:47 -0500 |
commit | 023f92f9e3eec7de6c1286549000be79189a4fde (patch) | |
tree | 0bb33e5ee852ea533f1f808a8e86e38c97699bb4 /roles/docker_img_proxy/files/proxy_container/Dockerfile | |
parent | 2848232bdaed44fadb51548fe9d6c39fe89b8e11 (diff) | |
download | openshift-023f92f9e3eec7de6c1286549000be79189a4fde.tar.gz openshift-023f92f9e3eec7de6c1286549000be79189a4fde.tar.bz2 openshift-023f92f9e3eec7de6c1286549000be79189a4fde.tar.xz openshift-023f92f9e3eec7de6c1286549000be79189a4fde.zip |
changed atomic proxy to use pre-built container images
Diffstat (limited to 'roles/docker_img_proxy/files/proxy_container/Dockerfile')
-rw-r--r-- | roles/docker_img_proxy/files/proxy_container/Dockerfile | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/roles/docker_img_proxy/files/proxy_container/Dockerfile b/roles/docker_img_proxy/files/proxy_container/Dockerfile deleted file mode 100644 index 7b5378bb9..000000000 --- a/roles/docker_img_proxy/files/proxy_container/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -# This FROM gives us the proper oo-rhui certs, basic runtime env vars, basic repos, etc. -# Otherwise we can't install anything -FROM rhel6ops - -MAINTAINER Thomas Wiest <twiest@redhat.com> - -RUN yum -y update ; yum clean all - -# Container Specific RPMs -RUN yum -y install rsyslog rhc-server-common httpd mod_security mod_ssl haproxy15 supervisor ruby ruby193-ruby openshift-origin-util-scl ; yum clean all -# this needs to be on it's own line, otherwise the libra_user group isn't setup properly yet -RUN yum -y install rhc-site-static ; yum clean all - -# WORKKAROUND: for a bug in supervisor that causes it to use 100% cpu -RUN yum -y install https://kojipkgs.fedoraproject.org//work/tasks/8506/7818506/supervisor-2.1-9.el6.noarch.rpm ; yum clean all - -# Setup libra_user group with correct members -RUN usermod -a -G libra_user apache - -# Setup libra_ops group for compatibility with host puppet -RUN groupadd libra_ops - -# Setup ctr-ipc dir -RUN ln -s /shared/var/run/ctr-ipc /var/run/ctr-ipc - -# common -ADD supervisord.conf /etc/supervisord.conf -ADD start.sh /usr/local/sbin/start.sh -ADD ipc-watcher.rb /usr/local/sbin/ipc-watcher.rb - -EXPOSE 80 443 4999 - -CMD ["/usr/local/sbin/start.sh"] |