Merge remote-tracking branch 'origin/main' into ph/txWorkerRedis

Author: arcoraven

.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/main.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-32
 
     steps:
       - name: Check Disk Space Before Build

.github/workflows/promote.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   buildImageForNewTag:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-32
     # Set environment variables
     env:
       LATEST_TAG: ${{ (github.event.release.target_commitish == 'main') && 'thirdweb/engine:latest' || '' }}

.github/workflows/tagBasedImageBuild.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: