From 8152d508d17b62c2b89ab53f79ae8135d8e940ed Mon Sep 17 00:00:00 2001 From: saravanakumardb1 Date: Mon, 13 Apr 2026 14:05:54 -0700 Subject: [PATCH] fix(docker): .docker-deps COPY + optional secret + .npmrc.docker simplification - Dockerfiles: COPY .docker-deps/ for tarball resolution, make secret read optional - .npmrc.docker: remove scoped registry (tarballs handle all @bytelyst/* resolution) --- .npmrc.docker | 5 +++-- backend/Dockerfile | 3 ++- web/Dockerfile | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.npmrc.docker b/.npmrc.docker index c49eb1c..b4fabd8 100644 --- a/.npmrc.docker +++ b/.npmrc.docker @@ -1,3 +1,4 @@ -@bytelyst:registry=http://${GITEA_NPM_HOST}:3300/api/packages/bytelyst/npm/ -//${GITEA_NPM_HOST}:3300/api/packages/bytelyst/npm/:_authToken=${GITEA_NPM_TOKEN} strict-ssl=false +# @bytelyst/* packages resolved via file: tarballs from .docker-deps/ +# No registry needed when using docker-prep.sh + diff --git a/backend/Dockerfile b/backend/Dockerfile index cbab289..a25cfab 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -10,9 +10,10 @@ RUN npm config set strict-ssl false \ && npm install -g pnpm@10.6.5 COPY .npmrc.docker ./.npmrc +COPY .docker-deps/ /app/.docker-deps/ COPY backend/package.json ./package.json RUN --mount=type=secret,id=gitea_npm_token \ - export GITEA_NPM_TOKEN="$(cat /run/secrets/gitea_npm_token)" && \ + export GITEA_NPM_TOKEN="$(cat /run/secrets/gitea_npm_token 2>/dev/null || echo '')" && \ pnpm install --ignore-scripts --lockfile=false COPY backend/tsconfig.json ./tsconfig.json diff --git a/web/Dockerfile b/web/Dockerfile index 221fa4f..79cac3b 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -10,9 +10,10 @@ RUN npm config set strict-ssl false \ && npm install -g pnpm@10.6.5 COPY .npmrc.docker ./.npmrc +COPY .docker-deps/ /app/.docker-deps/ COPY web/package.json ./package.json RUN --mount=type=secret,id=gitea_npm_token \ - export GITEA_NPM_TOKEN="$(cat /run/secrets/gitea_npm_token)" && \ + export GITEA_NPM_TOKEN="$(cat /run/secrets/gitea_npm_token 2>/dev/null || echo '')" && \ pnpm install --ignore-scripts --lockfile=false COPY web/next.config.ts ./next.config.ts