# This is a combination of 2 commits.

# The first commit's message is:

use mysqlshow to check readiness

# This is the 2nd commit message:

Use path variable

Author: Mike

entrypoint.sh

@@ -37,7 +37,7 @@ if ${SSL_SELF_SIGNED:=true}; then
   ln -s /etc/nginx/sites-available/fbctf-ssl.conf /etc/nginx/sites-enabled/fbctf-ssl.conf
 else
   ln -s /etc/nginx/sites-available/fbctf.conf /etc/nginx/sites-enabled/fbctf.conf
-  sed -i -r -e '/private static bool \$s_secure/ {s/true/false/}' /var/www/fbctf/src/SessionUtils.php
+  sed -i -r -e '/private static bool \$s_secure/ {s/true/false/}' $CTF_PATH/src/SessionUtils.php
 fi
 
 # Forward request and error logs to docker log collector
@@ -48,11 +48,12 @@ ln -sf /dev/stdout /var/log/nginx/access.log \
 echo -e "[client]\nhost=mysql" > ~/.my.cnf
 
  # Wait for the mysql container to be ready
-while ! nc -z mysql 3306; do
-  echo "Waiting for mysql to start";
+while ! mysqlshow -u$MYSQL_USER -p$MYSQL_PASSWORD > /dev/null 2>&1; do
+  echo "Waiting for mysql to be ready";
   sleep 1;
 done;
 
+
 # Don't errase the database if it exists
 if [ $(mysql -N -s -u $MYSQL_USER --password=$MYSQL_PASSWORD -e \
     "select count(*) from information_schema.tables where \