devnet

Author: rafallltm

Diff for: app/.dockerignore

@@ -0,0 +1,7 @@
+.env
+.venv
+__pycache__/
+*.pyc
+*.pyo
+*.pyd
+.DS_Store

Diff for: app/.gitignore

@@ -1 +1,3 @@
-venv
+venv
+.env
+error.log

Diff for: app/Dockerfile renamed to app/Dockerfile.dev

@@ -4,15 +4,31 @@
 import random
 import os
 from prometheus_client import Counter, start_http_server, generate_latest
-
+from dotenv import load_dotenv
+load_dotenv()  # Carrega variáveis do .env
+import jinja2
+print(f"[SEGURANÇA] Versão do Jinja2: {jinja2.__version__}")  # Deve mostrar 3.1.6+
 
 app = Flask(__name__)
 
-redis_host = os.environ.get('REDIS_HOST', 'redis-service')
-redis_port = 6379
-redis_password = ""
+import os
+import redis
+
+# Configuração do Redis mais robusta
+redis_host = os.environ.get('REDIS_HOST', 'localhost')
+redis_port = int(os.environ.get('REDIS_PORT', 6379))
+redis_password = os.environ.get('', None)  # None evita passar string vazia
 
-r = redis.StrictRedis(host=redis_host, port=redis_port, password=redis_password, decode_responses=True)
+r = redis.Redis(
+    host=redis_host, 
+    port=redis_port, 
+    password=redis_password,  # Se não houver senha, None é seguro
+    decode_responses=True
+)
+
+
+# Configuração do Flask
+app.config['SECRET_KEY'] = os.environ.get('SECRET_KEY', 'dev-secret')
 
 senha_gerada_counter = Counter('senha_gerada', 'Contador de senhas geradas')
 
@@ -72,8 +88,30 @@ def listar_senhas():
 def metrics():
     return Response(generate_latest(), content_type='text/plain')
 
+@app.route('/healthz')
+def health_check():
+    try:
+        # Verifica conexão com Redis
+        r.ping()
+        return jsonify({
+            "status": "healthy",
+            "redis": "connected",
+            "version": "1.0.0"
+        }), 200
+    except Exception as e:
+        return jsonify({
+            "status": "unhealthy",
+            "error": str(e)
+        }), 500
+
 if __name__ == '__main__':
-    import logging
-    logging.basicConfig(filename='error.log', level=logging.DEBUG)
-    start_http_server(8088)
-    app.run(debug=False)
+    if os.environ.get('FLASK_ENV') == 'production':
+        from waitress import serve
+        serve(app, host="0.0.0.0", port=5000)
+    else:
+        app.run(
+            host='0.0.0.0',
+            port=5000,
+            debug=True,
+            use_reloader=True
+        )

Diff for: app/app.py

@@ -1,25 +1,57 @@
 services:
   app:
-    build: .
+    build:
+      context: .
+      dockerfile: Dockerfile.dev  # Dockerfile específico para dev
+    container_name: giropops-app-dev  # Nome explícito
     environment:
+      - FLASK_ENV=development
+      - FLASK_DEBUG=1
       - REDIS_HOST=redis
       - REDIS_PORT=6379
+      - PYTHONUNBUFFERED=1  # Melhora logging
     ports:
-      - 5000:5000
+      - "5000:5000"
+    volumes:
+      - .:/app
+      - /app/__pycache__  # Ignora cache
+      - /app/.venv  # Evita conflitos com venv local
     depends_on:
-      - redis
+      redis:
+        condition: service_healthy
     networks:
       - app-net
-    restart: always
-    volumes:
-      - .:/app
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:5000/healthz"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+    stdin_open: true  # Permite attach
+    tty: true        # Permite interação
+
   redis:
-    image: redis:alpine
+    image: redis:7-alpine
+    container_name: giropops-redis-dev
     ports:
-      - 6379:6379
+      - "6379:6379"
+    volumes:
+      - redis_data:/data  # Persistência mesmo em dev
     networks:
       - app-net
-    restart: always
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 5s
+      timeout: 3s
+      retries: 3
+    command: redis-server --save 60 1 --loglevel warning
+
+volumes:
+  redis_data:
+    name: giropops-redis-data-dev  # Volume nomeado
+
 networks:
   app-net:
-    driver: bridge
+    name: giropops-network-dev  # Rede nomeada
+    driver: bridge

Diff for: app/docker-compose.yaml

@@ -3,8 +3,9 @@ blinker==1.9.0
 click==8.1.8
 Flask==3.1.0
 itsdangerous==2.2.0
-Jinja2==3.1.5
+Jinja2==3.1.6
 MarkupSafe==3.0.2
 prometheus_client==0.21.1
 redis==5.2.1
 Werkzeug==3.1.3
+python-dotenv==1.1.0