Dockerfile & Docker Compose Updates (#267)

* refactored dockerfile for prod builds

* updated Dockerfile to reduce prod image size. Updated docker compose

* wallet balance params fixed, retry end-point updated

Author: farhanW3

.dockerignore

@@ -9,4 +9,9 @@ docker-compose*.yml
 Dockerfile
 .DS_Store
 swagger.yml
-test
+test
+.dist
+.github
+.gitignore
+.git
+.coverage

Dockerfile

@@ -10,77 +10,119 @@ WORKDIR /app
 ENTRYPOINT ["/sbin/tini", "--"]
 
 # Install build dependencies
-RUN apk --no-cache --virtual build-dependencies add g++ make py3-pip
+RUN apk --no-cache --virtual build-dependencies add g++ make py3-pip openssl
 
 # Copy package.json and yarn.lock files
 COPY package*.json yarn*.lock ./
 
 # Copy the entire project directory
 COPY . .
 
+RUN npm install -g nodemon
+
 # Install dependencies for both development and production
 RUN yarn install --frozen-lockfile --network-timeout 1000000
 
-# Build the project
-RUN yarn build
-RUN yarn copy-files
+WORKDIR /app/https
+
+RUN openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -days 365 \
+    -subj "/C=US/ST=State/L=City/O=Organization/OU=Unit/CN=localhost" \
+    -passout pass:thirdweb-engine
+
+RUN chmod 600 key.pem cert.pem
+
+WORKDIR /app
 
 # Clean up build dependencies
 RUN apk del build-dependencies
 
-# Expose the necessary ports
-EXPOSE 3005
+##############################
+##############################
 
 FROM base AS local_server
 
+EXPOSE 3005
+
 ENV NODE_ENV="local"
-CMD [ "yarn", "dev:server" ]
+CMD [ "sh", "-c","yarn prisma:setup:dev && yarn dev:server" ]
+
+##############################
+##############################
 
 FROM base AS local_worker
 
 ENV NODE_ENV="local"
-CMD [ "yarn", "dev:worker" ]
+CMD [ "sh", "-c", "yarn prisma:setup:dev && yarn dev:worker" ]
 
-# Production stage
-FROM node:18.15.0-alpine AS prod
-
-# Install tini
-RUN apk add --no-cache tini
+##############################
+##############################
 
-# Set the working directory
-WORKDIR /app
-
-ENV NODE_ENV="production"
+# Production Node Modules stage
+FROM node:18.15.0-alpine AS prod-dependencies
 
 # Install build dependencies
-RUN apk --no-cache --virtual build-dependencies add g++ make py3-pip
+RUN apk add --no-cache g++ make py3-pip openssl
+
+WORKDIR /app
 
 # Copy package.json and yarn.lock files
 COPY package*.json yarn*.lock ./
 
-# Replace the schema path in the package.json file
-RUN sed -i 's_"schema": "./src/prisma/schema.prisma"_"schema": "./dist/src/prisma/schema.prisma"_g' package.json
+# Copy the entire project directory
+COPY . .
 
-# Copy the built dist folder from the base stage to the production stage
-COPY --from=base /app/dist ./dist
+COPY --from=base /app/node_modules ./node_modules
+
+# Build the project
+RUN yarn build
+RUN yarn copy-files
+
+RUN rm -rf node_modules
+
+# Install production dependencies only
+RUN yarn install --production=true --frozen-lockfile --network-timeout 1000000
 
 # Generate SSL certificates
-RUN apk --update add openssl
 WORKDIR /app/dist/https
+
 RUN openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -days 365 \
     -subj "/C=US/ST=State/L=City/O=Organization/OU=Unit/CN=localhost" \
     -passout pass:thirdweb-engine
+
 RUN chmod 600 key.pem cert.pem
-RUN apk del openssl
 
-# Change Working Directory back to /app
+# Clean up build dependencies
+RUN apk del g++ make py3-pip openssl
+
+##############################
+##############################
+
+# Production stage
+FROM node:18.15.0-alpine AS prod
+
+# Install tini
+RUN apk add --no-cache tini
+
+# Set the working directory
 WORKDIR /app
 
-# Install production dependencies only
-RUN yarn install --production=true --frozen-lockfile --network-timeout 1000000
+ENV NODE_ENV="production"
 
-# Clean up build dependencies
-RUN apk del build-dependencies
+EXPOSE 3005
+
+# Copy package.json and yarn.lock files
+COPY package*.json yarn*.lock ./
+
+# Replace the schema path in the package.json file
+RUN sed -i 's_"schema": "./src/prisma/schema.prisma"_"schema": "./dist/src/prisma/schema.prisma"_g' package.json
+
+# Copy only production dependencies from the prod-dependencies stage
+COPY --from=prod-dependencies /app/node_modules ./node_modules
+COPY --from=prod-dependencies /app/dist ./dist
+COPY --from=prod-dependencies /app/dist/https ./dist/https
+
+# Add the node_modules/.bin directory to the PATH
+ENV PATH /app/node_modules/.bin:$PATH
 
 # Use tini as entrypoint to handle killing processes
 ENTRYPOINT ["/sbin/tini", "--"]

docker-compose-infra.yml

@@ -3,8 +3,6 @@ version: "3.8"
 services:
   db:
     image: postgres:latest
-    env_file:
-      - .env
     volumes:
       - psql_db:/var/lib/postgresql/data
     ports:

docker-compose.yml

@@ -25,24 +25,42 @@ services:
       dockerfile: Dockerfile
       context: .
       target: local_server
+    env_file:
+      - .env
     ports:
       - 3005:3005
-    volumes:
-      - ./:/app
-      - node_modules:/app/node_modules
+    depends_on:
+      - db
+    deploy:
+      resources:
+        limits:
+          cpus: "1"
+          memory: 1024M
+    # volumes:
+    # - ./:/app
+    # - node_modules:/app/node_modules
 
   engine-worker:
     build:
       dockerfile: Dockerfile
       context: .
       target: local_worker
+    env_file:
+      - .env
     ports:
       - 3006:3006
-    volumes:
-      - ./:/app
-      - node_modules:/app/node_modules
+    depends_on:
+      - db
+    deploy:
+      resources:
+        limits:
+          cpus: "1"
+          memory: 1024M
+    # volumes:
+    # - ./:/app
+    # - node_modules:/app/node_modules
 
 volumes:
-  node_modules:
+  # node_modules:
   db_data:
   pgadmin:

server/api/backend-wallet/getBalance.ts

@@ -37,7 +37,7 @@ export async function getBalance(fastify: FastifyInstance) {
     Reply: Static<typeof responseSchema>;
   }>({
     method: "GET",
-    url: "/backend-wallet/:chain/:wallet_address/get-balance",
+    url: "/backend-wallet/:chain/:walletAddress/get-balance",
     schema: {
       summary: "Get balance",
       description: "Get the native balance for a backend wallet.",

server/api/transaction/retry.ts

@@ -5,14 +5,12 @@ import { retryTx } from "../../../src/db/transactions/retryTx";
 import { standardResponseSchema } from "../../schemas/sharedApiSchemas";
 
 // INPUT
-const requestSchema = Type.Object({
+
+const requestBodySchema = Type.Object({
   queueId: Type.String({
     description: "Transaction Queue ID",
     examples: ["9eb88b00-f04f-409b-9df7-7dcc9003bc35"],
   }),
-});
-
-const requestBodySchema = Type.Object({
   maxFeePerGas: Type.String(),
   maxPriorityFeePerGas: Type.String(),
 });
@@ -35,27 +33,24 @@ responseBodySchema.example = {
 
 export async function retryTransaction(fastify: FastifyInstance) {
   fastify.route<{
-    Params: Static<typeof requestSchema>;
     Body: Static<typeof requestBodySchema>;
     Reply: Static<typeof responseBodySchema>;
   }>({
     method: "POST",
-    url: "/transaction/retry/:queueId",
+    url: "/transaction/retry",
     schema: {
       summary: "Retry transaction",
       description: "Retry a transaction with updated gas settings.",
       tags: ["Transaction"],
       operationId: "retry",
-      params: requestSchema,
       body: requestBodySchema,
       response: {
         ...standardResponseSchema,
         [StatusCodes.OK]: responseBodySchema,
       },
     },
     handler: async (request, reply) => {
-      const { queueId } = request.params;
-      const { maxFeePerGas, maxPriorityFeePerGas } = request.body;
+      const { queueId, maxFeePerGas, maxPriorityFeePerGas } = request.body;
 
       await retryTx({
         queueId: queueId,