Skip to content

Commit

Permalink
suggested fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
phildum committed Jan 15, 2025
1 parent 55968c2 commit 656a259
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
5 changes: 3 additions & 2 deletions deploy/docker/dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,13 @@ COPY src ./src/
FROM build-base AS dev-image
ARG ENV_SECRETS="runtime-secrets"
ARG LITESTAR_APP="app.asgi:create_app"
ARG VITE_USE_SERVER_LIFESPAN="false"
ARG VITE_USE_SERVER_LIFESPAN="true"
ARG SAQ_USE_SERVER_LIFESPAN="false"
## --------------------------- standardize execution env ----------------------------- ##
ENV PATH="/workspace/app/.venv/bin:$PATH" \
VIRTUAL_ENV="/workspace/app/.venv" \
ENV_SECRETS="${ENV_SECRETS}" \
VITE_DEV_MODE=True \
VITE_USE_SERVER_LIFESPAN="${VITE_USE_SERVER_LIFESPAN}" \
SAQ_USE_SERVER_LIFESPAN="${SAQ_USE_SERVER_LIFESPAN}" \
PIP_DEFAULT_TIMEOUT=100 \
Expand All @@ -91,7 +92,7 @@ COPY tests/ tests/
COPY src src/
RUN uv sync ${UV_INSTALL_ARGS}
STOPSIGNAL SIGINT
EXPOSE 8000
EXPOSE 8080
ENTRYPOINT ["tini","--" ]
CMD [ "litestar","run","--host","0.0.0.0"]
VOLUME /workspace/app
5 changes: 1 addition & 4 deletions docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@ services:
- "8080:8080"
- "3006:3006"
tty: true
environment:
VITE_USE_SERVER_LIFESPAN: "true" # true in dev or run
SAQ_USE_SERVER_LIFESPAN: "false"
command: litestar run --reload --host 0.0.0.0 --port 8000
command: litestar run --reload --host 0.0.0.0 --port 8080
restart: always
<<: *development-volumes
worker:
Expand Down
4 changes: 2 additions & 2 deletions src/app/config/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ class ServerSettings:

HOST: str = field(default_factory=get_env("LITESTAR_HOST", "0.0.0.0")) # noqa: S104
"""Server network host."""
PORT: int = field(default_factory=get_env("LITESTAR_PORT", 8000))
PORT: int = field(default_factory=get_env("LITESTAR_PORT", 8080))
"""Server port."""
KEEPALIVE: int = field(default_factory=get_env("LITESTAR_KEEPALIVE", 65))
"""Seconds to hold connections open (65 is > AWS lb idle timeout)."""
Expand Down Expand Up @@ -347,7 +347,7 @@ class AppSettings:

APP_LOC: str = "app.asgi:create_app"
"""Path to app executable, or factory."""
URL: str = field(default_factory=get_env("APP_URL", "http://localhost:8000"))
URL: str = field(default_factory=get_env("APP_URL", "http://localhost:8080"))
"""The frontend base URL"""
DEBUG: bool = field(default_factory=get_env("LITESTAR_DEBUG", False))
"""Run `Litestar` with `debug=True`."""
Expand Down

0 comments on commit 656a259

Please sign in to comment.