Merge remote-tracking branch 'origin/master' into lash/default-token-context

apps/cic-cache/.gitlab-ci.yml

@@ -36,7 +36,7 @@ test-mr-cic-cache:
     rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       changes:
-          - apps/cic-eth/**/*
+          - apps/$APP_NAME/**/*
       when: always
 
 build-push-cic-cache:

apps/cic-meta/.dockerignore

@@ -1,4 +1,5 @@
 .git
 .cache
 .dot
-**/doc
+**/doc
+**/node_modules

apps/cic-meta/.gitlab-ci.yml

@@ -2,8 +2,8 @@
 .cic_meta_variables:
     variables:
         APP_NAME: cic-meta
-        DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile
-        CONTEXT: apps
+        DOCKERFILE_PATH: docker/Dockerfile_ci
+        CONTEXT: apps/$APP_NAME
 
 build-mr-cic-meta:
     extends:
@@ -21,7 +21,7 @@ test-mr-cic-meta:
     stage: test
     image: $MR_IMAGE_TAG 
     script:
-        - cd /tmp/src/cic-meta
+        - cd /root
         - npm install --dev 
         - npm run test
         - npm run test:coverage

apps/cic-meta/docker/Dockerfile

@@ -1,31 +1,33 @@
-FROM node:15.3.0-alpine3.10
+# syntax = docker/dockerfile:1.2
+#FROM node:15.3.0-alpine3.10
+FROM node:lts-alpine3.14
 
-WORKDIR /tmp/src/cic-meta
+WORKDIR /root
 
 RUN apk add --no-cache postgresql bash
 
-# required to build the cic-client-meta module
-COPY cic-meta/src/ src/
-COPY cic-meta/scripts/ scripts/
-
 # copy the dependencies
-COPY cic-meta/package.json .
-COPY cic-meta/tsconfig.json . 
-COPY cic-meta/webpack.config.js .
-     
-RUN npm install
+COPY package.json package-lock.json .
+RUN --mount=type=cache,mode=0755,target=/root/.npm \
+    npm set cache /root/.npm && \
+    npm ci
 
-COPY cic-meta/tests/ tests/
-COPY cic-meta/tests/*.asc /root/pgp/
+COPY webpack.config.js .
+COPY tsconfig.json . 
+## required to build the cic-client-meta module
+COPY src/ src/
+COPY scripts/ scripts/
+COPY tests/ tests/
+COPY tests/*.asc /root/pgp/
 
-# copy runtime configs
-COPY cic-meta/.config/ /usr/local/etc/cic-meta/
-
-# db migrations
-COPY cic-meta/docker/db.sh ./db.sh
+## copy runtime configs
+COPY .config/ /usr/local/etc/cic-meta/
+#
+## db migrations
+COPY docker/db.sh ./db.sh
 RUN chmod 755 ./db.sh
-
+#
 RUN alias tsc=node_modules/typescript/bin/tsc 
-COPY cic-meta/docker/start_server.sh ./start_server.sh
+COPY docker/start_server.sh ./start_server.sh
 RUN chmod 755 ./start_server.sh
 ENTRYPOINT ["sh", "./start_server.sh"]

apps/cic-meta/docker/Dockerfile_ci

@@ -0,0 +1,32 @@
+# syntax = docker/dockerfile:1.2
+#FROM node:15.3.0-alpine3.10
+FROM node:lts-alpine3.14
+
+WORKDIR /root
+
+RUN apk add --no-cache postgresql bash
+
+# copy the dependencies
+COPY package.json package-lock.json .
+RUN npm set cache /root/.npm && \
+    npm ci
+
+COPY webpack.config.js .
+COPY tsconfig.json . 
+## required to build the cic-client-meta module
+COPY src/ src/
+COPY scripts/ scripts/
+COPY tests/ tests/
+COPY tests/*.asc /root/pgp/
+
+## copy runtime configs
+COPY .config/ /usr/local/etc/cic-meta/
+#
+## db migrations
+COPY docker/db.sh ./db.sh
+RUN chmod 755 ./db.sh
+#
+RUN alias tsc=node_modules/typescript/bin/tsc 
+COPY docker/start_server.sh ./start_server.sh
+RUN chmod 755 ./start_server.sh
+ENTRYPOINT ["sh", "./start_server.sh"]

apps/cic-notify/.gitlab-ci.yml

@@ -36,7 +36,7 @@ test-mr-cic-notify:
     rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       changes:
-          - apps/cic-eth/**/*
+          - apps/$APP_NAME/**/*
       when: always
 
 build-push-cic-notify:

apps/cic-ussd/.gitlab-ci.yml

@@ -36,7 +36,7 @@ test-mr-cic-ussd:
     rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       changes:
-          - apps/cic-eth/**/*
+          - apps/$APP_NAME/**/*
       when: always
 
 build-push-cic-ussd:

apps/data-seeding/.dockerignore

@@ -1,4 +1,8 @@
 .git
 .cache
 .dot
-**/doc
+**/doc
+**/node_modules
+**/venv
+**/.venv
+

docker-compose.yml

@@ -443,7 +443,7 @@ services:
       SERVER_HOST: localhost
       SERVER_PORT: 8000
       DATABASE_SCHEMA_SQL_PATH: ""
-      PGP_EXPORTS_DIR: /tmp/src/cic-meta/tests/
+      PGP_EXPORTS_DIR: /root/tests/
       PGP_PRIVATEKEY_FILE: privatekeys.asc
       PGP_PASSPHRASE: merman
       PGP_PUBLICKEY_TRUSTED_FILE: publickeys.asc