fix: Docker build failing (#230)

* fix: update node to 20.11 * chore: remove unused Dockerfile * chore: update node version in CI * fix: update jest and fix test
celo-org · Mar 18, 2024 · a05fe70 · a05fe70
1 parent 0d1f7c5
commit a05fe70
Show file tree

Hide file tree

Showing 7 changed files with 790 additions and 520 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,7 +11,7 @@ orbs:
 defaults: &defaults
   working_directory: ~/app
   docker:
-    - image: cimg/node:12.22.2
+    - image: cimg/node:20.11
   environment:
     # To avoid ENOMEM problem when running node
     NODE_OPTIONS: '--max-old-space-size=4096'

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,31 +1,31 @@
-name: "CI"
+name: 'CI'
 
 on:
   workflow_dispatch:
   pull_request:
     branches:
-      - "main"
-      - "feature/**"
+      - 'main'
+      - 'feature/**'
   push:
     branches:
-      - "main"
+      - 'main'
 
 jobs:
   ci:
     name: Build & Test
     runs-on: ubuntu-latest
 
     steps:
-      - name: "Check out the repo"
-        uses: "actions/checkout@v3"
+      - name: 'Check out the repo'
+        uses: 'actions/checkout@v3'
 
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 12
+          node-version: 20.11
 
       - name: Install dependencies
-        run: "yarn install --immutable"
+        run: 'yarn install --immutable'
 
       - name: Build packages
         run: yarn build
@@ -38,4 +38,3 @@ jobs:
 
       - name: Run tests
         run: yarn run test --maxWorkers 2
-
diff --git a/Dockerfile b/Dockerfile
@@ -7,7 +7,7 @@
 # docker push oracletest.azurecr.io/test/oracle:$COMMIT_SHA
 
 # First stage, builder to install devDependencies to build TypeScript
-FROM node:18.18.0 as BUILDER
+FROM node:20.11 as BUILDER
 
 RUN apt-get update
 RUN apt-get install -y libusb-1.0-0-dev
@@ -28,7 +28,7 @@ COPY src src
 RUN yarn build
 
 # Second stage, create slimmed down production-ready image
-FROM node:18.18.0
+FROM node:20.11
 ARG COMMIT_SHA
 
 RUN apt-get update

diff --git a/dockerfiles/continuous-integration/Dockerfile b/dockerfiles/continuous-integration/Dockerfile
diff --git a/package.json b/package.json
@@ -38,12 +38,12 @@
     "@celo/typescript": "^0.0.1",
     "@types/bunyan": "^1.8.6",
     "@types/express": "^4.17.6",
-    "@types/jest": "28.1.2",
+    "@types/jest": "29.5.12",
     "@types/mathjs": "^6.0.5",
     "@types/node-fetch": "^2.5.5",
-    "jest": "28.1.2",
+    "jest": "29.7.0",
     "prettier": "2.1.1",
-    "ts-jest": "^28.0.5",
+    "ts-jest": "^29.1.2",
     "tslint": "^6.1.1",
     "tslint-config-prettier": "^1.18.0",
     "tslint-eslint-rules": "^5.4.0",

diff --git a/test/exchange_adapters/base.test.ts b/test/exchange_adapters/base.test.ts
@@ -133,7 +133,7 @@ describe('BaseExchangeAdapter', () => {
         await expect(async () =>
           adapter.fetchFromApi(ExchangeDataType.TICKER, mockTickerEndpoint)
         ).rejects.toThrowError(
-          'Failed to parse JSON response: FetchError: invalid json response body at  reason: Unexpected token < in JSON at position 0'
+          'Failed to parse JSON response: FetchError: invalid json response body at  reason: Unexpected token \'<\', "<html>blah"... is not valid JSON'
         )
         expect(metricCollector.exchangeApiRequestError).toBeCalledWith(
           ...metricArgs,