Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(mojaloop/#3433): nodejs upgrade #964

Merged
merged 60 commits into from
Sep 4, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
c30fc36
chore: update deps
oderayi Aug 29, 2023
378d498
chore: update deps
oderayi Aug 29, 2023
ef9c143
ci: set default for DOCKER_ORG env var
oderayi Aug 29, 2023
13eccf1
ci: update nvm config
oderayi Aug 29, 2023
719ab40
chore: update audit allow list
oderayi Aug 29, 2023
fd004bf
ci: update nvmrc config
oderayi Aug 29, 2023
60270b1
ci: fix bug with docker-imgage local cache
oderayi Aug 29, 2023
db12278
ci: add default machine deps install
oderayi Aug 29, 2023
8598d2c
ci: update ci config
oderayi Aug 29, 2023
935ed58
ci: use main branch from ml-core-testing-harness
oderayi Aug 30, 2023
0bc6a1c
chore: restore packages to main.
oderayi Aug 30, 2023
accac69
chore: restore .nvmrc to main.
oderayi Aug 30, 2023
60dce7b
chore: restore ci config to main.
oderayi Aug 30, 2023
7687f34
ci: apply updated ci config
oderayi Aug 30, 2023
88b39ef
chore: update npm deps
oderayi Aug 30, 2023
93af251
chore: upgrade ml-number
oderayi Aug 30, 2023
1dcfc7f
chore: upgrade ml-number, error-handling and logger
oderayi Aug 30, 2023
7d04550
chore: upgrade ml-number, error-handling and logger
oderayi Aug 30, 2023
38d79e5
chore: upgrade health, metrics, shared, and stream
oderayi Aug 30, 2023
dcb6adf
chore: revert health
oderayi Aug 30, 2023
400a06a
chore: revert stream
oderayi Aug 30, 2023
f33d0e4
chore: upgrade health
oderayi Aug 30, 2023
d3e12ee
chore: upgrade event-sdk
oderayi Aug 30, 2023
b0bc605
chore: upgrade cs-shared
oderayi Aug 30, 2023
61f5721
chore: upgrade nodejs to 18.17.1
oderayi Aug 31, 2023
0bbefd4
chore: remove glob from .ncuru and upgrade it
oderayi Aug 31, 2023
e484738
ci: display runtime versions. chore: update audit allow list
oderayi Aug 31, 2023
3202102
docs: update readme
oderayi Aug 31, 2023
719d2bb
ci: update workflow
oderayi Aug 31, 2023
2fe7668
fix: fix docker local build. update deps
oderayi Sep 1, 2023
6c58720
ci: use main branch of ml-core-test-harness
oderayi Sep 1, 2023
d997bc2
ci: make reports directory
oderayi Sep 1, 2023
5663423
ci: use new funtional test script
oderayi Sep 1, 2023
3b19060
ci: update funtional test script
oderayi Sep 1, 2023
b129b0e
ci: fix functional test script
oderayi Sep 1, 2023
53193ee
ci: update functional test script
oderayi Sep 1, 2023
e17b2f2
fix: use NODE_VERSION env var to build with specified node version
oderayi Sep 1, 2023
eb2b2a3
ci: update ci
oderayi Sep 1, 2023
a5f6708
ci: migrate master to main
oderayi Sep 1, 2023
504fa08
ci: replace hardcoded node vesion with variable
oderayi Sep 1, 2023
2d3ba5e
ci: update nvm config
oderayi Sep 1, 2023
c82e21a
ci: update publish tagging
oderayi Sep 1, 2023
94fa067
removed build, and fixed local tags on license/image scan
mdebarros Sep 1, 2023
ddb3c65
chore(snapshot): 17.0.4-snapshot.0
mdebarros Sep 1, 2023
3d8b284
removed build, and fixed local tags on license/image scan
mdebarros Sep 1, 2023
52a351b
chore(snapshot): 17.0.4-snapshot.1
mdebarros Sep 1, 2023
f9c8d01
chore(snapshot): 17.0.4-snapshot.2
mdebarros Sep 1, 2023
1238a79
cleanup
mdebarros Sep 1, 2023
3d769b7
chore(snapshot): 17.0.4-snapshot.3
mdebarros Sep 1, 2023
6dd0156
upd to readme
mdebarros Sep 1, 2023
8fee2cd
chore(snapshot): 17.0.4-snapshot.4
mdebarros Sep 1, 2023
a8802f4
updated package with docker:build, and updated main readme
mdebarros Sep 1, 2023
939fd24
chore(snapshot): 17.0.4-snapshot.5
mdebarros Sep 1, 2023
8322360
updating the test-functiona.sh cleanup
mdebarros Sep 4, 2023
00e6ad6
aligned docker compose to remove zookeeper dependency, and update kaf…
mdebarros Sep 4, 2023
b4da06e
updated deps, and aligned ci config
mdebarros Sep 4, 2023
ecb630a
chore(snapshot): 17.0.4-snapshot.6
mdebarros Sep 4, 2023
514148e
cleaned up package.json unit and int tests
mdebarros Sep 4, 2023
b034967
moved kafka configs into config folder
mdebarros Sep 4, 2023
1e34832
removed unused kafka configs
mdebarros Sep 4, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ci: replace hardcoded node vesion with variable
  • Loading branch information
oderayi committed Sep 1, 2023
commit 504fa087bf0b786817901774a76dc0c70b388512
10 changes: 7 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,10 @@ jobs:
steps:
- setup_remote_docker
- checkout
- run:
<<: *defaults_configure_nvmrc
- run:
<<: *defaults_display_versions
- run:
name: Setup Slack config
command: |
Expand Down Expand Up @@ -562,13 +566,13 @@ jobs:
- run:
name: Pull base image locally
command: |
docker pull node:16.15.0-alpine
docker pull node:${NVMRC_VERSION}-alpine
# Analyze the base and derived image
# Note: It seems images are scanned in parallel, so preloading the base image result doesn't give us any real performance gain
- anchore/analyze_local_image:
# Force the older version, version 0.7.0 was just published, and is broken
anchore_version: v0.6.1
image_name: "docker.io/node:16.15.0-alpine ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG"
image_name: "docker.io/node:${NVMRC_VERSION}-alpine ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG"
policy_failure: false
timeout: '500'
# Note: if the generated policy is invalid, this will fallback to the default policy, which we don't want!
Expand All @@ -581,7 +585,7 @@ jobs:
aws s3 cp anchore-reports ${AWS_S3_DIR_ANCHORE_REPORTS}/latest/ --recursive
- run:
name: Evaluate failures
command: /tmp/ci-config/container-scanning/anchore-result-diff.js anchore-reports/node_16.15.0-alpine-policy.json anchore-reports/${CIRCLE_PROJECT_REPONAME}*-policy.json
command: /tmp/ci-config/container-scanning/anchore-result-diff.js anchore-reports/node_${NVMRC_VERSION}-alpine-policy.json anchore-reports/${CIRCLE_PROJECT_REPONAME}*-policy.json
- store_artifacts:
path: anchore-reports
- slack/notify:
Expand Down
10 changes: 7 additions & 3 deletions test-integration.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
FROM node:16.15.0-alpine
# Arguments
ARG NODE_VERSION=lts-alpine

# Build Image
FROM node:${NODE_VERSION} as builder

USER root

WORKDIR /opt/app

RUN apk --no-cache add git
RUN apk add --no-cache -t build-dependencies make gcc g++ python3 libtool libressl-dev openssl-dev autoconf automake \
RUN apk add --no-cache -t build-dependencies make gcc g++ python3 libtool openssl-dev autoconf automake bash \
&& cd $(npm root -g)/npm \
&& npm config set unsafe-perm true \
&& npm install -g node-gyp

COPY package.json package-lock.json* /opt/app/
Expand Down
10 changes: 7 additions & 3 deletions test.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
FROM node:16.15.0-alpine
# Arguments
ARG NODE_VERSION=lts-alpine

# Build Image
FROM node:${NODE_VERSION} as builder

USER root

WORKDIR /opt/app

RUN apk --no-cache add git
RUN apk add --no-cache -t build-dependencies make gcc g++ python3 libtool libressl-dev openssl-dev autoconf automake \
RUN apk add --no-cache -t build-dependencies make gcc g++ python3 libtool openssl-dev autoconf automake bash \
&& cd $(npm root -g)/npm \
&& npm config set unsafe-perm true \
&& npm install -g node-gyp tape tap-xunit

COPY package.json package-lock.json* /opt/app/
Expand Down