diff options
| author | Sam Yaple <sam@yaple.net> | 2015-11-13 08:53:49 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-11-13 08:53:49 +0000 |
| commit | 6ec1fabf6528bd058a30a78716668f7b75f56068 (patch) | |
| tree | 4a931089155c620e50e4f94e9457321e510789a1 /docker | |
| parent | 52bd56e6868fddfcce2e402e828e4b998bbd60ad (diff) | |
| download | kolla-6ec1fabf6528bd058a30a78716668f7b75f56068.tar.gz kolla-6ec1fabf6528bd058a30a78716668f7b75f56068.zip | |
Revert "Drop root for Horizon service"
This reverts commit f9ccb1c8829cef551b875c7c387530e7980414a7.
There are many issues with this patch that prevents it from working
under numerous circumstances. The implementation is entirely busted
on Ubuntu. Additionally, best practice for apache is to run as root.
Apache itself does the privlege dropping.
Change-Id: I4395debb7d32223fb3752a6d3e7c4d7672d29916
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 |