mirror of
https://github.com/friendica/friendica
synced 2024-11-09 16:22:56 +00:00
allow overriding password during local testing
This commit is contained in:
parent
e9dcf15d86
commit
f616dc054f
1 changed files with 5 additions and 5 deletions
|
@ -152,8 +152,8 @@ function execute_tests() {
|
||||||
echo "To use the docker container set the USEDOCKER environment variable"
|
echo "To use the docker container set the USEDOCKER environment variable"
|
||||||
exit 3
|
exit 3
|
||||||
fi
|
fi
|
||||||
mysql -u "${DATABASE_USER}" -pfriendica -e "DROP DATABASE IF EXISTS ${DATABASE_NAME}" -h ${DATABASE_HOST} || true
|
mysql -u "${DATABASE_USER}" -p"${DATABASE_PASSWORD}" -e "DROP DATABASE IF EXISTS ${DATABASE_NAME}" -h ${DATABASE_HOST} || true
|
||||||
mysql -u "${DATABASE_USER}" -pfriendica -e "CREATE DATABASE ${DATABASE_NAME} DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" -h ${DATABASE_HOST}
|
mysql -u "${DATABASE_USER}" -p"${DATABASE_PASSWORD}" -e "CREATE DATABASE ${DATABASE_NAME} DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" -h ${DATABASE_HOST}
|
||||||
else
|
else
|
||||||
DATABASE_HOST=mysql
|
DATABASE_HOST=mysql
|
||||||
fi
|
fi
|
||||||
|
@ -185,8 +185,8 @@ function execute_tests() {
|
||||||
echo "To use the docker container set the USEDOCKER environment variable"
|
echo "To use the docker container set the USEDOCKER environment variable"
|
||||||
exit 3
|
exit 3
|
||||||
fi
|
fi
|
||||||
mysql -u "${DATABASE_USER}" -pfriendica -e "DROP DATABASE IF EXISTS ${DATABASE_NAME}" -h ${DATABASE_HOST} || true
|
mysql -u "${DATABASE_USER}" -p"${DATABASE_PASSWORD}" -e "DROP DATABASE IF EXISTS ${DATABASE_NAME}" -h ${DATABASE_HOST} || true
|
||||||
mysql -u "${DATABASE_USER}" -pfriendica -e "CREATE DATABASE ${DATABASE_NAME} DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" -h ${DATABASE_HOST}
|
mysql -u "${DATABASE_USER}" -p"${DATABASE_PASSWORD}" -e "CREATE DATABASE ${DATABASE_NAME} DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" -h ${DATABASE_HOST}
|
||||||
else
|
else
|
||||||
DATABASE_HOST=mariadb
|
DATABASE_HOST=mariadb
|
||||||
fi
|
fi
|
||||||
|
@ -203,7 +203,7 @@ function execute_tests() {
|
||||||
|
|
||||||
if [ -n "${USEDOCKER}" ]; then
|
if [ -n "${USEDOCKER}" ]; then
|
||||||
echo "Initialize database..."
|
echo "Initialize database..."
|
||||||
docker exec ${DOCKER_CONTAINER_ID} mysql -u root -pfriendica -e "CREATE DATABASE IF NOT EXISTS ${DATABASE_NAME};"
|
docker exec ${DOCKER_CONTAINER_ID} mysql -u root -p"${DATABASE_PASSWORD}" -e "CREATE DATABASE IF NOT EXISTS ${DATABASE_NAME};"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export MYSQL_HOST="${DATABASE_HOST}"
|
export MYSQL_HOST="${DATABASE_HOST}"
|
||||||
|
|
Loading…
Reference in a new issue