Compare commits
4
Commits
2bfb8c6aee
...
3de818f280
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3de818f280
|
||
|
|
f116adffdb
|
||
|
|
3965d86d54
|
||
|
|
8fae71b086
|
@@ -25,3 +25,5 @@ GARAGE_ROOT_DOMAIN=.localhost
|
|||||||
AWS_DEFAULT_REGION=maze
|
AWS_DEFAULT_REGION=maze
|
||||||
AWS_SECRET_ACCESS_KEY=3o4n7yfo34985yrfcq9238765ry3928475rcy349857ty394578cy
|
AWS_SECRET_ACCESS_KEY=3o4n7yfo34985yrfcq9238765ry3928475rcy349857ty394578cy
|
||||||
AWS_ACCESS_KEY_ID=2q39fnoy59q2347yfdrc327894ryfc0q2834rcyq023897
|
AWS_ACCESS_KEY_ID=2q39fnoy59q2347yfdrc327894ryfc0q2834rcyq023897
|
||||||
|
|
||||||
|
S3_BUCKET_NAME=soaricarus-storage
|
||||||
|
|||||||
@@ -30,6 +30,10 @@ RUN --mount=type=ssh mkdir src && \
|
|||||||
COPY src ./src
|
COPY src ./src
|
||||||
COPY .env ./.env
|
COPY .env ./.env
|
||||||
COPY migrations ./migrations
|
COPY migrations ./migrations
|
||||||
|
COPY scripts/init-garage.sh /scripts/init-garage.sh
|
||||||
|
|
||||||
|
# Make it executable
|
||||||
|
RUN chmod +x /scripts/init-garage.sh
|
||||||
|
|
||||||
RUN --mount=type=ssh \
|
RUN --mount=type=ssh \
|
||||||
cargo build --release --quiet
|
cargo build --release --quiet
|
||||||
|
|||||||
@@ -80,6 +80,30 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- soaricarus-network
|
- soaricarus-network
|
||||||
|
|
||||||
|
# --- Storage Initialization ---
|
||||||
|
maze-init:
|
||||||
|
# image: dxflrs/garage:v2.3.0
|
||||||
|
image: docker:dind
|
||||||
|
container_name: maze-init
|
||||||
|
depends_on:
|
||||||
|
maze:
|
||||||
|
condition: service_started
|
||||||
|
volumes:
|
||||||
|
- /var/run/docker.sock:/var/run/docker.sock # Mount Docker socket
|
||||||
|
- object_data:/var/lib/garage
|
||||||
|
- ./scripts:/scripts:ro # ← ADD THIS - mount the scripts directory
|
||||||
|
environment:
|
||||||
|
- AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
|
||||||
|
- AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
|
||||||
|
- GARAGE_RPC_SECRET=${GARAGE_RPC_SECRET}
|
||||||
|
- BUCKET_NAME=${S3_BUCKET_NAME}
|
||||||
|
env_file:
|
||||||
|
- .env
|
||||||
|
entrypoint: ["/bin/sh"]
|
||||||
|
command: ["/scripts/init-garage.sh"]
|
||||||
|
restart: "no" # Run once and exit
|
||||||
|
networks:
|
||||||
|
- soaricarus-network
|
||||||
|
|
||||||
# PostgreSQL Database Service
|
# PostgreSQL Database Service
|
||||||
main_db:
|
main_db:
|
||||||
|
|||||||
Executable
+83
@@ -0,0 +1,83 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
|
||||||
|
BUCKET_NAME="soaricarus-storage"
|
||||||
|
|
||||||
|
echo "⏳ Waiting for Garage to be ready..."
|
||||||
|
until docker exec maze curl -s -f "http://localhost:3901/v0/status" > /dev/null 2>&1; do
|
||||||
|
echo " Garage not ready yet, retrying in 2s..."
|
||||||
|
sleep 2
|
||||||
|
done
|
||||||
|
echo "✅ Garage API is responding!"
|
||||||
|
|
||||||
|
sleep 3
|
||||||
|
|
||||||
|
# Check if layout is already applied
|
||||||
|
if docker exec maze garage layout show 2>/dev/null | grep -q "Current cluster layout"; then
|
||||||
|
echo "ℹ️ Layout already applied, checking bucket..."
|
||||||
|
else
|
||||||
|
echo "📦 Applying cluster layout..."
|
||||||
|
|
||||||
|
# Get node ID
|
||||||
|
MAX_RETRIES=10
|
||||||
|
RETRY_COUNT=0
|
||||||
|
NODE_ID=""
|
||||||
|
while [ $RETRY_COUNT -lt $MAX_RETRIES ]; do
|
||||||
|
NODE_ID=$(docker exec maze garage node id 2>/dev/null | head -n1)
|
||||||
|
if [ -n "$NODE_ID" ]; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
RETRY_COUNT=$((RETRY_COUNT + 1))
|
||||||
|
echo " Waiting for node ID (attempt $RETRY_COUNT/$MAX_RETRIES)..."
|
||||||
|
sleep 2
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ -z "$NODE_ID" ]; then
|
||||||
|
echo "❌ Failed to get node ID after $MAX_RETRIES attempts"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo " Node ID: $NODE_ID"
|
||||||
|
docker exec maze garage layout assign --version 1 "$NODE_ID"
|
||||||
|
docker exec maze garage layout apply --version 1
|
||||||
|
echo " ✅ Layout applied"
|
||||||
|
|
||||||
|
sleep 3
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check if bucket exists
|
||||||
|
if docker exec maze garage bucket info "${BUCKET_NAME}" 2>/dev/null; then
|
||||||
|
echo "ℹ️ Bucket '${BUCKET_NAME}' already exists. Skipping setup."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "📦 Creating bucket and configuring permissions..."
|
||||||
|
|
||||||
|
# Create the bucket
|
||||||
|
docker exec maze garage bucket create "${BUCKET_NAME}"
|
||||||
|
echo " ✅ Bucket created: ${BUCKET_NAME}"
|
||||||
|
|
||||||
|
# Check if key exists
|
||||||
|
if docker exec maze garage key info "${AWS_ACCESS_KEY_ID}" 2>/dev/null; then
|
||||||
|
echo " ℹ️ Key already exists: ${AWS_ACCESS_KEY_ID}"
|
||||||
|
else
|
||||||
|
docker exec maze garage key create \
|
||||||
|
--name "app-key" \
|
||||||
|
"${AWS_ACCESS_KEY_ID}" \
|
||||||
|
"${AWS_SECRET_ACCESS_KEY}"
|
||||||
|
echo " ✅ Key created: ${AWS_ACCESS_KEY_ID}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Grant permissions
|
||||||
|
docker exec maze garage bucket allow \
|
||||||
|
--read \
|
||||||
|
--write \
|
||||||
|
--owner \
|
||||||
|
"${BUCKET_NAME}" \
|
||||||
|
--key "${AWS_ACCESS_KEY_ID}"
|
||||||
|
echo " ✅ Permissions granted"
|
||||||
|
|
||||||
|
echo "🎉 Setup complete!"
|
||||||
|
echo " Bucket: ${BUCKET_NAME}"
|
||||||
|
echo " Access Key: ${AWS_ACCESS_KEY_ID}"
|
||||||
|
echo " Endpoint: http://maze:3900"
|
||||||
Reference in New Issue
Block a user