Fixed start service upgrade

This commit is contained in:
root 2023-08-16 13:40:56 +00:00
parent 04af7ab822
commit a3538a5cf8
2 changed files with 6 additions and 22 deletions

View File

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

View File

@ -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 <<EOF
version: "3.7"
@ -54,6 +56,9 @@ networks:
external: true
EOF
GITEA_SECRET="Jwh0wGdXGMmaaiHSwGodxQORcloLSmHQ"
ADMINPASS="XlyJjjYgs5XkjhVzdTlV0VZNydTk3yJK"
cat > /federated/apps/gitea/.env <<EOF
IMAGE_VERSION="1.19.0"
USER_UID=1000