github-personal/labca
1
0
Fork 0
mirror of https://github.com/outbackdingo/labca.git synced 2026-01-27 10:19:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extend docker-compose timeout to 120s

Browse Source
This commit is contained in:
Arjan H
2022-02-11 08:25:31 +01:00
parent 973c806229
commit 1ab27caa77
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
commander
View File

@@ -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")

2
install
View File

@@ -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