Merge pull request #65 from torusresearch/develop

Release: backend optimization

.env.development

@@ -13,6 +13,7 @@ IPFS_HOSTNAME=ipfs
 IPFS_PROTOCOL=http
 IPFS_PORT=5001
 METADATA_ENV=development
-SENTRY_SAMPLE_RATE=0.1
+SENTRY_SAMPLE_RATE=1
 SENTRY_TRACES_SAMPLE_RATE=0.01
 SENTRY_DSN=
+LOG_LEVEL=debug

.github/workflows/develop.yml

@@ -68,9 +68,7 @@ jobs:
           docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$GITHUB_SHA .
           echo "Pushing image to ECR..."
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
-          echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$GITHUB_SHA
-          echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$GITHUB_SHA"
       - name: Deploy
         timeout-minutes: 10
         run: |

.github/workflows/master.yml

@@ -67,9 +67,7 @@ jobs:
           docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$GITHUB_SHA .
           echo "Pushing image to ECR..."
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
-          echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$GITHUB_SHA
-          echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$GITHUB_SHA"
       - name: Deploy
         timeout-minutes: 10
         run: |
@@ -110,9 +108,7 @@ jobs:
           docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$GITHUB_SHA .
           echo "Pushing image to ECR..."
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
-          echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$GITHUB_SHA
-          echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$GITHUB_SHA"
       - name: Deploy
         timeout-minutes: 10
         run: |

Dockerfile

@@ -1,20 +1,35 @@
-FROM node:20-alpine
-
-WORKDIR /app
-
-COPY package*.json ./
+# for build
+FROM node:20-alpine AS build
 
 ENV NODE_OPTIONS --max-old-space-size=4096
 
+WORKDIR /app
+
 RUN apk add --no-cache --virtual .gyp \
         python3 \
         make \
-        g++ \
-        && npm ci && apk del .gyp
+        g++
+
+COPY package*.json ./
+
+RUN npm ci
 
 COPY . .
 
-RUN npm run build
+RUN npm run build 
+
+# for production
+FROM node:20-alpine
+
+ENV NODE_OPTIONS --max-old-space-size=4096
+
+WORKDIR /app
+
+COPY package*.json ./
+
+RUN npm ci --omit=dev --ignore-scripts
+
+COPY --from=build /app/dist ./dist
 
 EXPOSE 5051
 

Dockerfile.dev

@@ -1,16 +1,17 @@
 FROM node:20-alpine
 
-WORKDIR /app
-
-COPY package*.json ./
-
 ENV NODE_OPTIONS --max-old-space-size=4096
 
+WORKDIR /app
+
 RUN apk add --no-cache --virtual .gyp \
         python3 \
         make \
-        g++ \
-        && npm install && apk del .gyp
+        g++
+
+COPY package*.json ./
+
+RUN npm install && apk del .gyp
 
 COPY . .
 

docker-compose-ci.yml

@@ -4,8 +4,7 @@ services:
   #   ports:
   #     - "5001:5001/tcp"
   redis:
-    restart: always
-    image: redis:6-alpine
+    image: redis:6
     env_file:
       - ./.env.development
     ports:
@@ -16,9 +15,8 @@ services:
       test: redis-cli --raw incr ping
       timeout: 1s
   mysql:
-    restart: always
-    platform: linux/x86_64
     image: mysql:8
+    command: --max_allowed_packet=67108864 # 64 MB
     env_file:
       - ./.env.development
     ports:
@@ -29,7 +27,6 @@ services:
       test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
       timeout: 1s
   torus-metadata:
-    restart: "no"
     depends_on:
       mysql:
         condition: service_healthy

docker-compose.dev.yml

@@ -4,27 +4,35 @@ services:
   #   ports:
   #     - "5001:5001/tcp"
   redis:
-    restart: always
-    image: redis
+    image: redis:6
     env_file:
       - ./.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:8
     command: --max_allowed_packet=67108864 # 64 MB
     env_file:
       - ./.env.development
     ports:
       - "3306:3306"
+    healthcheck:
+      interval: 5s
+      retries: 5
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      timeout: 1s
   torus-metadata:
-    restart: always
     depends_on:
-      - mysql
+      mysql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
       # - ipfs
-      - redis
     build:
       context: .
       dockerfile: Dockerfile.dev