updated deps

w3f · Sep 29, 2021 · a0f50c6 · a0f50c6
1 parent 2966a65
commit a0f50c6
Show file tree

Hide file tree

Showing 7 changed files with 351 additions and 297 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -12,9 +12,18 @@ jobs:
       - run: yarn
       - run: yarn test
 
+
+  yarnLint:
+    docker:
+      - image: web3f/node-dind:v1.0.0
+    steps:
+      - checkout
+      - run: yarn
+      - run: yarn lint    
+
   helmLint:
     docker:
-      - image: web3f/ci-commons:v2.4.4
+      - image: web3f/ci-commons:v2.4.6
     steps:
       - checkout
       - run:
@@ -23,19 +32,19 @@ jobs:
 
   buildImage:
     docker:
-      - image: web3f/ci-commons:v2.4.4
+      - image: web3f/ci-commons:v2.4.6
     steps:
       - checkout
       - setup_remote_docker:
           docker_layer_caching: true
-          version: 19.03.13
+          version: 20.10.7
       - run:
           command: |
             /scripts/build-image.sh web3f/polkadot-watcher .
 
   integrationTests:
     docker:
-      - image: web3f/ci-commons:v2.4.4
+      - image: web3f/ci-commons:v2.4.6
     steps:
       - checkout
       - setup_remote_docker
@@ -46,17 +55,17 @@ jobs:
 
   testPrometheusRules:
     docker:
-      - image: web3f/ci-commons:v2.4.4
+      - image: web3f/ci-commons:v2.4.6
     steps:
       - checkout
       - run:
           name: Install missing dependencies
           command: |
-            YQ_VER=3.3.0
+            YQ_VER=3.4.1
             wget -O /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/${YQ_VER}/yq_linux_amd64
             chmod +x /usr/local/bin/yq
 
-            PROM_VER=2.18.1
+            PROM_VER=2.30.1
             wget -O /tmp/prometheus.tgz https://github.com/prometheus/prometheus/releases/download/v${PROM_VER}/prometheus-${PROM_VER}.linux-amd64.tar.gz
             tar -xvf /tmp/prometheus.tgz prometheus-${PROM_VER}.linux-amd64/promtool -C /tmp
             mv /tmp/prometheus-$PROM_VER.linux-amd64/promtool /usr/local/bin/
@@ -67,7 +76,7 @@ jobs:
 
   publishImage:
     docker:
-      - image: web3f/ci-commons:v2.4.4
+      - image: web3f/ci-commons:v2.4.6
     steps:
       - checkout
       - setup_remote_docker
@@ -77,7 +86,7 @@ jobs:
 
   publishChart:
     docker:
-      - image: web3f/ci-commons:v2.4.4
+      - image: web3f/ci-commons:v2.4.6
     steps:
       - checkout
       - run:
@@ -87,36 +96,43 @@ jobs:
 workflows:
   version: 2
   test_and_deploy:
-    jobs:
-      - unitTest:
+    jobs:    
+      - helmLint:
           filters:
             tags:
               only: /.*/
-      - helmLint:
+      - yarnLint:
           filters:
             tags:
-              only: /.*/
-      - buildImage:
-          context: dockerhub-bot
+              only: /.*/    
+      - unitTest:
           filters:
             tags:
               only: /.*/
           requires:
-            - unitTest
+            - helmLint
+            - yarnLint             
       - testPrometheusRules:
           filters:
             tags:
               only: /.*/
           requires:
-            - helmLint      
-      - integrationTests:
+            - helmLint
+            - yarnLint         
+      - buildImage:
+          context: dockerhub-bot
           filters:
             tags:
               only: /.*/
           requires:
-            - helmLint
             - unitTest
             - testPrometheusRules
+      - integrationTests:
+          filters:
+            tags:
+              only: /.*/
+          requires:
+            - buildImage
       - publishImage:
           context: dockerhub-bot
           filters:
@@ -125,7 +141,6 @@ workflows:
             tags:
               only: /^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
           requires:
-            - buildImage
             - integrationTests
       - publishChart:
           context: github-bot
@@ -135,5 +150,4 @@ workflows:
             tags:
               only: /^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
           requires:
-            - buildImage
             - integrationTests
diff --git a/.dockerignore b/.dockerignore
@@ -1,8 +1,5 @@
-node_modules/
-dist/
-charts/
-helmfile.d/
-.circleci/
-config/
-scripts/
-test/
+*
+!src
+!package.json
+!tsconfig.json
+!yarn.lock
diff --git a/Dockerfile b/Dockerfile
@@ -2,11 +2,11 @@ FROM node:14.16.1-alpine3.11
 
 WORKDIR /app
 
-COPY . .
+COPY package.json yarn.lock ./
+RUN yarn --ignore-scripts
 
-RUN apk add --no-cache make gcc g++ python3 && \
-  yarn && \
-  yarn build && \
-  apk del make gcc g++ python3
+COPY . .
+RUN yarn && \ 
+  yarn build
 
 ENTRYPOINT ["yarn", "start"]
diff --git a/charts/polkadot-watcher/Chart.yaml b/charts/polkadot-watcher/Chart.yaml
@@ -1,4 +1,4 @@
 description: Polkadot Watcher
 name: polkadot-watcher
-version: v3.0.9
+version: v3.0.10
 apiVersion: v2
diff --git a/charts/polkadot-watcher/values.yaml b/charts/polkadot-watcher/values.yaml
@@ -3,7 +3,7 @@ port: 3000
 
 image:
   repo: web3f/polkadot-watcher
-  tag: v3.0.9
+  tag: v3.0.10
 
 config:
   endpoint: "wss://kusama-rpc.polkadot.io"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "polkadot-watcher",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "description": "Monitor events on Polkadot networks",
   "repository": "git@github.com:w3f/polkadot-watcher.git",
   "author": "W3F Infrastructure Team <devops@web3.foundation>",
@@ -20,7 +20,7 @@
     "start": "node ./dist/index.js start"
   },
   "dependencies": {
-    "@polkadot/api": "^5.5.2",
+    "@polkadot/api": "^6.1.2",
     "@w3f/config": "^0.1.1",
     "@w3f/logger": "^0.4.2",
     "commander": "^4.0.0",
@@ -39,8 +39,8 @@
     "@types/tmp": "^0.2.0",
     "@typescript-eslint/eslint-plugin": "^2.25.0",
     "@typescript-eslint/parser": "^2.25.0",
-    "@w3f/polkadot-api-client": "^1.2.5",
-    "@w3f/test-utils": "^1.2.8",
+    "@w3f/polkadot-api-client": "^1.2.7",
+    "@w3f/test-utils": "^1.2.10",
     "chai": "^4.2.0",
     "eslint": "^6.6.0",
     "fs-extra": "^9.0.0",