From 140b9dba454dde9e1f40dfb8d7656fad77357432 Mon Sep 17 00:00:00 2001
From: phoenix <mail@kundeng.us>
Date: Thu, 30 Jul 2026 16:59:58 -0400
Subject: [PATCH] Saving script change

---
 garage/entrypoint.sh | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/garage/entrypoint.sh b/garage/entrypoint.sh
index 1536560..53161d9 100755
--- a/garage/entrypoint.sh
+++ b/garage/entrypoint.sh
@@ -21,17 +21,13 @@ EOF
     echo "✅ Credentials saved to $CREDENTIALS_FILE"
 }
 
-sleep 20
-echo "Garage secret"
-echo "$GARAGE_RPC_SECRET"
-echo "Should be printed"
 sleep 20
 
-echo "Sleeping for a bit"
-sleep 5
 echo "Starting garage"
 GARAGE_COMMAND_EXEC="$GARAGE_BIN -c /etc/garage.toml server"
 
+sleep 10
+
 # Check if setup already completed
 if [ -f "$SETUP_DONE" ]; then
     echo "ℹ️  Setup already completed. Starting Garage..."
@@ -44,23 +40,21 @@ echo "🔧 First-time setup - initializing Garage..."
 
 # Start Garage in background for setup (just the binary, no daemon subcommand)
 echo "⏳ Starting Garage in background..."
-echo "GARAGE_BIN: $GARAGE_COMMAND_EXEC"
+echo "GARAGE_COMMAND_EXEC: $GARAGE_COMMAND_EXEC"
 # $GARAGE_BIN "$@" &
 # GARAGE_PID=$!
 # $GARAGE_BIN -c /etc/garage.toml & GARAGE_PID=$!
 $GARAGE_COMMAND_EXEC & GARAGE_PID=$!
 
+sleep 10
+sleep 10
 echo "GARAGE_PID: $GARAGE_PID"
 
 # echo "Command: $GARAGE_BIN $@"
-sleep 20
-echo "Garage secret"
-echo "$GARAGE_RPC_SECRET"
-echo "Should be printed"
-sleep 20
 
 # Apply cluster layout
 if ! $GARAGE_BIN layout show 2>/dev/null | grep -q "Current cluster layout"; then
+    sleep 5
     echo "📦 Applying cluster layout..."
     NODE_ID=$($GARAGE_BIN node id | head -n1)
     if [ -z "$NODE_ID" ]; then
@@ -69,11 +63,11 @@ if ! $GARAGE_BIN layout show 2>/dev/null | grep -q "Current cluster layout"; the
         exit
     fi
     echo "Node ID: $NODE_ID"
-    sleep 5
+    sleep 10
 
     echo "Assigning layout"
     # $GARAGE_BIN layout assign --version 1 -z ny1 -c 4G $NODE_ID
-    $GARAGE_BIN layout assign -z ny1 -c 4G $NODE_ID
+    $GARAGE_BIN --rpc-secret "$GARAGE_RPC_SECRET" layout assign -z ny1 -c 4G $NODE_ID
     # $GARAGE_BIN status
     # sleep 5
     # $GARAGE_BIN status
@@ -84,16 +78,18 @@ if ! $GARAGE_BIN layout show 2>/dev/null | grep -q "Current cluster layout"; the
     $GARAGE_BIN layout apply --version 1
     # $GARAGE_BIN layout apply
     echo "   ✅ Layout applied"
-    sleep 10
 else
     echo "ℹ️  Layout already applied"
 fi
 
+sleep 10
+
 
 # Create bucket
 echo "Bucket: $BUCKET_NAME"
 if ! $GARAGE_BIN bucket info "$BUCKET_NAME" 2>/dev/null; then
     echo "📦 Creating bucket: $BUCKET_NAME"
+    sleep 5
     $GARAGE_BIN bucket create "$BUCKET_NAME"
     sleep 10
 else
@@ -124,6 +120,8 @@ fi
 echo "🔑 Generating new key..."
 KEY_OUTPUT=$($GARAGE_BIN key create "app-key")
 echo "$KEY_OUTPUT"
+sleep 15
+
 ACCESS_KEY=$(echo "$KEY_OUTPUT" | grep 'Key ID:' | awk '{print $3}')
 SECRET_KEY=$(echo "$KEY_OUTPUT" | grep 'Secret key:' | awk '{print $3}')
 echo "   ✅ Key generated: $ACCESS_KEY"
@@ -159,4 +157,5 @@ wait "$GARAGE_PID" 2>/dev/null || true
 # Start Garage in foreground
 echo "🚀 Starting Garage in foreground..."
 # exec $GARAGE_BIN "$@"
+sleep 20
 exec $GARAGE_COMMANDS_EXEC