aboutsummaryrefslogtreecommitdiff
path: root/docker/horizon
diff options
context:
space:
mode:
Diffstat (limited to 'docker/horizon')
-rw-r--r--docker/horizon/extend_start.sh13
1 files changed, 5 insertions, 8 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index fe58e023f..299e9379c 100644
--- a/docker/horizon/extend_start.sh
+++ b/docker/horizon/extend_start.sh
@@ -1,15 +1,12 @@
#!/bin/bash
-if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \
- "${KOLLA_BASE_DISTRO}" == "debian" ]]; then
+# NOTE(pbourke): httpd will not clean up after itself in some cases which
+# results in the container not being able to restart. (bug #1489676, 1557036)
+if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
# Loading Apache2 ENV variables
source /etc/apache2/envvars
-fi
-
-# NOTE(pbourke): httpd will not clean up after itself in some cases which
-# results in the container not being able to restart. Unconfirmed if this
-# happens on Ubuntu. (bug #1489676)
-if [[ "${KOLLA_BASE_DISTRO}" =~ fedora|centos|oraclelinux|rhel ]]; then
+ rm -rf /var/run/apache2/*
+else
rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*
fi