Compare commits

..

1 Commits

Author SHA1 Message Date
Jack Kingsman 462ba8945f Thin out the docker image 2026-04-30 20:57:25 -07:00
3 changed files with 26 additions and 29 deletions
+22 -13
View File
@@ -9,26 +9,35 @@ COPY frontend/package.json frontend/package-lock.json frontend/.npmrc ./
RUN npm ci RUN npm ci
COPY frontend/ ./ COPY frontend/ ./
RUN VITE_COMMIT_HASH=${COMMIT_HASH} npm run build RUN VITE_COMMIT_HASH=${COMMIT_HASH} npm run build \
&& find dist -name '*.map' -delete
# Stage 2: Python runtime # Stage 2: Install Python dependencies (uv stays in this stage only)
FROM python:3.13-slim AS python-deps
WORKDIR /app
COPY --from=ghcr.io/astral-sh/uv:0.6 /uv /usr/local/bin/uv
COPY pyproject.toml uv.lock ./
RUN uv sync --frozen --no-dev
# Stage 3: Final runtime (no uv, no source maps)
FROM python:3.13-slim FROM python:3.13-slim
ARG COMMIT_HASH=unknown ARG COMMIT_HASH=unknown
WORKDIR /app WORKDIR /app
ENV COMMIT_HASH=${COMMIT_HASH} ENV COMMIT_HASH=${COMMIT_HASH} \
PATH="/app/.venv/bin:$PATH"
# Install uv # Copy installed venv from deps stage
COPY --from=ghcr.io/astral-sh/uv:0.6 /uv /usr/local/bin/uv COPY --from=python-deps /app/.venv ./.venv
# Copy dependency files first for layer caching # Copy dependency metadata (pyproject.toml needed by app for version info)
COPY pyproject.toml uv.lock ./ COPY pyproject.toml ./
# Install dependencies (no dev/test deps)
RUN uv sync --frozen --no-dev
# Copy application code # Copy application code
COPY app/ ./app/ COPY app/ ./app/
@@ -36,7 +45,7 @@ COPY app/ ./app/
# Copy license attributions # Copy license attributions
COPY LICENSES.md ./ COPY LICENSES.md ./
# Copy built frontend from first stage # Copy built frontend from first stage (source maps already stripped)
COPY --from=frontend-builder /build/dist ./frontend/dist COPY --from=frontend-builder /build/dist ./frontend/dist
# Create data directory for SQLite database # Create data directory for SQLite database
@@ -44,5 +53,5 @@ RUN mkdir -p /app/data
EXPOSE 8000 EXPOSE 8000
# Run the application (we retain root for max compatibility) # Run uvicorn directly from the venv (no uv needed at runtime)
CMD ["uv", "run", "uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"] CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]
+2 -6
View File
@@ -147,9 +147,7 @@ describe('buildRawPacketStatsSnapshot', () => {
'2-5', '2-5',
'6-10', '6-10',
'11-15', '11-15',
'16-20', '16+',
'21-31',
'32+',
]); ]);
expect(stats.hopProfile).toEqual( expect(stats.hopProfile).toEqual(
expect.arrayContaining([ expect.arrayContaining([
@@ -158,9 +156,7 @@ describe('buildRawPacketStatsSnapshot', () => {
expect.objectContaining({ label: '2-5', count: 1 }), expect.objectContaining({ label: '2-5', count: 1 }),
expect.objectContaining({ label: '6-10', count: 0 }), expect.objectContaining({ label: '6-10', count: 0 }),
expect.objectContaining({ label: '11-15', count: 0 }), expect.objectContaining({ label: '11-15', count: 0 }),
expect.objectContaining({ label: '16-20', count: 0 }), expect.objectContaining({ label: '16+', count: 0 }),
expect.objectContaining({ label: '21-31', count: 0 }),
expect.objectContaining({ label: '32+', count: 0 }),
]) ])
); );
expect(stats.hopByteWidthProfile).toEqual( expect(stats.hopByteWidthProfile).toEqual(
+2 -10
View File
@@ -322,13 +322,7 @@ function getHopProfileBucket(pathTokenCount: number): string {
if (pathTokenCount <= 15) { if (pathTokenCount <= 15) {
return '11-15'; return '11-15';
} }
if (pathTokenCount <= 20) { return '16+';
return '16-20';
}
if (pathTokenCount <= 31) {
return '21-31';
}
return '32+';
} }
export function buildRawPacketStatsSnapshot( export function buildRawPacketStatsSnapshot(
@@ -360,9 +354,7 @@ export function buildRawPacketStatsSnapshot(
['2-5', 0], ['2-5', 0],
['6-10', 0], ['6-10', 0],
['11-15', 0], ['11-15', 0],
['16-20', 0], ['16+', 0],
['21-31', 0],
['32+', 0],
]); ]);
const hopByteWidthCounts = new Map<string, number>([ const hopByteWidthCounts = new Map<string, number>([
['No path', 0], ['No path', 0],