Merge pull request #55 from torusresearch/develop

Adds passkey nonce

.env.development

@@ -12,4 +12,7 @@ NODE_ENV=development
 IPFS_HOSTNAME=ipfs
 IPFS_PROTOCOL=http
 IPFS_PORT=5001
-METADATA_ENV=development
+METADATA_ENV=development
+SENTRY_SAMPLE_RATE=0.1
+SENTRY_TRACES_SAMPLE_RATE=0.01
+SENTRY_DSN=

.github/workflows/any.yml

@@ -21,16 +21,16 @@ jobs:
     name: run tests
     strategy:
       matrix:
-        node: ["18.x"]
+        node: ["20.x"]
         os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Use Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           cache: "npm"

.github/workflows/develop.yml

@@ -19,7 +19,7 @@ jobs:
     name: run tests
     strategy:
       matrix:
-        node: ["18.x"]
+        node: ["20.x"]
         os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}

.github/workflows/master.yml

@@ -19,7 +19,7 @@ jobs:
     name: run tests
     strategy:
       matrix:
-        node: ["18.x"]
+        node: ["20.x"]
         os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-alpine
+FROM node:20-alpine
 
 WORKDIR /app
 
@@ -14,6 +14,8 @@ RUN apk add --no-cache --virtual .gyp \
 
 COPY . .
 
+RUN npm run build
+
 EXPOSE 5051
 
-CMD npm run build && npm run prod
+CMD npm run prod

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM node:18-alpine
+FROM node:20-alpine
 
 WORKDIR /app
 
@@ -14,4 +14,4 @@ RUN apk add --no-cache --virtual .gyp \
 
 COPY . .
 
-CMD npm run migrate && npm run serve
+CMD npm run migrate && npm run serve

docker-compose-ci.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   # ipfs:
   #   image: ipfs/go-ipfs
@@ -12,19 +10,31 @@ services:
       - ./.env.development
     ports:
       - "6379:6379"
+    healthcheck:
+      interval: 5s
+      retries: 5
+      test: redis-cli --raw incr ping
+      timeout: 1s
   mysql:
     restart: always
-    # platform: linux/x86_64
-    image: mysql:5.7
+    platform: linux/x86_64
+    image: mysql:8
     env_file:
       - ./.env.development
     ports:
       - "3306:3306"
+    healthcheck:
+      interval: 5s
+      retries: 5
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      timeout: 1s
   torus-metadata:
     restart: "no"
     depends_on:
-      - mysql
-      - redis
+      mysql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
       # - ipfs
     build:
       context: .

docker-compose.dev.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   # ipfs:
   #   image: ipfs/go-ipfs
@@ -15,7 +13,7 @@ services:
   mysql:
     restart: always
     # platform: linux/x86_64
-    image: mysql:5.7
+    image: mysql:8
     command: --max_allowed_packet=67108864 # 64 MB
     env_file:
       - ./.env.development