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_puppet/files/puppet_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_puppet/files/puppet_container/Dockerfile')
-rw-r--r-- | roles/docker_img_puppet/files/puppet_container/Dockerfile | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/roles/docker_img_puppet/files/puppet_container/Dockerfile b/roles/docker_img_puppet/files/puppet_container/Dockerfile deleted file mode 100644 index e16536c03..000000000 --- a/roles/docker_img_puppet/files/puppet_container/Dockerfile +++ /dev/null @@ -1,38 +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 puppet3 crontabs cronie-anacron cronie system-config-firewall-base httpd mod_ssl ruby193-rubygem-zbxapi mod_security rhc-site-static; yum clean all - -# BEGIN: These are to fake out puppet - -RUN rm /usr/sbin/lokkit ; ln -s /bin/true /usr/sbin/lokkit - -# this is needed so that we can run puppet without running the start script -RUN mkdir -p /etc/haproxy - -# Setup libra_ops group for compatibility with host puppet -RUN groupadd libra_ops - -# END: These are to fake out puppet - -# Container specific files -ADD start.rb /usr/local/sbin/start.rb -ADD service.rb /sbin/service - -# Ensure the scripts are executable -RUN chmod 755 /sbin/service /usr/local/sbin/start.rb - -RUN yum -y install strace ; yum clean all - -# Get rid of puppet deprecation warnings -RUN sed -i 's/^.*manifest =.*$//' /etc/puppet/puppet.conf ; \ - sed -i 's/^.*manifestdir =.*$//' /etc/puppet/puppet.conf ; \ - sed -i 's/^.*modulepath =.*$//' /etc/puppet/puppet.conf - -CMD ["/usr/local/sbin/start.rb"] |