From 602d22081ba63e3ed70f97344c15141e7d88136f Mon Sep 17 00:00:00 2001 From: DeWitt Gibson Date: Mon, 22 Jun 2026 17:48:35 -0700 Subject: [PATCH] fix: Dockerfile --- azure-pipelines/agentbase-deploy.yml | 4 ++-- packages/ai-service/Dockerfile | 8 ++++---- packages/core/Dockerfile | 6 +++--- packages/frontend/Dockerfile | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/azure-pipelines/agentbase-deploy.yml b/azure-pipelines/agentbase-deploy.yml index cb6dd02..ed39e6e 100644 --- a/azure-pipelines/agentbase-deploy.yml +++ b/azure-pipelines/agentbase-deploy.yml @@ -81,10 +81,10 @@ stages: displayName: 'App lint, tests & audit' steps: - checkout: self - - task: NodeTool@0 + - task: UseNode@1 displayName: 'Use Node.js 20' inputs: - versionSpec: '20.x' + version: '20.x' - task: NpmAuthenticate@0 displayName: 'Authenticate npm → Azure Artifacts' inputs: diff --git a/packages/ai-service/Dockerfile b/packages/ai-service/Dockerfile index 5be8676..789c8f8 100644 --- a/packages/ai-service/Dockerfile +++ b/packages/ai-service/Dockerfile @@ -1,5 +1,5 @@ # ---- Build Stage ---- -FROM mcr.microsoft.com/cbl-mariner/base/python:3.12 AS builder +FROM mcr.microsoft.com/azurelinux/base/python:3.12 AS builder WORKDIR /app COPY packages/ai-service/requirements.txt . @@ -11,13 +11,13 @@ RUN pip install --no-cache-dir \ --target=/deps -r requirements.txt # ---- Production Stage ---- -FROM mcr.microsoft.com/cbl-mariner/base/python:3.12 AS production +FROM mcr.microsoft.com/azurelinux/base/python:3.12 AS production WORKDIR /app +RUN tdnf install -y wget shadow-utils && tdnf clean all RUN groupadd -r agentbase && useradd -r -g agentbase -s /sbin/nologin -M agentbase -RUN tdnf install -y wget -COPY --from=builder /deps /usr/local/lib/python3.12/site-packages +COPY --from=builder /deps /usr/lib/python3.12/site-packages COPY packages/ai-service/app ./app USER agentbase diff --git a/packages/core/Dockerfile b/packages/core/Dockerfile index 77b4858..9908566 100644 --- a/packages/core/Dockerfile +++ b/packages/core/Dockerfile @@ -1,5 +1,5 @@ # ---- Build Stage ---- -FROM mcr.microsoft.com/cbl-mariner/base/nodejs:20 AS builder +FROM mcr.microsoft.com/azurelinux/base/nodejs:20 AS builder WORKDIR /app # Install pnpm @@ -28,11 +28,11 @@ WORKDIR /app/packages/core RUN npx nest build # ---- Production Stage ---- -FROM mcr.microsoft.com/cbl-mariner/base/nodejs:20 AS production +FROM mcr.microsoft.com/azurelinux/base/nodejs:20 AS production WORKDIR /app RUN corepack enable && corepack prepare pnpm@9 --activate -RUN tdnf install -y wget +RUN tdnf install -y wget shadow-utils && tdnf clean all # Copy built app COPY --from=builder /app/packages/core/dist ./dist diff --git a/packages/frontend/Dockerfile b/packages/frontend/Dockerfile index 25b9f07..98656ec 100644 --- a/packages/frontend/Dockerfile +++ b/packages/frontend/Dockerfile @@ -1,5 +1,5 @@ # ---- Build Stage ---- -FROM mcr.microsoft.com/cbl-mariner/base/nodejs:20 AS builder +FROM mcr.microsoft.com/azurelinux/base/nodejs:20 AS builder WORKDIR /app RUN corepack enable && corepack prepare pnpm@9 --activate @@ -30,10 +30,10 @@ ENV NEXT_PUBLIC_AI_URL=$NEXT_PUBLIC_AI_URL RUN npx next build # ---- Production Stage ---- -FROM mcr.microsoft.com/cbl-mariner/base/nodejs:20 AS production +FROM mcr.microsoft.com/azurelinux/base/nodejs:20 AS production WORKDIR /app -RUN tdnf install -y wget +RUN tdnf install -y wget shadow-utils && tdnf clean all COPY --from=builder /app/packages/frontend/.next/standalone ./ COPY --from=builder /app/packages/frontend/.next/static ./.next/static