From 7723ab4a9517724fab7f374221bd6295d986e42c Mon Sep 17 00:00:00 2001 From: 9qeklajc Date: Tue, 6 Jan 2026 11:48:53 +0100 Subject: [PATCH] update build script --- .github/workflows/test.yml | 17 +++++++++++------ ui/Dockerfile | 11 ++++++++--- ui/Dockerfile.build | 8 +++++--- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ae676584..611a9df2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -59,25 +59,30 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - name: Setup pnpm + uses: pnpm/action-setup@v4 + with: + version: 10 + - name: Setup Node.js uses: actions/setup-node@v4 with: node-version: "18" - cache: "npm" - cache-dependency-path: ui/package-lock.json + cache: "pnpm" + cache-dependency-path: ui/pnpm-lock.yaml - name: Install UI dependencies working-directory: ./ui - run: npm ci + run: pnpm install --frozen-lockfile - name: Run UI format check working-directory: ./ui - run: npm run format-check + run: pnpm run format-check - name: Run UI linting working-directory: ./ui - run: npm run lint + run: pnpm run lint - name: Run UI build working-directory: ./ui - run: npm run build + run: pnpm run build diff --git a/ui/Dockerfile b/ui/Dockerfile index 732ba1fc..11caad5f 100644 --- a/ui/Dockerfile +++ b/ui/Dockerfile @@ -4,17 +4,22 @@ FROM base AS deps RUN apk add --no-cache libc6-compat WORKDIR /app -COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* .npmrc* ./ -RUN npm i +RUN corepack enable pnpm && corepack prepare pnpm@latest --activate + +COPY package.json pnpm-lock.yaml* ./ +RUN pnpm install --frozen-lockfile FROM base AS builder WORKDIR /app + +RUN corepack enable pnpm && corepack prepare pnpm@latest --activate + COPY --from=deps /app/node_modules ./node_modules COPY . . ENV NEXT_TELEMETRY_DISABLED=1 -RUN npm run build +RUN pnpm run build FROM base AS runner WORKDIR /app diff --git a/ui/Dockerfile.build b/ui/Dockerfile.build index ee7d50d7..746f2c1c 100644 --- a/ui/Dockerfile.build +++ b/ui/Dockerfile.build @@ -6,12 +6,14 @@ RUN apk add --no-cache libc6-compat WORKDIR /app # Copy package files -COPY package.json package-lock.json* pnpm-lock.yaml* ./ -RUN npm ci +COPY package.json pnpm-lock.yaml* ./ +RUN corepack enable pnpm && corepack prepare pnpm@latest --activate +RUN pnpm install --frozen-lockfile # Build the UI FROM base AS builder WORKDIR /app +RUN corepack enable pnpm && corepack prepare pnpm@latest --activate COPY --from=deps /app/node_modules ./node_modules COPY . . @@ -27,7 +29,7 @@ ENV NODE_ENV=production ENV NEXT_TELEMETRY_DISABLED=1 # Build the application -RUN npm run build && \ +RUN pnpm run build && \ echo "UI build completed at $(date)" # Use the builder stage as the final stage