Update local changes for 1.28.0 branch overwrite

Author: linkinparkrulz

Dockerfile

@@ -141,10 +141,11 @@ RUN mkdir /etc/nginx/sites-enabled && \
 
 COPY ./config.env /usr/local/bin/config.env
 COPY --chmod=755 ./docker_entrypoint.sh /usr/local/bin/
+COPY --chmod=755 ./migrate-db.sh /usr/local/bin/
 COPY --chmod=755 ./check-synced.sh /usr/local/bin/
 COPY --chmod=755 ./check-api.sh /usr/local/bin/
 COPY --chmod=755 ./check-mysql.sh /usr/local/bin/
 COPY --chmod=755 ./check-pushtx.sh /usr/local/bin/
 COPY --chmod=755 ./check-soroban.sh /usr/local/bin/
 COPY --chmod=755 ./functions.sh /usr/local/bin/
-COPY --chmod=755 ./samourai-dojo/docker/my-dojo/soroban/restart.sh /usr/local/bin/soroban-restart.sh
+COPY --chmod=755 ./samourai-dojo/docker/my-dojo/soroban/restart.sh /usr/local/bin/soroban-restart.sh

docker_entrypoint.sh

@@ -79,8 +79,6 @@ EOF
 	echo
 
 	# Run initial SQL scripts
-	sed "1iUSE \`$MYSQL_DATABASE\`;" /docker-entrypoint-initdb.d/2_update.sql | /usr/bin/mysqld --user=mysql --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0
-
 	for f in /docker-entrypoint-initdb.d/*; do
 		case "$f" in
 			*.sql)    echo "$0: running $f"; sed "1iUSE \`$MYSQL_DATABASE\`;" "$f" | /usr/bin/mysqld --user=mysql --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0; echo ;;
@@ -98,6 +96,10 @@ fi
 /usr/bin/mysqld_safe --user=mysql --datadir='/var/lib/mysql' &
 db_process=$!
 
+# Run database migration to ensure api_keys table exists
+echo "[i] Running database migration..."
+/usr/local/bin/migrate-db.sh
+
 # Config tor and explorer
 echo "[i] Reading Dojo Tor address from config..."
 TOR_ADDRESS=$(yq e '.tor-address' /root/start9/config.yaml)

manifest.yaml

@@ -70,22 +70,12 @@ health-checks:
     inject: true
     system: false
     io-format: yaml
-  soroban:
-    name: Soroban
-    success-message: Soroban P2P relay service is online and ready
-    type: docker
-    image: main
-    entrypoint: 'check-soroban.sh'
-    args: []
-    inject: true
-    system: false
-    io-format: yaml
   soroban:
     name: Soroban
     success-message: Soroban is running
     type: docker
     image: main
-    entrypoint: "check-soroban.sh"
+    entrypoint: 'check-soroban.sh'
     args: []
     inject: true
     system: false

migrate-db.sh

@@ -0,0 +1,67 @@
+#!/bin/bash
+
+# Database migration script to ensure api_keys table exists
+# This script should be run when the database is already initialized but missing the api_keys table
+
+source /usr/local/bin/config.env
+
+MYSQL_DATABASE=${MYSQL_DATABASE:-"samourai-main"}
+MYSQL_USER=${MYSQL_USER:-"samourai"}
+MYSQL_PASSWORD=${MYSQL_PASSWORD:-"samourai"}
+
+# Determine the database client binary to use (mysql if present, mariadb otherwise)
+if command -v mysql &> /dev/null; then
+  DBCLIENT="mysql"
+else
+  DBCLIENT="mariadb"
+fi
+
+echo "[i] Checking if MySQL is running..."
+# Wait for MySQL to be ready
+for i in {30..0}; do
+  if echo "SELECT 1" | "$DBCLIENT" -u"$MYSQL_USER" -p"$MYSQL_PASSWORD" "$MYSQL_DATABASE" &> /dev/null; then
+    echo "[i] MySQL is ready"
+    break
+  fi
+  echo "[i] MySQL init process in progress..."
+  sleep 1
+done
+
+if [ "$i" = 0 ]; then
+  echo "[!] MySQL failed to start"
+  exit 1
+fi
+
+echo "[i] Checking if api_keys table exists..."
+# Check if api_keys table exists
+TABLE_EXISTS=$("$DBCLIENT" -u"$MYSQL_USER" -p"$MYSQL_PASSWORD" "$MYSQL_DATABASE" -e "SHOW TABLES LIKE 'api_keys';" | wc -l)
+
+if [ "$TABLE_EXISTS" -eq 0 ]; then
+  echo "[i] api_keys table does not exist, creating it..."
+  
+  # Create the api_keys table
+  "$DBCLIENT" -u"$MYSQL_USER" -p"$MYSQL_PASSWORD" "$MYSQL_DATABASE" << 'EOF'
+--
+-- Create table "api_keys"
+--
+CREATE TABLE IF NOT EXISTS `api_keys` (
+    `apikeyID`  INT AUTO_INCREMENT PRIMARY KEY,
+    `label`     VARCHAR(255) NOT NULL,
+    `apikey`    VARCHAR(255) NOT NULL UNIQUE,
+    `active`    BOOLEAN NOT NULL DEFAULT TRUE,
+    `createdAt` TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    `expiresAt` TIMESTAMP NOT NULL
+);
+EOF
+
+  if [ $? -eq 0 ]; then
+    echo "[i] Successfully created api_keys table"
+  else
+    echo "[!] Failed to create api_keys table"
+    exit 1
+  fi
+else
+  echo "[i] api_keys table already exists"
+fi
+
+echo "[i] Database migration completed successfully"