Correct mirror hostname to soroushasadi.com, HTTP protocol
Previous commit introduced a typo (soroushasad vs soroushasadi). All references now use: npm -> http://mirror.soroushasadi.com/repository/npm-group/ docker -> mirror.soroushasadi.com/repository/docker-group/ (no protocol in image refs) Also restore Dockerfile ARG NPM_TOKEN + COPY .npmrc that were lost when the soroush-cicd skill regenerated the file, and set the NODE_IMAGE ARG default back to the mirror path. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -30,7 +30,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Docker Build Test
|
- name: Docker Build Test
|
||||||
env:
|
env:
|
||||||
NODE_IMAGE: mirror.soroushasad.com/repository/docker-group/node:20-slim
|
NODE_IMAGE: mirror.soroushasadi.com/repository/docker-group/node:20-slim
|
||||||
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
|
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
|
||||||
run: |
|
run: |
|
||||||
docker build \
|
docker build \
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Build Container
|
- name: Build Container
|
||||||
env:
|
env:
|
||||||
NODE_IMAGE: mirror.soroushasad.com/repository/docker-group/node:20-slim
|
NODE_IMAGE: mirror.soroushasadi.com/repository/docker-group/node:20-slim
|
||||||
run: |
|
run: |
|
||||||
docker compose build
|
docker compose build
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# the registry.npmjs.org hosts found in package-lock.json to this mirror at
|
# the registry.npmjs.org hosts found in package-lock.json to this mirror at
|
||||||
# install time (default replace-registry-host=npmjs), so the committed lockfile
|
# install time (default replace-registry-host=npmjs), so the committed lockfile
|
||||||
# is reused as-is — no regeneration needed.
|
# is reused as-is — no regeneration needed.
|
||||||
registry=http://mirror.soroushasad.com/repository/npm-group/
|
registry=http://mirror.soroushasadi.com/repository/npm-group/
|
||||||
|
|
||||||
# Auth is never committed. CI and the Docker build append an `_authToken` line
|
# Auth is never committed. CI and the Docker build append an `_authToken` line
|
||||||
# from the NPM_TOKEN secret at install time; for local installs put the token in
|
# from the NPM_TOKEN secret at install time; for local installs put the token in
|
||||||
|
|||||||
+6
-6
@@ -1,10 +1,10 @@
|
|||||||
# All base images flow through the Nexus docker-group proxy, which aggregates
|
# All base images flow through the Nexus docker-group proxy, which aggregates
|
||||||
# Docker Hub, Microsoft Container Registry (mcr.microsoft.com) and GitHub
|
# Docker Hub, Microsoft Container Registry (mcr.microsoft.com) and GitHub
|
||||||
# Container Registry (ghcr.io) behind one path — any upstream image is reachable
|
# Container Registry (ghcr.io) behind one path — any upstream image is reachable
|
||||||
# as mirror.soroushasad.com/repository/docker-group/<image>.
|
# as mirror.soroushasadi.com/repository/docker-group/<image>.
|
||||||
# Build directly against Docker Hub instead with:
|
# Build directly against Docker Hub instead with:
|
||||||
# --build-arg NODE_IMAGE=node:20-slim
|
# --build-arg NODE_IMAGE=node:20-slim
|
||||||
ARG NODE_IMAGE=node:20-slim
|
ARG NODE_IMAGE=mirror.soroushasadi.com/repository/docker-group/node:20-slim
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# 1. Dependencies — installs node_modules and compiles the better-sqlite3
|
# 1. Dependencies — installs node_modules and compiles the better-sqlite3
|
||||||
# native addon (needs python3 + a C++ toolchain).
|
# native addon (needs python3 + a C++ toolchain).
|
||||||
@@ -15,11 +15,11 @@ RUN apt-get update \
|
|||||||
&& apt-get install -y --no-install-recommends python3 make g++ ca-certificates \
|
&& apt-get install -y --no-install-recommends python3 make g++ ca-certificates \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
# .npmrc points npm at the Nexus npm-group; NPM_TOKEN (optional) authenticates.
|
# .npmrc points npm at the Nexus npm-group; NPM_TOKEN (optional) authenticates.
|
||||||
# The token is written only into this build stage and never reaches the runner
|
# The token is appended at build time only — never reaches the runner image.
|
||||||
# image, which copies node_modules — not .npmrc.
|
ARG NPM_TOKEN=""
|
||||||
COPY package.json package-lock.json ./
|
COPY package.json package-lock.json .npmrc ./
|
||||||
RUN if [ -n "$NPM_TOKEN" ]; then \
|
RUN if [ -n "$NPM_TOKEN" ]; then \
|
||||||
echo "//mirror.soroushasad.com/repository/npm-group/:_authToken=${NPM_TOKEN}" >> .npmrc ; \
|
echo "//mirror.soroushasadi.com/repository/npm-group/:_authToken=${NPM_TOKEN}" >> .npmrc ; \
|
||||||
fi \
|
fi \
|
||||||
&& npm ci
|
&& npm ci
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -6,7 +6,7 @@ services:
|
|||||||
context: .
|
context: .
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
args:
|
args:
|
||||||
NODE_IMAGE: ${NODE_IMAGE:-mirror.soroushasad.com/repository/docker-group/node:20-slim}
|
NODE_IMAGE: ${NODE_IMAGE:-mirror.soroushasadi.com/repository/docker-group/node:20-slim}
|
||||||
NPM_TOKEN: ${NPM_TOKEN:-}
|
NPM_TOKEN: ${NPM_TOKEN:-}
|
||||||
image: soroushasadi-site:latest
|
image: soroushasadi-site:latest
|
||||||
container_name: soroushasadi-site
|
container_name: soroushasadi-site
|
||||||
|
|||||||
Reference in New Issue
Block a user