PR#1098: docker: fix already running httpd issue on distgit - copr/copr

copr / copr

#1098 docker: fix already running httpd issue on distgit

Merged 4 years ago by praiskup. Opened 4 years ago by frostyx.

copr/ frostyx/copr docker-httpd-error-2 into master

docker: fix already running httpd issue on distgit

Jakub Kadlcik • 4 years ago

c9df18f

docker/distgit/files/etc/supervisord.conf

file modified

-5

		`@@ -125,11 +125,6 @@`
		`; interpreted as relative to this file. Included files cannot`
		`; include files themselves.`

		`- [program:dist-git]`
		`- command=/usr/libexec/git-core/git-daemon --base-path=/var/lib/dist-git/git --export-all --user-path=public_git --syslog --inetd --verbose`
		`- user=root`
		`- group=root`
		`-`
		`[program:copr-dist-git]`
		`environment=PYTHONPATH=/usr/share/copr/`
		`command=/usr/bin/importer_runner.py`

docker/distgit/files/usr/bin/run.sh

file modified

-7

		`@@ -9,11 +9,4 @@`
		`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`

frostyx commented 4 years ago

I was trying to hackishly fix this in 6ae3127, but it probably won't
help, because pidof httpd is none.

[root@distgit /]# pidof httpd
[root@distgit /]# /usr/sbin/httpd -DFOREGROUND
httpd (pid 35) already running

The mentioned PID is of the following process

/usr/libexec/git-core/git-daemon --base-path=/var/lib/dist-git/git \
    --export-all --user-path=public_git --syslog --inetd --verbose

Which is started by our supervisord. The question is, do we really need
it? I don't think so, since we can just remove it and the docker compose
environment works just fine.