diff --git a/build-bot.sh b/build-bot.sh index 80881c4..854e33b 100644 --- a/build-bot.sh +++ b/build-bot.sh @@ -3,9 +3,9 @@ git fetch || exit 1 git pull || exit 1 -sudo docker compose down || exit 1 -sudo docker compose pull || exit 1 -sudo docker compose build || exit 1 +docker compose down || exit 1 +docker compose pull || exit 1 +docker compose build || exit 1 -sudo docker compose up -d -sudo docker compose logs -f \ No newline at end of file +docker compose up -d +docker compose logs -f \ No newline at end of file diff --git a/startup.sh b/startup.sh index 9b1262b..b8b0a25 100644 --- a/startup.sh +++ b/startup.sh @@ -24,23 +24,23 @@ if [ ! -f /usr/bin/nc ]; then exit 1 fi -if [ -z "$API_PORT" ]; then +if [ -z $API_PORT ]; then API_PORT=9000; fi -if [ -z "$MYSQL_HOST" ]; then - MYSQL_HOST="$(prop 'MYSQL_HOST')" +if [ -z $MYSQL_HOST ]; then + MYSQL_HOST="localhost" fi -if [ -z "$MYSQL_PORT" ]; then - MYSQL_PORT=$(prop 'MYSQL_PORT') +if [ -z $MYSQL_PORT ]; then + MYSQL_PORT=3306 fi echo "Waiting 10 seconds for database to start.." sleep 10 echo "Checking if MySQL / MariaDB is started.." -if /usr/bin/nc -z "$MYSQL_HOST" "$MYSQL_PORT"; then +if /usr/bin/nc -z $MYSQL_HOST $MYSQL_PORT; then echo "Database OK. Starting bot.."; /opt/java/openjdk/bin/java -jar /app/netneutrality-jar-with-dependencies.jar &