✨ feat: modify Dockerfile and split compose.yaml into compose.yaml and compose.override.yaml

Author: bassemkaroui

template/{% if dockerfile %}Dockerfile{% endif %}.jinja

@@ -37,6 +37,14 @@ RUN --mount=type=cache,target=/root/.cache/uv \
 # ---------- production image ----------
 FROM python:{{ python_version }}-slim-bookworm AS prod
 
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    build-essential \
+    curl \
+    libpq-dev \
+    gcc && \
+    rm -rf /var/lib/apt/lists/*
+
 {% if not privileged_container -%}
 RUN groupadd -r {{ project_name }} && useradd -r -g {{ project_name }} -M -s /usr/sbin/nologin {{ project_name }}
 
@@ -48,18 +56,35 @@ WORKDIR /workspaces/{{ project_name }}
 # Pull in just the venv (with project code baked into site‑packages)
 COPY --from=builder {% if not privileged_container %}--chown={{ project_name }}:{{ project_name }} {% endif %}/workspaces/{{ project_name }}/.venv .venv
 
+COPY {% if not privileged_container %}--chown={{ project_name }}:{{ project_name }} {% endif %}scripts scripts
+
 ENV PATH="/workspaces/{{ project_name }}/.venv/bin:$PATH"
 
 {% if not privileged_container -%}
 USER {{ project_name }}
 {%- endif %}
 
-# CMD ["uvicorn", "{{ project_slug }}.main:app", "--host", "0.0.0.0", "--port", "8000"]
+# HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
+#     CMD curl -f http://localhost:8085/health || exit 1
+
+# EXPOSE 8085
+
+# CMD ["uvicorn", "{{ project_slug }}.main:app", "--host", "0.0.0.0", "--port", "8085"]
 # CMD ["sleep", "1000"]
 
 # ---------- development image ----------
 FROM python:{{ python_version }}-slim-bookworm AS dev
 
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    build-essential \
+    curl \
+    libpq-dev \
+    gcc \
+    git \
+    vim && \
+    rm -rf /var/lib/apt/lists/*
+
 {% if not privileged_container -%}
 RUN groupadd -g {{ gid }} {{ project_name }} && useradd -m -u {{ uid }} -g {{ gid }} -r {{ project_name }}
 
@@ -79,4 +104,9 @@ ENV PATH="/workspaces/{{ project_name }}/.venv/bin:$PATH"
 USER {{ project_name }}
 {%- endif %}
 
-# CMD ["uvicorn", "{{ project_slug }}.main:app", "--host", "0.0.0.0", "--port", "8000", "--reload"]
+# HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
+#     CMD curl -f http://localhost:8085/health || exit 1
+
+# EXPOSE 8085
+
+# CMD ["uvicorn", "{{ project_slug }}.main:app", "--host", "0.0.0.0", "--port", "8085", "--reload"]

template/{% if dockerfile %}compose.override.yaml{% endif %}.jinja

@@ -0,0 +1,28 @@
+services:
+   {{ project_name }}:
+    image: {{ project_name }}:0.0.1-devel
+    build:
+      context: .
+      dockerfile: Dockerfile
+      target: dev
+      args:
+        - ENVIRONMENT=dev
+    ports:
+      - "8001:8000"
+      - "8085:8085"
+    stdin_open: true
+    tty: true
+    command: ["sh"]
+    develop:
+      watch:
+        - action: sync
+          path: .
+          target: /workspaces/{{ project_name }}
+          ignore:
+            - .venv/
+            {%- if tox %}
+            - .tox/
+            {%- endif %}
+
+        - action: rebuild
+          path: ./pyproject.toml

template/{% if dockerfile %}compose.yaml{% endif %}.jinja

@@ -7,8 +7,6 @@ services:
       target: prod
       args:
         - ENVIRONMENT=prod
-    ports:
-      - "8000:8000"
     {%- if gpus %}
     deploy:
       resources:
@@ -18,46 +16,4 @@ services:
               count: all
               capabilities: [gpu]
     {%- endif %}
-    profiles:
-      - prod
-    restart: unless-stopped
-
-  {{ project_name }}-dev:
-    image: {{ project_name }}:0.0.1-devel
-    build:
-      context: .
-      dockerfile: Dockerfile
-      target: dev
-      args:
-        - ENVIRONMENT=dev
-    ports:
-      - "8001:8000"
-      - "8080:8080"
-    stdin_open: true
-    tty: true
-    command: ["sh"]
-    {%- if gpus %}
-    deploy:
-      resources:
-        reservations:
-          devices:
-            - driver: nvidia
-              count: all
-              capabilities: [gpu]
-    {%- endif %}
-    profiles:
-      - dev
-    develop:
-      watch:
-        - action: sync
-          path: .
-          target: /workspaces/{{ project_name }}
-          ignore:
-            - .venv/
-            {%- if tox %}
-            - .tox/
-            {%- endif %}
-
-        - action: rebuild
-          path: ./pyproject.toml
     restart: unless-stopped