chore: cleanup

Author: Harshal6927

GEMINI.md

@@ -22,3 +22,17 @@ stop-infra:
 	docker compose -f $(INFRA_COMPOSE_FILE) down
 	@echo "Infrastructure stopped. ✅"
 {% endif %}
+
+{% if docker %}
+.PHONY: start
+start:
+	@echo "Starting application with Docker... 🔄"
+	docker compose up -d
+	@echo "Application started. ✅"
+
+.PHONY: stop
+stop:
+	@echo "Stopping application with Docker... 🔄
+	docker compose down
+	@echo "Application stopped. ✅"
+{% endif %}

src/Litestar/Config/Makefile.jinja

@@ -2,6 +2,25 @@
 
 A Litestar application generated with [litestar-start](https://github.com/Harshal6927/litestar-start).
 
+{% if docker and database.value not in ['None', 'SQLite'] %}
+## Docker start
+
+> NOTE: Ensure dev infra is stopped by `make stop-infra`
+
+Create migrations:
+
+```bash
+litestar database init
+litestar database make-migrations
+```
+
+Build and run the Docker containers:
+
+```bash
+make start
+```
+{% endif %}
+
 ## Features
 
 - ⚡ **Litestar** - High-performance ASGI framework

src/Litestar/Config/README.md.jinja

@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.12
+ARG PYTHON_VERSION=3.13
 
 # ------------------------------------------------------------------------------
 # Base stage
@@ -10,7 +10,9 @@ RUN apt-get update \
     && apt-get install -y --no-install-recommends tini \
     && apt-get autoremove -y \
     && apt-get clean -y \
-    && rm -rf /var/lib/apt/lists/* \
+    && rm -rf /root/.cache \
+    && rm -rf /var/apt/lists/* \
+    && rm -rf /var/cache/apt/* \
     && mkdir -p /workspace/app
 
 # Install uv
@@ -23,11 +25,10 @@ WORKDIR /workspace/app
 # ------------------------------------------------------------------------------
 FROM base AS builder
 
-COPY pyproject.toml ./
-RUN uv sync --no-dev --frozen --no-install-project
-
 COPY . .
 
+RUN uv sync --no-dev --frozen --no-install-project
+
 # ------------------------------------------------------------------------------
 # Runtime stage
 # ------------------------------------------------------------------------------
@@ -53,5 +54,8 @@ RUN addgroup --system --gid 65532 appgroup \
 USER appuser
 EXPOSE 8000
 
-ENTRYPOINT ["tini", "--"]
-CMD ["litestar", "run", "--host", "0.0.0.0", "--port", "8000"]
+{% if advanced_alchemy %}
+CMD ["sh", "-c", "litestar database upgrade --no-prompt && exec tini -- litestar run --host 0.0.0.0 --port 8000"]
+{% else %}
+CMD ["sh", "-c", "exec tini -- litestar run --host 0.0.0.0 --port 8000"]
+{% endif %}

src/Litestar/Containers/Dockerfile.jinja

@@ -1,14 +1,14 @@
 services:
-{% if database.value == "PostgreSQL" %}
+  {% if database.value == "PostgreSQL" %}
   postgres:
     image: postgres:17.7-alpine3.23
-    container_name: {{ project_slug }}_postgres_db
+    container_name: {{ project_slug }}_postgres_dev_db
     environment:
       POSTGRES_DB: mydb
       POSTGRES_USER: myuser
       POSTGRES_PASSWORD: mypassword
     volumes:
-      - {{ project_slug }}_postgres_db:/var/lib/postgresql/data
+      - {{ project_slug }}_postgres_dev_db:/var/lib/postgresql/data
     ports:
       - "5432:5432"
     healthcheck:
@@ -19,18 +19,18 @@ services:
     restart: unless-stopped
 
 volumes:
-  {{ project_slug }}_postgres_db: {}
-{% elif database.value == "MySQL" %}
+  {{ project_slug }}_postgres_dev_db: {}
+  {% elif database.value == "MySQL" %}
   mysql:
     image: mysql:8.4.8-oraclelinux9
-    container_name: {{ project_slug }}_mysql_db
+    container_name: {{ project_slug }}_mysql_dev_db
     environment:
       MYSQL_DATABASE: mydb
       MYSQL_USER: myuser
       MYSQL_PASSWORD: mypassword
       MYSQL_ROOT_PASSWORD: rootpassword
     volumes:
-      - {{ project_slug }}_mysql_db:/var/lib/mysql
+      - {{ project_slug }}_mysql_dev_db:/var/lib/mysql
     ports:
       - "3306:3306"
     healthcheck:
@@ -41,5 +41,5 @@ volumes:
     restart: unless-stopped
 
 volumes:
-  {{ project_slug }}_mysql_db: {}
-{% endif %}
+  {{ project_slug }}_mysql_dev_db: {}
+  {% endif %}

src/Litestar/Containers/docker-compose.infra.yml.jinja

@@ -9,38 +9,38 @@ services:
     environment:
       - APP_ENV=production
       - DEBUG=false
-{% if has_database %}
-{% if database.value == "PostgreSQL" %}
+    {% if has_database %}
+      {% if database.value == "PostgreSQL" %}
       - DATABASE_URL=postgresql+psycopg://myuser:mypassword@postgres:5432/mydb
-{% elif database.value == "MySQL" %}
+      {% elif database.value == "MySQL" %}
       - DATABASE_URL=mysql+asyncmy://myuser:mypassword@mysql:3306/mydb
-{% elif database.value == "SQLite" %}
+      {% elif database.value == "SQLite" %}
       - DATABASE_URL=sqlite+aiosqlite:///./app.db
-{% endif %}
-{% endif %}
+      {% endif %}
+    {% endif %}
     env_file:
       - .env
-{% if database.value == "PostgreSQL" %}
+    {% if database.value == "PostgreSQL" %}
     depends_on:
       postgres:
         condition: service_healthy
-{% elif database.value == "MySQL" %}
+    {% elif database.value == "MySQL" %}
     depends_on:
       mysql:
         condition: service_healthy
-{% endif %}
+    {% endif %}
     restart: unless-stopped
 
-{% if database.value == "PostgreSQL" %}
+  {% if database.value == "PostgreSQL" %}
   postgres:
-    image: postgres:17-alpine
-    container_name: {{ project_slug }}_postgres
+    image: postgres:17.7-alpine3.23
+    container_name: {{ project_slug }}_postgres_db
     environment:
       POSTGRES_DB: mydb
       POSTGRES_USER: myuser
       POSTGRES_PASSWORD: mypassword
     volumes:
-      - postgres_data:/var/lib/postgresql/data
+      - {{ project_slug }}_postgres_db:/var/lib/postgresql/data
     ports:
       - "5432:5432"
     healthcheck:
@@ -49,17 +49,17 @@ services:
       timeout: 5s
       retries: 5
     restart: unless-stopped
-{% elif database.value == "MySQL" %}
+  {% elif database.value == "MySQL" %}
   mysql:
-    image: mysql:8.0
-    container_name: {{ project_slug }}_mysql
+    image: mysql:8.4.8-oraclelinux9
+    container_name: {{ project_slug }}_mysql_db
     environment:
       MYSQL_DATABASE: mydb
       MYSQL_USER: myuser
       MYSQL_PASSWORD: mypassword
       MYSQL_ROOT_PASSWORD: rootpassword
     volumes:
-      - mysql_data:/var/lib/mysql
+      - {{ project_slug }}_mysql_db:/var/lib/mysql
     ports:
       - "3306:3306"
     healthcheck:
@@ -68,12 +68,12 @@ services:
       timeout: 5s
       retries: 5
     restart: unless-stopped
-{% endif %}
+  {% endif %}
 
 {% if database.value == "PostgreSQL" %}
 volumes:
-  postgres_data: {}
+  {{ project_slug }}_postgres_db: {}
 {% elif database.value == "MySQL" %}
 volumes:
-  mysql_data: {}
+  {{ project_slug }}_mysql_db: {}
 {% endif %}

src/Litestar/Containers/docker-compose.yml.jinja

@@ -204,6 +204,13 @@ def run_post_generation_setup(generator: ProjectGenerator, output_dir: Path) ->
             )
         console.print("[bold green]✓[/bold green] Docker infrastructure started")
 
+    # Create .dockerignore from .gitignore
+    if config.docker:
+        gitignore = output_dir / ".gitignore"
+        dockerignore = output_dir / ".dockerignore"
+        if gitignore.exists():
+            shutil.copy(gitignore, dockerignore)
+
     # Run plugin post-generation hooks
     generator.post_generate()
 
@@ -212,7 +219,6 @@ def run_post_generation_setup(generator: ProjectGenerator, output_dir: Path) ->
     env_file = output_dir / ".env"
     if env_example.exists():
         shutil.copy(env_example, env_file)
-        console.print("[bold green]✓[/bold green] Created .env from .env.example")
 
     # Ask if user wants to start the application
     console.print()