diff --git a/lib/functions.sh b/lib/functions.sh index 133ffeb..a77314c 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -86,7 +86,7 @@ upgrade_federated() { sed -i "s#VERSION=.*#VERSION=$VERSION#g" /federated/apps/$APP/.env fi echo -ne "\n Starting Up $APP.." - start_service_upgrade "$APP" "$NC_COMMAND" + /federated/bin/start $APP echo -ne "\n Done Updating $APP to $VERSION." fi done @@ -210,27 +210,6 @@ start_service_withalert() { fi done } -start_service_upgrade() { - SERVICE="$1" - - # Keep trying service port to make sure it's up before - # we proceed - RETRY="30" - while [ $RETRY -gt 0 ]; do - bash -c "$COMMAND" &> /dev/null - if [ $? -eq 0 ]; then - break - else - if [ "$RETRY" == 1 ]; then - docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null - kill -9 $SPINPID &> /dev/null - fail "There was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' or turn on\ndebug with -d" - fi - ((RETRY--)) - sleep 7 - fi - done -} start_service() { SERVICE="$1" COMMAND="$2" diff --git a/lib/gitea.sh b/lib/gitea.sh index 3be4912..a529707 100644 --- a/lib/gitea.sh +++ b/lib/gitea.sh @@ -16,6 +16,8 @@ config_gitea() { chmod 600 /federated/apps/gitea/data/data/git/.ssh/authorized_keys fi +EXTERNALIP="5.161.215.82" + cat > /federated/apps/gitea/docker-compose.yml < /federated/apps/gitea/.env <