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)
This commit is contained in:
parent
c1972ef0d0
commit
8152d508d1
@ -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
|
strict-ssl=false
|
||||||
|
# @bytelyst/* packages resolved via file: tarballs from .docker-deps/
|
||||||
|
# No registry needed when using docker-prep.sh
|
||||||
|
|
||||||
|
|||||||
@ -10,9 +10,10 @@ RUN npm config set strict-ssl false \
|
|||||||
&& npm install -g pnpm@10.6.5
|
&& npm install -g pnpm@10.6.5
|
||||||
|
|
||||||
COPY .npmrc.docker ./.npmrc
|
COPY .npmrc.docker ./.npmrc
|
||||||
|
COPY .docker-deps/ /app/.docker-deps/
|
||||||
COPY backend/package.json ./package.json
|
COPY backend/package.json ./package.json
|
||||||
RUN --mount=type=secret,id=gitea_npm_token \
|
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
|
pnpm install --ignore-scripts --lockfile=false
|
||||||
|
|
||||||
COPY backend/tsconfig.json ./tsconfig.json
|
COPY backend/tsconfig.json ./tsconfig.json
|
||||||
|
|||||||
@ -10,9 +10,10 @@ RUN npm config set strict-ssl false \
|
|||||||
&& npm install -g pnpm@10.6.5
|
&& npm install -g pnpm@10.6.5
|
||||||
|
|
||||||
COPY .npmrc.docker ./.npmrc
|
COPY .npmrc.docker ./.npmrc
|
||||||
|
COPY .docker-deps/ /app/.docker-deps/
|
||||||
COPY web/package.json ./package.json
|
COPY web/package.json ./package.json
|
||||||
RUN --mount=type=secret,id=gitea_npm_token \
|
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
|
pnpm install --ignore-scripts --lockfile=false
|
||||||
|
|
||||||
COPY web/next.config.ts ./next.config.ts
|
COPY web/next.config.ts ./next.config.ts
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user