diff --git a/docker-compose.yml b/docker-compose.yml index 19e1c1b..43dc581 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,6 +27,7 @@ services: - ./logs:/app/logs environment: MYSQL_HOST: 'db' + MYSQL_PORT: '3306' MYSQL_USER: 'java' MYSQL_PASSWORD: 'password' MYSQL_DATABASE: 'netneutrality' diff --git a/startup.sh b/startup.sh index 7af7a26..96f6dc0 100644 --- a/startup.sh +++ b/startup.sh @@ -1,9 +1,5 @@ #!/bin/sh -prop() { - grep "${1}" bot.properties | cut -d'=' -f2 -} - _term() { echo "Caught SIGTERM/SIGINT signal, graceful shutdown of bot.." if [ -z "$pid" ]; then @@ -29,11 +25,11 @@ if [ -z $API_PORT ]; then fi if [ -z $MYSQL_HOST ]; then - MYSQL_HOST="$(prop 'MYSQL_HOST')" + MYSQL_HOST="localhost" fi if [ -z $MYSQL_PORT ]; then - MYSQL_PORT=$(prop 'MYSQL_PORT') + MYSQL_PORT=3306 fi echo "Waiting 10 seconds for database to start.."