diff --git a/docker-compose.yml b/docker-compose.yml
index df97108..eba4834 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,14 +40,18 @@ services:
       - db
     command: >
       sh -c "
-      until mysqladmin ping -h db -uroot -p$$MYSQL_PWD --silent; do
+      until mysqladmin ping -h db -uroot --password=$$MYSQL_PWD --silent 2>/dev/null; do
         echo 'Waiting for database...';
         sleep 2;
       done;
+      sleep 3;
+      echo 'mysqld is alive';
       for file in /migrations/*.sql; do
-        echo Running $$file;
-        mysql -h db -uroot -p$$MYSQL_PWD < $$file;
+        [ -e \"$$file\" ] || { echo 'No SQL files found'; exit 0; };
+        echo \"Running $$file\";
+        mysql -h db -uroot --password=$$MYSQL_PWD < $$file || exit 1;
       done;
+      echo 'All migrations done.';
       "
     restart: "no"