Simplifies docker and compose build (#586)

* Simplifies docker and compose build

* Fix redis image

* updates to fix abosulte <> relative path

* reverting tsconfig udpates

---------

Co-authored-by: farhanW3 <farhan@thirdweb.com>

Author: jakeloo

.dockerignore

@@ -3,15 +3,19 @@ npm-debug.log
 Dockerfile
 .dockerignore
 .env
+.env*
 yarn-error.log
 .husky
 docker-compose*.yml
-Dockerfile
+Dockerfile*
 .DS_Store
 swagger.yml
 test
 .dist
 .github
 .gitignore
 .git
-.coverage
+.coverage
+dist
+docs
+.vscode

.github/workflows/promote.yml

@@ -1,98 +1,67 @@
 FROM node:18.20-slim AS base
 
-# Upgrade packages
-RUN apt-get -y update && apt-get -y upgrade
-
-# Install tini & build dependencies
-RUN apt-get install -y g++ make python3-pip openssl
-
-# Set the working directory
 WORKDIR /app
 
+# Upgrade packages
+RUN apt-get -y update && \
+    apt-get -y upgrade && \
+    apt-get -y install libssl-dev
 
-# Copy package.json and yarn.lock files
-COPY package*.json yarn*.lock ./
-
-# Copy the entire project directory
-COPY . .
+##############################
+##############################
+##############################
+##############################
 
-# Install dependencies for both development and production
-RUN yarn install --frozen-lockfile --network-timeout 1000000
+# Generate cert for local https
+FROM base AS certs
 
 WORKDIR /app/src/https
 
+RUN apt-get -y install openssl
+
 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 && \
     chmod 600 key.pem cert.pem
 
-WORKDIR /app
-
-# Clean up build dependencies
-# RUN apt del build-dependencies
-
 ##############################
 ##############################
-
-FROM base AS local
-
-EXPOSE 3005
-ENV NODE_ENV="local"
-RUN npm install -g nodemon
-
-CMD [ "sh", "-c","yarn prisma:setup:dev && yarn dev:run" ]
-
 ##############################
 ##############################
 
-# Production Node Modules stage
-FROM base AS prod-dependencies
+FROM base AS build
 
-WORKDIR /app
+# Install Python3-Pip
+RUN apt-get -y install python3-pip
 
-# Upgrade packages
-RUN apt-get -y update && apt-get -y upgrade
+# Copy the entire project directory
+COPY . .
 
+# Install dependencies for both development and production (May need devDependencies to build)
 # Build the project
-RUN apt-get install -y g++ make python3-pip && \
+# Prune dev dependencies from the packages
+RUN yarn install --frozen-lockfile --production=false --network-timeout 1000000 && \
     yarn build && \
-    yarn copy-files && \
-    rm -rf node_modules && \
-    yarn install --production=true --frozen-lockfile --network-timeout 1000000
-
+    yarn install --frozen-lockfile --production=true --network-timeout 1000000
 
 ##############################
 ##############################
+##############################
+##############################
+
+FROM base AS prod
 
-# Production stage
-FROM node:18.20-slim AS prod
+EXPOSE 3005
 
-# Setting ENV variables for image information
 ARG ENGINE_VERSION
 ENV ENGINE_VERSION=${ENGINE_VERSION}
-
-# Upgrade packages
-RUN apt-get -y update && apt-get -y upgrade
-
-# Install openssl
-RUN apt-get install -y openssl
-
-# Set the working directory
-WORKDIR /app
 ENV NODE_ENV="production" \
     PATH=/app/node_modules/.bin:$PATH
-    
-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/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=base /app/src/https ./dist/https
+COPY --from=certs /app/src/https ./dist/https
+COPY --from=build /app/package.json .
+COPY --from=build /app/node_modules ./node_modules
+COPY --from=build /app/src/prisma/* ./src/prisma/
+COPY --from=build /app/dist ./dist
 
-CMD [ "yarn", "start"]
+ENTRYPOINT [ "yarn", "start"]

Dockerfile

@@ -1,12 +1,20 @@
+###################################
+# USED FOR LOCAL DEVELOPMENT ONLY #
+###################################
+
 services:
-  db:
-    image: postgres:latest
+  postgres:
+    container_name: postgres
+    image: postgres:16.3
+    restart: always
     env_file:
       - .env
+    environment:
+      - POSTGRES_HOST_AUTH_METHOD=trust
     volumes:
-      - db_data:/var/lib/postgresql/data
+      - postgres_data:/var/lib/postgresql/data
     ports:
-      - "5432:5432"
+      - 5432:5432
     deploy:
       resources:
         limits:
@@ -18,34 +26,51 @@ services:
 
   redis:
     container_name: redis
-    image: redis:latest
+    image: redis:7.2
     restart: always
     ports:
       - 6379:6379
     volumes:
       - redis_data:/data
 
+  bullboard:
+    container_name: bullboard
+    image: deadly0/bull-board:3.2.6
+    restart: always
+    ports:
+      - 3333:3000
+    environment:
+      REDIS_HOST: redis
+      REDIS_PORT: 6379
+      REDIS_USE_TLS: "false"
+      BULL_PREFIX: bull
+    depends_on:
+      - redis
+
   engine:
+    profiles:
+      - engine
     build:
       dockerfile: Dockerfile
       context: .
-      target: local
+      target: prod
     env_file:
       - .env
     ports:
       - 3005:3005
     depends_on:
-      - db
+      - postgres
       - redis
     deploy:
       resources:
         limits:
           cpus: "1"
           memory: 1024M
+    # entrypoint: "yarn start:dev"
     # volumes:
     # - ./:/app
     # - node_modules:/app/node_modules
 
 volumes:
-  db_data:
+  postgres_data:
   redis_data:

docker-compose-infra.yml

@@ -7,25 +7,20 @@
   "author": "thirdweb engineering <eng@thirdweb.com>",
   "type": "module",
   "scripts": {
-    "docker": "docker compose --env-file ./.env up --remove-orphans",
-    "docker:build": "docker compose build --no-cache",
     "dev": "yarn dev:infra && yarn dev:db && yarn dev:run",
-    "dev:infra": "docker compose -f ./docker-compose-infra.yml up -d",
+    "dev:infra": "docker compose -f ./docker-compose.yml up -d",
     "dev:db": "yarn prisma:setup:dev",
-    "dev:run": "nodemon --watch 'src/**/*.ts' --exec 'npx tsx ./src/index.ts' --files src/index.ts",
+    "dev:run": "npx nodemon --watch 'src/**/*.ts' --exec 'npx tsx ./src/index.ts' --files src/index.ts",
     "build": "rm -rf dist && tsc -p ./tsconfig.json --outDir dist",
+    "build:docker": "docker build . -f Dockerfile -t prod",
     "generate:sdk": "npx tsx ./src/scripts/generate-sdk && cd ./sdk && yarn build",
     "prisma:setup:dev": "npx tsx ./src/scripts/setup-db.ts",
     "prisma:setup:prod": "npx tsx ./dist/scripts/setup-db.js",
     "start": "yarn prisma:setup:prod && yarn start:run",
     "start:run": "node --experimental-specifier-resolution=node ./dist/index.js",
-    "start:docker": "docker compose build && docker compose --env-file ./.env up --remove-orphans",
-    "docker-build-run": "docker compose build --no-cache && docker compose --env-file ./.env up --remove-orphans",
-    "copy-files": "copyfiles -u 2 ./src/prisma/* ./dist/prisma/ && copyfiles -u 3 ./src/prisma/migrations/**/*.sql ./dist/prisma/migrations/",
-    "lint": "eslint 'src/**/*.ts'",
+    "start:docker": "docker compose --profile engine --env-file ./.env up --remove-orphans",
+    "start:docker-force-build": "docker compose --profile engine --env-file ./.env up --remove-orphans --build",
     "lint:fix": "eslint --fix 'src/**/*.ts'",
-    "test:load": "npx tsx ./test/load/index.ts",
-    "test:load:benchmark": "npx tsx ./test/load/scripts/account.ts",
     "test:unit": "vitest",
     "test:coverage": "vitest run --coverage"
   },
@@ -37,7 +32,7 @@
     "@fastify/type-provider-typebox": "^3.2.0",
     "@fastify/websocket": "^8.2.0",
     "@google-cloud/kms": "^4.4.0",
-    "@prisma/client": "^5.14.0-dev.65",
+    "@prisma/client": "^5.14.0",
     "@sinclair/typebox": "^0.31.28",
     "@t3-oss/env-core": "^0.6.0",
     "@thirdweb-dev/auth": "^4.1.87",
@@ -50,7 +45,6 @@
     "bullmq": "^5.7.8",
     "cookie": "^0.5.0",
     "cookie-parser": "^1.4.6",
-    "copyfiles": "^2.4.1",
     "cron-parser": "^4.9.0",
     "crypto": "^1.0.1",
     "crypto-js": "^4.2.0",
@@ -70,7 +64,7 @@
     "pg": "^8.11.3",
     "pino": "^8.15.1",
     "pino-pretty": "^10.0.0",
-    "prisma": "5.14.0-dev.61",
+    "prisma": "^5.14.0",
     "superjson": "^2.2.1",
     "thirdweb": "^5.39.0",
     "uuid": "^9.0.1",
@@ -91,13 +85,10 @@
     "@typescript-eslint/eslint-plugin": "^5.55.0",
     "@typescript-eslint/parser": "^5.55.0",
     "@vitest/coverage-v8": "^2.0.3",
-    "commander": "^11.0.0",
     "eslint": "^9.3.0",
     "eslint-config-prettier": "^8.7.0",
-    "nodemon": "^3.1.2",
     "openapi-typescript-codegen": "^0.25.0",
     "prettier": "^2.8.7",
-    "ts-node": "^10.9.1",
     "typescript": "^5.1.3",
     "vitest": "^2.0.3"
   },