From 15cb3478fbd594fbc49f5fa1270b930fe252ccd4 Mon Sep 17 00:00:00 2001 From: nolash Date: Fri, 22 Oct 2021 16:44:59 +0200 Subject: [PATCH] Enable customizable npm registry --- apps/cic-meta/docker/Dockerfile | 5 +++++ apps/cic-meta/scripts/server/handlers.ts | 1 + docker-compose.yml | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/cic-meta/docker/Dockerfile b/apps/cic-meta/docker/Dockerfile index 216874a0..a332fa5a 100644 --- a/apps/cic-meta/docker/Dockerfile +++ b/apps/cic-meta/docker/Dockerfile @@ -5,6 +5,11 @@ WORKDIR /root RUN apk add --no-cache postgresql bash +ARG NPM_REPOSITORY=${NPM_REPOSITORY:-https://registry.npmjs.org} +RUN npm config set snyk=false +#RUN npm config set registry={NPM_REPOSITORY} +RUN npm config set registry=${NPM_REPOSITORY} + # copy the dependencies COPY package.json package-lock.json ./ RUN --mount=type=cache,mode=0755,target=/root/.npm \ diff --git a/apps/cic-meta/scripts/server/handlers.ts b/apps/cic-meta/scripts/server/handlers.ts index 6cb71b15..cd07770b 100644 --- a/apps/cic-meta/scripts/server/handlers.ts +++ b/apps/cic-meta/scripts/server/handlers.ts @@ -78,6 +78,7 @@ function handleServerMergePost(data, db, digest, keystore, signer) { } else { e = Envelope.fromJSON(v); s = e.unwrap(); + console.debug('s', s, o) s.replace(o, 'server merge'); e.set(s); s.onwrap = (e) => { diff --git a/docker-compose.yml b/docker-compose.yml index 39a257cd..bcfeae5d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -450,6 +450,7 @@ services: dockerfile: docker/Dockerfile args: DOCKER_REGISTRY: ${DEV_DOCKER_REGISTRY:-registry.gitlab.com/grassrootseconomics} + NPM_REPOSITORY: ${DEV_NPM_REPOSITORY:-https://registry.npmjs.org} environment: DATABASE_HOST: ${DATABASE_HOST:-postgres} DATABASE_PORT: ${DATABASE_PORT:-5432} @@ -666,4 +667,4 @@ services: set +a ./import_ussd.sh volumes: - - contract-config:/tmp/cic/config/:ro \ No newline at end of file + - contract-config:/tmp/cic/config/:ro