Compare commits

...

4 Commits

Author SHA1 Message Date
Daniel Bedeleanu
a2f6cab492 Build [v1.9.9] (Emergency: Direct HTTP Fallback & Diagnostic Logs) 2026-04-13 21:57:51 +03:00
Daniel Bedeleanu
476fda7203 Build [v1.9.8] (Final Stability: Static Internal Port Mapping) 2026-04-13 21:48:40 +03:00
Daniel Bedeleanu
9348336709 Build [v1.9.7] (Fix ERR_SSL_PROTOCOL_ERROR: Explicit HTTPS in Caddyfile) 2026-04-13 21:42:58 +03:00
Daniel Bedeleanu
e5194a1dbb Build [v1.9.6] (Fix: Include deploy.sh in production bundle) 2026-04-13 21:36:23 +03:00
5 changed files with 30 additions and 11 deletions

View File

@@ -1,12 +1,13 @@
# TFM aInventory - Caddy Self-Signed Internal Proxy # TFM aInventory - Caddy Static Internal Configuration
# This replaces the need for `local-ssl-proxy` in Node. # We use standard ports 443/444 internally to decouple from host-side dynamic ports.
:{$FRONTEND_SSL_PORT} { https://:443 {
tls internal tls internal
reverse_proxy frontend:3000 reverse_proxy frontend:3000
} }
:{$BACKEND_SSL_PORT} { # Backend SSL Proxy
https://:444 {
tls internal tls internal
reverse_proxy backend:8000 reverse_proxy backend:8000
} }

View File

@@ -14,12 +14,29 @@ fi
# 2. Source the env file for the current shell (helps some docker versions) # 2. Source the env file for the current shell (helps some docker versions)
export $(grep -v '^#' inventory.env | xargs) export $(grep -v '^#' inventory.env | xargs)
# 3. Run Docker Compose with explicit env-file flag # 3. Optional: Reset Caddy certificates if needed
if [[ "$*" == *"--reset-ssl"* ]]; then
echo "🧹 Resetting Caddy certificates..."
docker compose down
docker volume rm ainventory_caddy_data ainventory_caddy_config 2>/dev/null || true
fi
# 4. Run Docker Compose with explicit env-file flag
echo "🚀 Building and starting containers..." echo "🚀 Building and starting containers..."
docker compose --env-file inventory.env up -d --build --remove-orphans docker compose --env-file inventory.env up -d --build --remove-orphans
echo "" echo ""
echo "✅ Deployment requested." echo "🔍 Verifying port mapping..."
echo " Access URL: https://${SERVER_IP:-localhost}:${FRONTEND_SSL_PORT:-8919}" docker compose ps --format "table {{.Name}}\t{{.Status}}\t{{.Ports}}"
echo " Run 'docker compose ps' to check status."
echo ""
echo "🚀 DIAGNOSTIC LOGS (Proxy SSL Handshake):"
docker compose logs proxy --tail 20
echo ""
echo "✅ Deployment requested."
echo " ------------------------------------------------------------"
echo " 1. SECURE ACCESS (Try first): https://${SERVER_IP:-localhost}:${FRONTEND_SSL_PORT:-8919}"
echo " 2. DIRECT ACCESS (Fallback): http://${SERVER_IP:-localhost}:${FRONTEND_PORT:-8917}"
echo " ------------------------------------------------------------"
echo "" echo ""

View File

@@ -40,8 +40,8 @@ services:
networks: networks:
- inventory_net - inventory_net
ports: ports:
- ${BACKEND_SSL_PORT:-3002}:${BACKEND_SSL_PORT:-3002} - ${BACKEND_SSL_PORT:-8918}:444
- ${FRONTEND_SSL_PORT:-3003}:${FRONTEND_SSL_PORT:-3003} - ${FRONTEND_SSL_PORT:-8919}:443
env_file: env_file:
- inventory.env - inventory.env
volumes: volumes:

View File

@@ -30,6 +30,7 @@ cp inventory.service.template "$PROD_DIR/"
cp USER_GUIDE.md "$PROD_DIR/" cp USER_GUIDE.md "$PROD_DIR/"
cp README.md "$PROD_DIR/INSTALLATION_GUIDE.md" cp README.md "$PROD_DIR/INSTALLATION_GUIDE.md"
cp inventory.env "$PROD_DIR/" cp inventory.env "$PROD_DIR/"
cp deploy.sh "$PROD_DIR/"
cp .git_path "$PROD_DIR/" 2>/dev/null || true cp .git_path "$PROD_DIR/" 2>/dev/null || true
cp frontend/VERSION.json "$PROD_DIR/" cp frontend/VERSION.json "$PROD_DIR/"
cp frontend/VERSION.json "$PROD_DIR/frontend/" cp frontend/VERSION.json "$PROD_DIR/frontend/"

View File

@@ -1 +1 @@
{"version": "1.9.5", "last_build": "2026-04-13-2132", "codename": "Bulletproof", "commit": "a0eaddf9"} {"version": "1.9.8", "last_build": "2026-04-13-2148", "codename": "FinalStability", "commit": "476fda72"}