fix(Template): Docker compose (#54)

Author: mslaursen

fastapi_forge/template/{{cookiecutter.project_name}}/.env.example

@@ -5,7 +5,7 @@
 {{ cookiecutter.project_name|upper|replace('-', '_') }}_RELOAD=True
 {{ cookiecutter.project_name|upper|replace('-', '_') }}_WORKERS=1
 {% if cookiecutter.use_postgres %}
-{{ cookiecutter.project_name|upper|replace('-', '_') }}_PG_HOST={{ cookiecutter.project_name }}
+{{ cookiecutter.project_name|upper|replace('-', '_') }}_PG_HOST={{ cookiecutter.project_name }}-pg
 {{ cookiecutter.project_name|upper|replace('-', '_') }}_PG_PORT=5432
 {{ cookiecutter.project_name|upper|replace('-', '_') }}_PG_USER={{ cookiecutter.project_name }}
 {{ cookiecutter.project_name|upper|replace('-', '_') }}_PG_PASSWORD={{ cookiecutter.project_name }}
@@ -29,4 +29,7 @@
 {%- if cookiecutter.use_builtin_auth %}
 {{ cookiecutter.project_name|upper|replace('-', '_') }}_JWT_SECRET="secret"
 {{ cookiecutter.project_name|upper|replace('-', '_') }}_JWT_ALGORITHM="HS256"
+{% endif %}
+{%- if cookiecutter.use_prometheus %}
+{{ cookiecutter.project_name|upper|replace('-', '_') }}_PROMETHEUS_ENABLED=True
 {% endif %}

fastapi_forge/template/{{cookiecutter.project_name}}/docker-compose.yaml

@@ -25,39 +25,10 @@ services:
         condition: service_healthy
       {%- endif %}
     {%- endif %}
-    environment:
-      {{ cookiecutter.project_name|upper|replace('-', '_') }}_RELOAD: "True"
-      {{ cookiecutter.project_name|upper|replace('-', '_') }}_SERVER_HOST: 0.0.0.0
-      {{ cookiecutter.project_name|upper|replace('-', '_') }}_SERVER_PORT: 8000
-      {%- if cookiecutter.use_postgres %}
-      {{ cookiecutter.project_name|upper|replace('-', '_') }}_PG_HOST: {{ cookiecutter.project_name }}-pg
-      {{ cookiecutter.project_name|upper|replace('-', '_') }}_PG_PORT: 5432
-      {{ cookiecutter.project_name|upper|replace('-', '_') }}_PG_USER: {{ cookiecutter.project_name }}
-      {{ cookiecutter.project_name|upper|replace('-', '_') }}_PG_PASS: {{ cookiecutter.project_name }}
-      {{ cookiecutter.project_name|upper|replace('-', '_') }}_PG_DATABASE: {{ cookiecutter.project_name }}
-      {% endif %}
-      {%- if cookiecutter.use_redis %}
-      {{ cookiecutter.project_name|upper|replace('-', '_') }}_REDIS_HOST: "redis"
-      {{ cookiecutter.project_name|upper|replace('-', '_') }}_REDIS_PORT: 6379
-      {{ cookiecutter.project_name|upper|replace('-', '_') }}_REDIS_PASSWORD: ""
-      {{ cookiecutter.project_name|upper|replace('-', '_') }}_REDIS_MAX_CONNECTIONS: 50
-      {% endif %}
-      {%- if cookiecutter.use_rabbitmq -%}
-      {{ cookiecutter.project_name|upper|replace('-', '_') }}_RABBITMQ_HOST: "rabbitmq"
-      {{ cookiecutter.project_name|upper|replace('-', '_') }}_RABBITMQ_PORT: 5672
-      {{ cookiecutter.project_name|upper|replace('-', '_') }}_RABBITMQ_USER: "user"
-      {{ cookiecutter.project_name|upper|replace('-', '_') }}_RABBITMQ_PASSWORD: "password"
-      {{ cookiecutter.project_name|upper|replace('-', '_') }}_RABBITMQ_VHOST: "/"
-      {{ cookiecutter.project_name|upper|replace('-', '_') }}_RABBITMQ_CONNECTION_POOL_SIZE: 2
-      {{ cookiecutter.project_name|upper|replace('-', '_') }}_RABBITMQ_CHANNEL_POOL_SIZE: 10
-      {% endif %}
-      {%- if cookiecutter.use_rabbitmq -%}
-      {{ cookiecutter.project_name|upper|replace('-', '_') }}_PROMETHEUS_ENABLED: true
-      {% endif %}
     {%- if cookiecutter.use_alembic %}
     volumes:
       - ./migrations:/app/migrations
-    {% endif %}
+    {%- endif %}
     develop:
       watch:
         - action: sync
@@ -66,31 +37,27 @@ services:
         - action: sync
           path: ./tests
           target: /app/tests
-        {%- if cookiecutter.use_alembic %}
-        - action: sync
-          path: ./migrations
-          target: /app/migrations
-        {%- endif %}
         - action: rebuild
           path: pyproject.toml
         - action: rebuild
           path: uv.lock
-  {% if cookiecutter.use_taskiq %}
+  
+  {% if cookiecutter.use_taskiq -%}
   taskiq-worker:
     <<: *api
-    container_name: game_zone-taskiq-worker
+    container_name: {{ cookiecutter.project_name }}-taskiq-worker
     ports: []
     command: [ taskiq, worker, -fsd, src.services.taskiq.broker:broker, -w, "1", --max-fails, "1"]
 
   taskiq-scheduler:
     <<: *api
-    container_name: game_zone-taskiq-scheduler
+    container_name: {{ cookiecutter.project_name }}-taskiq-scheduler
     ports: []
     command: [ taskiq, scheduler, -fsd, src.services.taskiq.scheduler:scheduler ]
-  {%- endif %}
-  {% if cookiecutter.use_postgres %}
+  {% endif %}
+  {%- if cookiecutter.use_postgres %}
   postgres:
-    image: postgres:13.8-bullseye
+    image: postgres:17.4-bookworm
     hostname: {{ cookiecutter.project_name }}-pg
     container_name: {{ cookiecutter.project_name }}-pg
     environment:
@@ -123,7 +90,7 @@ services:
     volumes:
       - {{ cookiecutter.project_name }}-redis-data:/bitnami/redis/data
   {% endif %}
-  {%- if cookiecutter.use_rabbitmq -%}
+  {% if cookiecutter.use_rabbitmq -%}
   rabbitmq:
     image: rabbitmq:3.8.27-management-alpine
     container_name: {{ cookiecutter.project_name }}-rabbitmq
@@ -142,9 +109,9 @@ services:
     volumes:
       - {{ cookiecutter.project_name }}-rabbitmq-data:/var/lib/rabbitmq
   {% endif %}
-  {%- if cookiecutter.use_prometheus -%}
+  {% if cookiecutter.use_prometheus -%}
   prometheus:
-    image: prom/prometheus:latest
+    image: prom/prometheus:v3.3.0
     restart: always
     volumes:
       - ./observability/prometheus/prometheus.yaml:/etc/prometheus/prometheus.yaml
@@ -157,14 +124,11 @@ services:
 volumes:
   {%- if cookiecutter.use_postgres %}
   {{ cookiecutter.project_name }}-pg-data:
-    name: {{ cookiecutter.project_name }}-pg-data
   {%- endif %}
   {%- if cookiecutter.use_redis %}
   {{ cookiecutter.project_name }}-redis-data:
-    name: {{ cookiecutter.project_name }}-redis-data
   {% endif %}
   {%- if cookiecutter.use_rabbitmq -%}
   {{ cookiecutter.project_name }}-rabbitmq-data:
-    name: {{ cookiecutter.project_name }}-rabbitmq-data
   {% endif %}
 {%- endif %}

fastapi_forge/template/{{cookiecutter.project_name}}/src/main.py

@@ -62,6 +62,12 @@ def get_app() -> FastAPI:
     {% if cookiecutter.use_alembic %}
     logger.info("Alembic enabled - see Makefile for migration commands")
     {% endif %}
+    {%- if cookiecutter.use_prometheus %}
+    logger.info(
+        "Prometheus enabled - metrics available at /metrics, "
+        "and queryable at localhost:9090"
+    )
+    {% endif %}
     app = FastAPI(lifespan=lifespan)
     add_middleware(app)
     app.include_router(base_router)