diff --git a/.github/workflows/ci-cd-web-desktop.yml b/.github/workflows/ci-cd-web-desktop.yml index 7b0cb86..4c37369 100644 --- a/.github/workflows/ci-cd-web-desktop.yml +++ b/.github/workflows/ci-cd-web-desktop.yml @@ -154,8 +154,21 @@ jobs: - name: Acquire Convex admin key id: key run: | - CID=$(docker ps --format '{{.ID}} {{.Names}}' | awk '/sistema_convex_backend/{print $1; exit}') - if [ -z "$CID" ]; then echo "No convex container"; exit 1; fi + echo "Waiting for Convex container..." + for attempt in $(seq 1 12); do + CID=$(docker ps --format '{{.ID}} {{.Names}}' | awk '/sistema_convex_backend/{print $1; exit}') + if [ -n "$CID" ]; then + echo "Convex container ready (CID=$CID)" + break + fi + echo "Attempt $attempt: container not ready yet; sleeping 5s" + sleep 5 + done + if [ -z "$CID" ]; then + echo "No convex container" + docker service ps sistema_convex_backend || true + exit 1 + fi KEY=$(docker exec -i "$CID" /bin/sh -lc './generate_admin_key.sh' | tr -d '\r' | grep -o 'convex-self-hosted|[^ ]*' | tail -n1) echo "ADMIN_KEY=$KEY" >> $GITHUB_OUTPUT echo "Admin key acquired? $([ -n "$KEY" ] && echo yes || echo no)" @@ -383,8 +396,21 @@ jobs: - name: Acquire Convex admin key id: key run: | - CID=$(docker ps --format '{{.ID}} {{.Names}}' | awk '/sistema_convex_backend/{print $1; exit}') - if [ -z "$CID" ]; then echo "No convex container"; exit 1; fi + echo "Waiting for Convex container..." + for attempt in $(seq 1 12); do + CID=$(docker ps --format '{{.ID}} {{.Names}}' | awk '/sistema_convex_backend/{print $1; exit}') + if [ -n "$CID" ]; then + echo "Convex container ready (CID=$CID)" + break + fi + echo "Attempt $attempt: container not ready yet; sleeping 5s" + sleep 5 + done + if [ -z "$CID" ]; then + echo "No convex container" + docker service ps sistema_convex_backend || true + exit 1 + fi KEY=$(docker exec -i "$CID" /bin/sh -lc './generate_admin_key.sh' | tr -d '\r' | grep -o 'convex-self-hosted|[^ ]*' | tail -n1) echo "ADMIN_KEY=$KEY" >> $GITHUB_OUTPUT echo "Admin key acquired? $([ -n "$KEY" ] && echo yes || echo no)" @@ -521,8 +547,21 @@ jobs: - name: Acquire Convex admin key id: key run: | - CID=$(docker ps --format '{{.ID}} {{.Names}}' | awk '/sistema_convex_backend/{print $1; exit}') - if [ -z "$CID" ]; then echo "No convex container"; exit 1; fi + echo "Waiting for Convex container..." + for attempt in $(seq 1 12); do + CID=$(docker ps --format '{{.ID}} {{.Names}}' | awk '/sistema_convex_backend/{print $1; exit}') + if [ -n "$CID" ]; then + echo "Convex container ready (CID=$CID)" + break + fi + echo "Attempt $attempt: container not ready yet; sleeping 5s" + sleep 5 + done + if [ -z "$CID" ]; then + echo "No convex container" + docker service ps sistema_convex_backend || true + exit 1 + fi KEY=$(docker exec -i "$CID" /bin/sh -lc './generate_admin_key.sh' | tr -d '\r' | grep -o 'convex-self-hosted|[^ ]*' | tail -n1) echo "ADMIN_KEY=$KEY" >> $GITHUB_OUTPUT echo "Admin key acquired? $([ -n "$KEY" ] && echo yes || echo no)"