From 6ae31277bee3becc97c7deb1dab075a4dac7fb8f Mon Sep 17 00:00:00 2001
From: Jakub Kadlcik <frostyx@email.cz>
Date: Nov 04 2019 18:45:48 +0000
Subject: docker: fix improperly running httpd in distgit container


We have a recurring problem with httpd, which manifests itself
in the following way:

1. httpd is running, while supervisorctl thinks it failed
2. It is not accessible e.g. via curl and returns "connection refused"
3. Killing httpd and starting it again fixes the issue

We decided to not burn out a large amount of time on this issue
and just try to hackishly workaround it.

Merges: #1088

---

diff --git a/docker/distgit/files/usr/bin/run.sh b/docker/distgit/files/usr/bin/run.sh
index 21e4462..b4f28ea 100755
--- a/docker/distgit/files/usr/bin/run.sh
+++ b/docker/distgit/files/usr/bin/run.sh
@@ -9,4 +9,11 @@ cat <<-EOF
   echo "#########################################################"
 EOF
 
+# We have a recurring problem with httpd, which manifests itself
+# in the following way
+# 1. httpd is running, while supervisorctl thinks it failed
+# 2. It is not accessible e.g. via curl and returns "connection refused"
+# 3. Killing httpd and starting it again fixes the issue
+kill -9 `pidof httpd` && supervisorctl start httpd
+
 /bin/bash