From e83b7856c324218e866b6f9e7efd80067a4ed4a6 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Thu, 13 Feb 2020 13:33:56 +0100 Subject: [PATCH] [init] bail out in case the db access fails (#123) * [init] bail out in case the db access fails Signed-off-by: Jakob Ackermann * [misc] bail out in case any command in an init_script failed NOTE: sh does not support `-o pipefail`. Signed-off-by: Jakob Ackermann --- init_scripts/00_make_sharelatex_data_dirs.sh | 2 ++ init_scripts/00_regen_sharelatex_secrets.sh | 3 ++- init_scripts/00_set_docker_host_ipaddress.sh | 6 ++++-- init_scripts/98_check_db_access.sh | 2 ++ init_scripts/99_migrate.sh | 2 ++ 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/init_scripts/00_make_sharelatex_data_dirs.sh b/init_scripts/00_make_sharelatex_data_dirs.sh index 6085a087da..0d7c643733 100755 --- a/init_scripts/00_make_sharelatex_data_dirs.sh +++ b/init_scripts/00_make_sharelatex_data_dirs.sh @@ -1,4 +1,6 @@ #!/bin/sh +set -e + mkdir -p /var/lib/sharelatex/data chown www-data:www-data /var/lib/sharelatex/data diff --git a/init_scripts/00_regen_sharelatex_secrets.sh b/init_scripts/00_regen_sharelatex_secrets.sh index 695ca66f78..365be0869f 100755 --- a/init_scripts/00_regen_sharelatex_secrets.sh +++ b/init_scripts/00_regen_sharelatex_secrets.sh @@ -1,4 +1,5 @@ -#!/bin/sh +#!/bin/bash +set -e -o pipefail # generate secrets and defines them as environment variables # https://github.com/phusion/baseimage-docker#centrally-defining-your-own-environment-variables diff --git a/init_scripts/00_set_docker_host_ipaddress.sh b/init_scripts/00_set_docker_host_ipaddress.sh index afd31b69a1..0587a9b222 100755 --- a/init_scripts/00_set_docker_host_ipaddress.sh +++ b/init_scripts/00_set_docker_host_ipaddress.sh @@ -1,3 +1,5 @@ -#!/bin/sh +#!/bin/bash +set -e -o pipefail + # See the bottom of http://stackoverflow.com/questions/24319662/from-inside-of-a-docker-container-how-do-i-connect-to-the-localhost-of-the-mach -echo "`route -n | awk '/UG[ \t]/{print $2}'` dockerhost" >> /etc/hosts \ No newline at end of file +echo "`route -n | awk '/UG[ \t]/{print $2}'` dockerhost" >> /etc/hosts diff --git a/init_scripts/98_check_db_access.sh b/init_scripts/98_check_db_access.sh index a90adba84f..f8507f582f 100755 --- a/init_scripts/98_check_db_access.sh +++ b/init_scripts/98_check_db_access.sh @@ -1,4 +1,6 @@ #!/bin/sh +set -e + echo "Checking can connect to mongo and redis" cd /var/www/sharelatex && grunt check:redis cd /var/www/sharelatex && grunt check:mongo diff --git a/init_scripts/99_migrate.sh b/init_scripts/99_migrate.sh index d062496581..f880fa816f 100755 --- a/init_scripts/99_migrate.sh +++ b/init_scripts/99_migrate.sh @@ -1,4 +1,6 @@ #!/bin/sh +set -e + which node which grunt ls -al /var/www/sharelatex/migrations