From 232995bf0d4274f904044e6dd0dc8098757b4be3 Mon Sep 17 00:00:00 2001 From: throwaway Date: Thu, 24 Aug 2023 20:50:05 -0500 Subject: [PATCH] add set -e and use exec to replace parent process to handle docker signals (#6) use `exec` to turn httpd into parent process. This is important for docker signalling such as `docker stop ${container_id}` add `set -e` which stops the entrypoint script if any command exits with a non-zero exit code. Reviewed-on: https://git.lolcat.ca/lolcat/4get/pulls/6 Co-authored-by: throwaway Co-committed-by: throwaway --- docker/docker-entrypoint.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 469f810..939e59b 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -e sed -i "s/ServerName.*/ServerName ${FOURGET_SERVER_NAME}/g" /etc/apache2/httpd.conf sed -i "s/ServerAdmin.*/ServerAdmin ${FOURGET_SERVER_ADMIN_EMAIL}/g" /etc/apache2/httpd.conf -httpd -DFOREGROUND +exec httpd -DFOREGROUND