diff --git a/.env.example b/.env.example index 81fdc06..870e2e7 100644 --- a/.env.example +++ b/.env.example @@ -44,14 +44,6 @@ VITE_API_BASE= # Development-only Vite host allowlist override. VITE_ALLOWED_HOSTS= -# Optional frontend build network and npm fetch tuning: -DOCKER_BUILD_NETWORK=default -NPM_REGISTRY=https://registry.npmjs.org/ -NPM_FETCH_RETRIES=5 -NPM_FETCH_RETRY_MINTIMEOUT=20000 -NPM_FETCH_RETRY_MAXTIMEOUT=120000 -NPM_FETCH_TIMEOUT=300000 - # Production baseline overrides (set explicitly for live deployments): # APP_ENV=production # HOST_BIND_IP=127.0.0.1 diff --git a/doc/operations-and-configuration.md b/doc/operations-and-configuration.md index 8947a15..e739223 100644 --- a/doc/operations-and-configuration.md +++ b/doc/operations-and-configuration.md @@ -42,24 +42,9 @@ Tail logs: docker compose logs -f ``` -## Frontend Build Network Resilience +## Frontend Build Baseline -The frontend Dockerfile uses `node:22-slim` by default for improved npm network compatibility on IPv4-only Linux hosts. - -The frontend image build supports npm fetch tuning through environment-driven compose build args: - -- `NPM_REGISTRY` (default `https://registry.npmjs.org/`) -- `NPM_FETCH_RETRIES` (default `5`) -- `NPM_FETCH_RETRY_MINTIMEOUT` (default `20000`) -- `NPM_FETCH_RETRY_MAXTIMEOUT` (default `120000`) -- `NPM_FETCH_TIMEOUT` (default `300000`) -- `DOCKER_BUILD_NETWORK` (default `default`; set to `host` on Linux hosts when bridge-network npm fetches time out) - -If frontend dependency downloads fail with npm `ETIMEDOUT` during `docker compose build`, keep defaults first, then try: - -```bash -DOCKER_BUILD_NETWORK=host docker compose build --no-cache frontend -``` +The frontend Dockerfile uses `node:22-slim` with a standard `npm ci --no-audit` install step and no npm-specific build tuning flags. ## Authentication Model diff --git a/docker-compose.yml b/docker-compose.yml index 03c1c45..01f8db1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -144,14 +144,8 @@ services: build: context: ./frontend target: ${APP_ENV:-development} - network: ${DOCKER_BUILD_NETWORK:-default} args: VITE_API_BASE: ${VITE_API_BASE:-} - NPM_REGISTRY: ${NPM_REGISTRY:-https://registry.npmjs.org/} - NPM_FETCH_RETRIES: ${NPM_FETCH_RETRIES:-5} - NPM_FETCH_RETRY_MINTIMEOUT: ${NPM_FETCH_RETRY_MINTIMEOUT:-20000} - NPM_FETCH_RETRY_MAXTIMEOUT: ${NPM_FETCH_RETRY_MAXTIMEOUT:-120000} - NPM_FETCH_TIMEOUT: ${NPM_FETCH_TIMEOUT:-300000} environment: VITE_API_BASE: ${VITE_API_BASE:-} CORS_ORIGINS: '${CORS_ORIGINS:-["http://localhost:5173","http://localhost:3000"]}' diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 73f152e..38910bc 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,21 +1,10 @@ FROM node:22-slim AS base -ARG NPM_REGISTRY=https://registry.npmjs.org/ -ARG NPM_FETCH_RETRIES=5 -ARG NPM_FETCH_RETRY_MINTIMEOUT=20000 -ARG NPM_FETCH_RETRY_MAXTIMEOUT=120000 -ARG NPM_FETCH_TIMEOUT=300000 - WORKDIR /app COPY package.json /app/package.json COPY package-lock.json /app/package-lock.json -RUN npm config set registry "${NPM_REGISTRY}" \ - && npm config set fetch-retries "${NPM_FETCH_RETRIES}" \ - && npm config set fetch-retry-mintimeout "${NPM_FETCH_RETRY_MINTIMEOUT}" \ - && npm config set fetch-retry-maxtimeout "${NPM_FETCH_RETRY_MAXTIMEOUT}" \ - && npm config set fetch-timeout "${NPM_FETCH_TIMEOUT}" \ - && NODE_OPTIONS=--dns-result-order=ipv4first npm ci --no-audit \ +RUN npm ci --no-audit \ && chown -R node:node /app COPY --chown=node:node tsconfig.json /app/tsconfig.json