diff options
| author | Thomas Wiest <twiest@redhat.com> | 2014-11-12 17:06:25 -0500 |
|---|---|---|
| committer | Thomas Wiest <twiest@redhat.com> | 2014-11-12 17:06:25 -0500 |
| commit | 8e13d1167027123178270b532a7f070c68f97b80 (patch) | |
| tree | 8ae96da6488af468a7d2b6a708414fb389c4e45d | |
| parent | 543d5bcd4207268bd8d529cea6628614ea20da67 (diff) | |
| download | openshift-8e13d1167027123178270b532a7f070c68f97b80.tar.gz openshift-8e13d1167027123178270b532a7f070c68f97b80.tar.bz2 openshift-8e13d1167027123178270b532a7f070c68f97b80.tar.xz openshift-8e13d1167027123178270b532a7f070c68f97b80.zip | |
made ops-ctl-haproxy work inside of the proxy container.
| -rw-r--r-- | roles/docker_img_proxy/files/proxy_container/Dockerfile | 5 | ||||
| -rwxr-xr-x | roles/docker_img_proxy/files/proxy_container/start.sh | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/roles/docker_img_proxy/files/proxy_container/Dockerfile b/roles/docker_img_proxy/files/proxy_container/Dockerfile index 3887337ab..7b5378bb9 100644 --- a/roles/docker_img_proxy/files/proxy_container/Dockerfile +++ b/roles/docker_img_proxy/files/proxy_container/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER Thomas Wiest <twiest@redhat.com> RUN yum -y update ; yum clean all # Container Specific RPMs -RUN yum -y install rhc-server-common httpd mod_security mod_ssl haproxy15 supervisor ruby ; yum clean all +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 @@ -17,6 +17,9 @@ RUN yum -y install https://kojipkgs.fedoraproject.org//work/tasks/8506/7818506/s # 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 diff --git a/roles/docker_img_proxy/files/proxy_container/start.sh b/roles/docker_img_proxy/files/proxy_container/start.sh index 93e398b3a..560e1c6be 100755 --- a/roles/docker_img_proxy/files/proxy_container/start.sh +++ b/roles/docker_img_proxy/files/proxy_container/start.sh @@ -1,7 +1,7 @@ #!/bin/bash echo _ -for shared_dir in /etc/haproxy /etc/pki /etc/httpd /var/lib/haproxy +for shared_dir in /etc/haproxy /etc/pki /etc/httpd /var/lib/haproxy /usr/local/bin /usr/local/lib do echo "Setting up /shared${shared_dir}..." rm -rf $shared_dir @@ -27,5 +27,9 @@ echo "Fixing symlink /etc/httpd/run..." ln -sf /var/run/httpd /shared/etc/httpd/run echo _ +echo "Starting rsyslog service..." +service rsyslog start +echo _ + echo "Starting supervisord" exec /usr/bin/supervisord |