Aggiunge Garage al compose di produzione e script di bootstrap.
Rails e Sidekiq usano S3 interno (http://garage:3900); setup_garage_production.sh configura bucket, chiavi e infra/.env sul server. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -3,11 +3,23 @@
|
||||
set -euo pipefail
|
||||
|
||||
ROOT="$(cd "$(dirname "$0")/.." && pwd)"
|
||||
GARAGE_CONTAINER="${GARAGE_CONTAINER:-infra-garage-1}"
|
||||
COMPOSE_FILE="${COMPOSE_FILE:-docker-compose.yml}"
|
||||
GARAGE_CONTAINER="${GARAGE_CONTAINER:-}"
|
||||
BUCKET="${REPLAY_STORAGE_BUCKET:-matchlivetv-replays}"
|
||||
KEY_NAME="${REPLAY_STORAGE_KEY_NAME:-replay-uploader}"
|
||||
CREDS_FILE="${ROOT}/garage/dev-credentials.env"
|
||||
ENV_FILE="${ROOT}/.env"
|
||||
CREDS_FILE="${CREDS_FILE:-${ROOT}/garage/dev-credentials.env}"
|
||||
ENV_FILE="${ENV_FILE:-${ROOT}/.env}"
|
||||
|
||||
compose() {
|
||||
docker compose -f "${ROOT}/${COMPOSE_FILE}" --env-file "${ENV_FILE}" "$@"
|
||||
}
|
||||
|
||||
resolve_garage_container() {
|
||||
if [ -n "$GARAGE_CONTAINER" ]; then
|
||||
return 0
|
||||
fi
|
||||
GARAGE_CONTAINER="$(docker ps --format '{{.Names}}' | grep -E 'garage-1$' | head -1 || true)"
|
||||
}
|
||||
|
||||
gexec() {
|
||||
docker exec "$GARAGE_CONTAINER" /garage "$@"
|
||||
@@ -21,7 +33,7 @@ wait_garage() {
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
echo "Garage non risponde. Avvia: cd $ROOT && docker compose up -d garage"
|
||||
echo "Garage non risponde. Avvia: cd $ROOT && docker compose -f $COMPOSE_FILE up -d garage"
|
||||
exit 1
|
||||
}
|
||||
|
||||
@@ -126,9 +138,11 @@ EOF
|
||||
|
||||
main() {
|
||||
cd "$ROOT"
|
||||
if ! docker ps --format '{{.Names}}' | grep -q "^${GARAGE_CONTAINER}$"; then
|
||||
echo "Avvio container garage..."
|
||||
docker compose up -d garage
|
||||
resolve_garage_container
|
||||
if [ -z "$GARAGE_CONTAINER" ] || ! docker ps --format '{{.Names}}' | grep -q "^${GARAGE_CONTAINER}$"; then
|
||||
echo "Avvio container garage ($COMPOSE_FILE)..."
|
||||
compose up -d garage
|
||||
resolve_garage_container
|
||||
fi
|
||||
wait_garage
|
||||
ensure_layout
|
||||
@@ -137,7 +151,7 @@ main() {
|
||||
write_credentials
|
||||
merge_into_env
|
||||
echo ""
|
||||
echo "Riavvia app: docker compose up -d rails sidekiq"
|
||||
echo "Riavvia app: docker compose -f $COMPOSE_FILE up -d rails sidekiq"
|
||||
}
|
||||
|
||||
main "$@"
|
||||
|
||||
Reference in New Issue
Block a user