diff options
| author | Michael Tews <michael@tews.dev> | 2026-03-23 17:08:59 +0100 |
|---|---|---|
| committer | Michael Tews <michael@tews.dev> | 2026-03-23 17:08:59 +0100 |
| commit | 3639009b382ee1f58705c4c608600407b27f704c (patch) | |
| tree | 63d250aa131c29a804b12eb8e856589504560ba2 | |
| parent | d14dc152074dca849decb54e649be00a389868f5 (diff) | |
fix: skip ssl for local testing
| -rw-r--r-- | .gitlab/scripts/install_db.sh | 15 | ||||
| -rw-r--r-- | docker/studip/docker-entrypoint.sh | 4 |
2 files changed, 12 insertions, 7 deletions
diff --git a/.gitlab/scripts/install_db.sh b/.gitlab/scripts/install_db.sh index 6093942..a2e566a 100644 --- a/.gitlab/scripts/install_db.sh +++ b/.gitlab/scripts/install_db.sh @@ -1,18 +1,21 @@ #!/bin/bash set -e +mysql_client_ssl_flag='--skip-ssl' + importSQLFile() { mysql --default-character-set=utf8mb4\ --init-command="SET NAMES UTF8;"\ - -u $MYSQL_USER\ - -h $MYSQL_HOST\ - -p$MYSQL_PASSWORD\ - $MYSQL_DATABASE\ - < $1 + $mysql_client_ssl_flag\ + -u "$MYSQL_USER"\ + -h "$MYSQL_HOST"\ + -p"$MYSQL_PASSWORD"\ + "$MYSQL_DATABASE"\ + < "$1" } -if [ $(mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE -e "show tables;" --batch | wc -l) -eq 0 ]; then +if [ "$(mysql $mysql_client_ssl_flag -u "$MYSQL_USER" -h "$MYSQL_HOST" -p"$MYSQL_PASSWORD" "$MYSQL_DATABASE" -e "show tables;" --batch | wc -l)" -eq 0 ]; then # Check if demodata is required if [ ! -z $DEMO_DATA ]; then diff --git a/docker/studip/docker-entrypoint.sh b/docker/studip/docker-entrypoint.sh index dde57c5..f5469e5 100644 --- a/docker/studip/docker-entrypoint.sh +++ b/docker/studip/docker-entrypoint.sh @@ -1,6 +1,8 @@ #!/bin/bash set -e +mysql_client_args=(--skip-ssl -u "$MYSQL_USER" -h "$MYSQL_HOST" "-p$MYSQL_PASSWORD") + STUDIP='/var/www/studip' CONFIGFILE="$STUDIP/config/config_local.inc.php" DOCKERCONFIGFILE="/config/config_local.inc.php" @@ -17,7 +19,7 @@ fi maxcounter=45 counter=1 -while ! mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD -e "show databases;" > /dev/null 2>&1; do +while ! mysql "${mysql_client_args[@]}" -e "show databases;" > /dev/null 2>&1; do sleep 1 counter=`expr $counter + 1` if [ $counter -gt $maxcounter ]; then |