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_monitoring/files/monitoring_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_monitoring/files/monitoring_container/Dockerfile')
-rw-r--r-- | roles/docker_img_monitoring/files/monitoring_container/Dockerfile | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/roles/docker_img_monitoring/files/monitoring_container/Dockerfile b/roles/docker_img_monitoring/files/monitoring_container/Dockerfile deleted file mode 100644 index 14e7f8650..000000000 --- a/roles/docker_img_monitoring/files/monitoring_container/Dockerfile +++ /dev/null @@ -1,22 +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 ruby193-rubygem-zbxapi cronie zabbix-sender ruby openshift-origin-util-scl ruby193-facter socat ; yum clean all - -# Setup ctr-ipc dir -RUN ln -s /shared/var/run/ctr-ipc /var/run/ctr-ipc - -# Container specific files -ADD start.rb /start.rb -ADD register-with-zabbix.rb /register-with-zabbix.rb - -# TEMP WORKAROUND: until cron-send-haproxy-status.rb doesn't check service to see if haproxy is running -RUN ln -sf /bin/true /etc/init.d/haproxy - -CMD ["/start.rb"] |