Cleanup

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

packages/docker/mariadb/default.nix

@@ -26,7 +26,7 @@ pkgs.dockerTools.buildImage {
   };
 
   runAsRoot = ''
-    mkdir -p /var/lib/mysql /run/mysqld
+    mkdir -p /run/mysqld
   '';
 
   config = {

packages/docker/mariadb/entrypoint.sh

@@ -13,7 +13,7 @@ if [ ! -f "$DATADIR/mysql_upgrade_info" ]; then
   mariadb-install-db --datadir="$DATADIR" --skip-test-db
 
   mariadbd --user=root --datadir="$DATADIR" --skip-networking --skip-grant-tables &
-  pid="$!"
+  PID="$!"
 
   while ! mariadb --protocol=socket -e "
     FLUSH PRIVILEGES;
@@ -28,12 +28,12 @@ if [ ! -f "$DATADIR/mysql_upgrade_info" ]; then
     sleep 0.1
   done
 
-  kill -QUIT "$pid"
-  wait "$pid" || true
+  kill -QUIT "$PID"
+  wait "$PID" || true
 fi
 
-trap 'kill -QUIT "$pid"' INT
+trap 'kill -QUIT "$PID"' INT
 mariadbd --user=root --datadir="$DATADIR" "$@" &
-pid=$!
-wait "$pid"
+PID=$!
+wait "$PID"
 exit $?