fff1ed2e6d
Resolve the operational/config sprawl (#10-#14 from the review): the app read NORMOGEN_*/MONGODB_* env vars but every env/compose file set SERVER_*/DATABASE_*, the ports were all over the place (8080/8000/6500/6800), there were 5 inconsistent Dockerfiles (rust:1.82 vs rust:1.93, missing curl), and an 18 MB binary was committed. Env-var names — standardize on what the code reads: * config/mod.rs: NORMOGEN_PORT default 8080 -> 6500 (avoid the over-common 8000/8080). * db/mod.rs: create_database() now reads MONGODB_DATABASE (was DATABASE_NAME). * .env.example, defaults.env, docker-compose.yml, docker-compose.dev.yml, DEPLOYMENT_GUIDE.md, deployment/README.md, deploy-and-test-solaria.sh, deploy-local-build.sh: use NORMOGEN_HOST/NORMOGEN_PORT/MONGODB_URI/ MONGODB_DATABASE/APP_ENVIRONMENT; drop the dead SERVER_*/DATABASE_URI/ DATABASE_NAME names. Ports — canonical container port 6500 everywhere: * Both Dockerfiles EXPOSE 6500; prod compose maps 6500:6500, dev 6501:6500. * Bulk-replaced the long tail of solaria:8000/localhost:8000/localhost:8080 in docs and test scripts -> 6500. Dockerfiles — 2 canonical, rust:latest, curl + healthcheck: * backend/Dockerfile (prod): rust:latest builder, debian runtime now installs curl (so the compose HEALTHCHECK actually works), EXPOSE 6500. * backend/docker/Dockerfile.dev (dev): rust:latest both stages, EXPOSE 6500. * Deleted 3 redundant Dockerfiles (Dockerfile.improved x2, docker/Dockerfile). * Deleted the committed 18 MB binary backend/docker/normogen-backend. * Deleted 2 stray fix-notes in backend/docker/. Compose: * docker-compose.yml: correct env names, 6500:6500, APP_ENVIRONMENT=production, JWT_SECRET/ENCRYPTION_KEY required via compose interpolation, dropped the obsolete top-level version: key. * docker-compose.dev.yml: correct env names, 6501:6500, mongo:7 (was 6.0), added a working backend healthcheck. * Deleted docker/docker-compose.improved.yml + backend/deploy-to-solaria-improved.sh (built around the now-deleted 'improved' Docker files). Verified: cargo fmt --check clean, build + clippy --all-targets clean, 18 unit tests pass; grep confirms no SERVER_*/DATABASE_* env names and no rust:1.x tags remain outside docs/archive and docs/adr (historical).
66 lines
1.3 KiB
Bash
Executable file
66 lines
1.3 KiB
Bash
Executable file
#!/bin/bash
|
|
set -e
|
|
|
|
echo "========================================="
|
|
echo "Deploying Normogen to Solaria"
|
|
echo "========================================="
|
|
|
|
# Server details
|
|
SERVER="alvaro@solaria"
|
|
REMOTE_DIR="/home/alvaro/normogen"
|
|
REPO_URL="ssh://git@gitea.solivarez.com.ar/alvaro/normogen.git"
|
|
|
|
echo ""
|
|
echo "Step 1: Pushing latest changes to git..."
|
|
git push origin main
|
|
|
|
echo ""
|
|
echo "Step 2: Connecting to Solaria..."
|
|
ssh $SERVER << 'ENDSSH'
|
|
set -e
|
|
|
|
echo "Creating directory if not exists..."
|
|
mkdir -p ~/normogen
|
|
|
|
cd ~/normogen
|
|
|
|
if [ -d ".git" ]; then
|
|
echo "Pulling latest changes..."
|
|
git pull origin main
|
|
else
|
|
echo "Cloning repository..."
|
|
git clone $REPO_URL .
|
|
fi
|
|
|
|
cd backend
|
|
|
|
echo ""
|
|
echo "Step 3: Stopping existing containers..."
|
|
docker-compose down || true
|
|
|
|
echo ""
|
|
echo "Step 4: Building and starting new containers..."
|
|
docker-compose up -d --build
|
|
|
|
echo ""
|
|
echo "Step 5: Waiting for services to be healthy..."
|
|
sleep 5
|
|
|
|
echo ""
|
|
echo "Step 6: Checking container status..."
|
|
docker-compose ps
|
|
|
|
echo ""
|
|
echo "Step 7: Checking backend logs..."
|
|
docker-compose logs backend | tail -20
|
|
|
|
ENDSSH
|
|
|
|
echo ""
|
|
echo "========================================="
|
|
echo "Deployment complete!"
|
|
echo "========================================="
|
|
echo ""
|
|
echo "API is available at: http://solaria:6500"
|
|
echo "Health check: http://solaria:6500/health"
|
|
echo ""
|