Merge remote-tracking branch 'origin/master' into lash/deploy-on-host

This commit is contained in:
nolash 2021-07-12 18:59:09 +02:00
commit da8297bea0
10 changed files with 85 additions and 5464 deletions

View File

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

View File

@ -2,3 +2,4 @@
.cache .cache
.dot .dot
**/doc **/doc
**/node_modules

View File

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

View File

@ -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 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 the dependencies
COPY cic-meta/package.json . COPY package.json package-lock.json .
COPY cic-meta/tsconfig.json . RUN --mount=type=cache,mode=0755,target=/root/.npm \
COPY cic-meta/webpack.config.js . npm set cache /root/.npm && \
npm ci
RUN npm install 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 cic-meta/tests/ tests/ ## copy runtime configs
COPY cic-meta/tests/*.asc /root/pgp/ COPY .config/ /usr/local/etc/cic-meta/
#
# copy runtime configs ## db migrations
COPY cic-meta/.config/ /usr/local/etc/cic-meta/ COPY docker/db.sh ./db.sh
# db migrations
COPY cic-meta/docker/db.sh ./db.sh
RUN chmod 755 ./db.sh RUN chmod 755 ./db.sh
#
RUN alias tsc=node_modules/typescript/bin/tsc 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 RUN chmod 755 ./start_server.sh
ENTRYPOINT ["sh", "./start_server.sh"] ENTRYPOINT ["sh", "./start_server.sh"]

View File

@ -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"]

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

@ -2,3 +2,7 @@
.cache .cache
.dot .dot
**/doc **/doc
**/node_modules
**/venv
**/.venv

View File

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