Browse Source

feat: change container name giving and add second wait loop

master
bucde 3 years ago
parent
commit
540bc4277f
1 changed files with 17 additions and 5 deletions
  1. +17
    -5
      setup

+ 17
- 5
setup View File

@ -19,17 +19,18 @@ USE_EXISTING_CONFIG=""
DELETE_CONFIG="" DELETE_CONFIG=""
MARIADB_PROJECT_NAME="mariadb_${DATE}" MARIADB_PROJECT_NAME="mariadb_${DATE}"
MARIADB_CONTAINER_NAME="${MARIADB_PROJECT_NAME}"
MARIADB_CONTAINER_NAME_SUFFIX=""
MARIADB_PROJECT_NAME_SUFFIX=""
MARIADB_CONTAINER_NAME="${MARIADB_PROJECT_NAME}_db"
MARIADB_VERSION="" MARIADB_VERSION=""
MARIADB_HOST_IP_ADDRESS="" MARIADB_HOST_IP_ADDRESS=""
MARIADB_HOST_PORT="" MARIADB_HOST_PORT=""
MARIADB_ROOT_PASSWORD="" MARIADB_ROOT_PASSWORD=""
read -p "Enter mariadb container name suffix (leave empty for none): " MARIADB_CONTAINER_NAME_SUFFIX
read -p "Enter mariadb project name suffix (leave empty for none): " MARIADB_PROJECT_NAME_SUFFIX
if [ -n "$MARIADB_CONTAINER_NAME_SUFFIX" ]; then
MARIADB_CONTAINER_NAME="${MARIADB_CONTAINER_NAME}_${MARIADB_CONTAINER_NAME_SUFFIX}"
if [ -n "$MARIADB_PROJECT_NAME_SUFFIX" ]; then
MARIADB_PROJECT_NAME="${MARIADB_PROJECT_NAME}_${MARIADB_PROJECT_NAME_SUFFIX}"
MARIADB_CONTAINER_NAME="${MARIADB_CONTAINER_NAME}_${MARIADB_PROJECT_NAME_SUFFIX}"
fi fi
rm -f .env rm -f .env
@ -64,6 +65,17 @@ docker-compose up -d
echo -n "Wait until mariadb is ready ..." echo -n "Wait until mariadb is ready ..."
# wait two times, because mariadb restarts once after configuration
while ! docker exec $MARIADB_CONTAINER_NAME mysql --password=$MARIADB_ROOT_PASSWORD -e "SELECT 1" > /dev/null 2>&1; do
echo -n "."
sleep 1
done
echo -n "."
sleep 1
echo -n "."
sleep 1
while ! docker exec $MARIADB_CONTAINER_NAME mysql --password=$MARIADB_ROOT_PASSWORD -e "SELECT 1" > /dev/null 2>&1; do while ! docker exec $MARIADB_CONTAINER_NAME mysql --password=$MARIADB_ROOT_PASSWORD -e "SELECT 1" > /dev/null 2>&1; do
echo -n "." echo -n "."
sleep 1 sleep 1


Loading…
Cancel
Save