From 1ab27caa776b03c8b66947cc6677400767feca96 Mon Sep 17 00:00:00 2001
From: Arjan H <github@hakwerk.com>
Date: Fri, 11 Feb 2022 08:25:31 +0100
Subject: [PATCH] Extend docker-compose timeout to 120s

---
 commander | 12 ++++++------
 install   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/commander b/commander
index 8102763..317289d 100755
--- a/commander
+++ b/commander
@@ -52,7 +52,7 @@ case $txt in
     wait_down $PS_MYSQL &>>$LOGFILE
     wait_down $PS_LABCA &>>$LOGFILE
     wait_down $PS_BOULDER &>>$LOGFILE
-    docker-compose up -d &>>$LOGFILE
+    COMPOSE_HTTP_TIMEOUT=120 docker-compose up -d &>>$LOGFILE
     wait_up $PS_MYSQL &>>$LOGFILE
     wait_up $PS_LABCA &>>$LOGFILE
     wait_up $PS_BOULDER $PS_BOULDER_COUNT &>>$LOGFILE
@@ -158,8 +158,8 @@ case $txt in
     ;;
 "boulder-start")
     cd /home/labca/boulder
-    docker-compose up -d bmysql
-    docker-compose up -d boulder
+    COMPOSE_HTTP_TIMEOUT=120 docker-compose up -d bmysql
+    COMPOSE_HTTP_TIMEOUT=120 docker-compose up -d boulder
     wait_up $PS_MYSQL &>>$LOGFILE
     wait_up $PS_BOULDER $PS_BOULDER_COUNT &>>$LOGFILE
     ;;
@@ -176,8 +176,8 @@ case $txt in
     docker-compose stop bmysql
     wait_down $PS_MYSQL &>>$LOGFILE
     wait_down $PS_BOULDER &>>$LOGFILE
-    docker-compose up -d bmysql
-    docker-compose up -d boulder
+    COMPOSE_HTTP_TIMEOUT=120 docker-compose up -d bmysql
+    COMPOSE_HTTP_TIMEOUT=120 docker-compose up -d boulder
     wait_up $PS_MYSQL &>>$LOGFILE
     wait_up $PS_BOULDER $PS_BOULDER_COUNT &>>$LOGFILE
     ;;
@@ -185,7 +185,7 @@ case $txt in
     cd /home/labca/boulder
     docker-compose stop labca
     wait_down $PS_LABCA &>>$LOGFILE
-    docker-compose up -d labca
+    COMPOSE_HTTP_TIMEOUT=120 docker-compose up -d labca
     wait_up $PS_LABCA &>>$LOGFILE
     ;;
 "svc-restart")
diff --git a/install b/install
index d7f29ba..b2b7995 100755
--- a/install
+++ b/install
@@ -768,7 +768,7 @@ startup() {
     for ct in boulder_bhsm_1 boulder_bredis_1 boulder_bredis_2 boulder_bredis_3 boulder_bredis_4 boulder_bredis_5 boulder_bredis_6; do
         [ -z "$(docker ps -a | grep -e "$ct\$")" ] || docker rm -f $ct &>>$installLog
     done
-    docker-compose up -d &>>$installLog
+    COMPOSE_HTTP_TIMEOUT=120 docker-compose up -d &>>$installLog
 
     [ -h "/etc/init.d/labca" ] || ln -s "$cloneDir/init_d" /etc/init.d/labca
     update-rc.d labca defaults &>>$installLog