diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-13 22:06:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-13 22:06:20 +0000 |
| commit | a27e1f895bf90a119a9acbd0a8b46b265c54a5dd (patch) | |
| tree | 0c11de2b0e5ce6a1b17a62ce4b301d70efc2c97a /docker | |
| parent | 70ba1b0afb6f7b0e4aaa4933c63a2323e673cabf (diff) | |
| parent | 6ec1fabf6528bd058a30a78716668f7b75f56068 (diff) | |
| download | kolla-a27e1f895bf90a119a9acbd0a8b46b265c54a5dd.tar.gz kolla-a27e1f895bf90a119a9acbd0a8b46b265c54a5dd.zip | |
Merge "Revert "Drop root for Horizon service""
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index d08da6914..30b227781 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -56,25 +56,7 @@ RUN ln -s horizon-source/* horizon \ {% endif %} -# Set NET_BIND_SERVICE capability to httpd/apache2 so that it may run on -# ports lower than 1024. -# Set pidfile and log directory to be writeable by # the horizon user. -{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN setcap 'cap_net_bind_service=ep' /usr/sbin/httpd \ - && chown horizon: /run/httpd /etc/httpd/logs - -{% elif base_distro in ['ubuntu'] %} - -RUN setcap 'cap_net_bind_service=ep' /usr/sbin/apache2 \ - && chown -R horizon: /var/run/apache2 /var/log/apache2 - -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start \ - && usermod -a -G kolla horizon +RUN chmod 755 /usr/local/bin/kolla_extend_start {{ include_footer }} - -USER horizon |