Skip to content

Version 1.28.0-beta #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
linkinparkrulz merged 3 commits into from
Oct 28, 2025
Merged

Version 1.28.0-beta #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5702ef8
Update local changes for 1.28.0 branch overwrite
linkinparkrulz Oct 27, 2025
3288d9d
Use existing database migrations which includes api_keys
ericpp Oct 28, 2025
37a59b4
Remove .dojo_db_initialized check since it overwrites old MySQL datab…
ericpp Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,4 +147,4 @@ 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
25 changes: 11 additions & 14 deletions docker_entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ MYSQL_DATABASE=${MYSQL_DATABASE:-"samourai-main"}
MYSQL_USER=${MYSQL_USER:-"samourai"}
MYSQL_PASSWORD=${MYSQL_PASSWORD:-"samourai"}

if [ ! -f /var/lib/mysql/.dojo_db_initialized ]; then
if [ ! -d /var/lib/mysql/mysql ]; then
echo "[i] MySQL data directory not found or not initialized, creating initial DBs"

mkdir -p /var/lib/mysql
Expand Down Expand Up @@ -77,23 +77,20 @@ EOF
echo
echo 'MySQL init process done. Starting mysqld...'
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 ;;
*) echo "$0: ignoring or entrypoint initdb empty $f" ;;
esac
echo
done

touch /var/lib/mysql/.dojo_db_initialized
else
echo "[i] MySQL data directory already initialized, skipping initial DB creation."
fi

# Migrate database tables
echo "[i] Running database migration..."
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 ;;
*) echo "$0: ignoring or entrypoint initdb empty $f" ;;
esac
echo
done

# Start mysql
/usr/bin/mysqld_safe --user=mysql --datadir='/var/lib/mysql' &
db_process=$!
Expand Down
12 changes: 1 addition & 11 deletions manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down