@mojaloop/sdk-scheme-adapter 17.0.2-snapshot.6 → 17.0.2-snapshot.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/.circleci/config.yml +0 -4
  2. package/Dockerfile +8 -5
  3. package/docker-compose.yml +4 -2
  4. package/package.json +2 -1
  5. package/test/config/integration.env +2 -2
package/.circleci/config.yml CHANGED
@@ -179,15 +179,11 @@ jobs:
179
179
  - run:
180
180
  name: Execute Wait4 script
181
181
  command: |
182
- [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
183
182
  chmod +x ./docker/wait4/wait4.js
184
- # chmod +x ./docker/wait4/setup_hosts_file.sh
185
- # sh -c "./docker/wait4/setup_hosts_file.sh"
186
183
  sh -c "./docker/wait4/wait4.js cicd-integration-tests"
187
184
  - run:
188
185
  name: Execute integration tests
189
186
  command: |
190
- [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
191
187
  npm ci
192
188
  npm run test:int
193
189
  - run:
package/Dockerfile CHANGED
@@ -4,7 +4,7 @@ RUN apk add --no-cache git python3 build-base
4
4
 
5
5
  EXPOSE 3000
6
6
 
7
- WORKDIR /src
7
+ WORKDIR /opt/app
8
8
 
9
9
  # This is super-ugly, but it means we don't have to re-run npm install every time any of the source
10
10
  # files change- only when any dependencies change- which is a superior developer experience when
@@ -12,7 +12,12 @@ WORKDIR /src
12
12
  COPY ./package.json .
13
13
  COPY ./package-lock.json .
14
14
  RUN npm ci --only=production
15
+
16
+ COPY src /opt/app/src
17
+
15
18
  FROM node:16.15.0-alpine
19
+ WORKDIR /opt/app
20
+
16
21
 
17
22
  ARG BUILD_DATE
18
23
  ARG VCS_URL
@@ -32,8 +37,6 @@ LABEL org.label-schema.version=$VERSION
32
37
  RUN adduser -D ml-user
33
38
  USER ml-user
34
39
 
35
- COPY --from=builder /src/ /src
36
- COPY ./src ./src
37
- COPY ./secrets /
40
+ COPY --chown=ml-user --from=builder /opt/app .
38
41
 
39
- CMD ["node", "src/index.js"]
42
+ CMD ["npm", "run", "start"]
package/docker-compose.yml CHANGED
@@ -22,9 +22,11 @@ services:
22
22
  - "4002:4002"
23
23
  depends_on:
24
24
  - redis
25
- command: sh -c "/wait4/wait4.js sdk-scheme-adapter; node src/index.js"
25
+ command: sh -c "/tmp/wait4/wait4.js sdk-scheme-adapter && npm run start"
26
+ # command: sh -c "/tmp/wait4/wait4.js sdk-scheme-adapter && sleep 999999"
26
27
  volumes:
27
- - ./docker/wait4:/wait4
28
+ - ./docker/wait4:/tmp/wait4
29
+ - ./secrets:/opt/app/secrets
28
30
 
29
31
  ml-testing-toolkit:
30
32
  networks:
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mojaloop/sdk-scheme-adapter",
3
- "version": "17.0.2-snapshot.6",
3
+ "version": "17.0.2-snapshot.8",
4
4
  "description": "An adapter for connecting to Mojaloop API enabled switches.",
5
5
  "main": "src/index.js",
6
6
  "types": "src/index.d.ts",
@@ -11,6 +11,7 @@
11
11
  "~": "src"
12
12
  },
13
13
  "scripts": {
14
+ "start": "node src/index.js",
14
15
  "audit:resolve": "npx resolve-audit --production",
15
16
  "audit:check": "npx check-audit --production",
16
17
  "build": "npm run build:openapi; npm run build:dto:outbound",
package/test/config/integration.env CHANGED
@@ -26,8 +26,8 @@ JWS_SIGN=false
26
26
  JWS_SIGN_PUT_PARTIES=false
27
27
 
28
28
  # Path to JWS signing key (private key of THIS DFSP)
29
- JWS_SIGNING_KEY_PATH=/jwsSigningKey.key
30
- JWS_VERIFICATION_KEYS_DIRECTORY=/jwsVerificationKeys
29
+ JWS_SIGNING_KEY_PATH=/opt/app/secrets/jwsSigningKey.key
30
+ JWS_VERIFICATION_KEYS_DIRECTORY=/opt/app/secrets/jwsVerificationKeys
31
31
 
32
32
  # Location of certs and key required for TLS
33
33
  # IN_CA_CERT_PATH=./secrets/cacert.pem