updated GH flow (#398)

Author: farhanW3

.github/workflows/main.yml

@@ -11,6 +11,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Check Disk Space Before Build
+        run: df -h
+
+      - name: Docker Prune
+        run: docker system prune -af
+
       - name: Checkout code
         uses: actions/checkout@v2
         with:
@@ -35,3 +41,6 @@ jobs:
           tags: thirdweb/engine:nightly
           build-args: |
             ENGINE_VERSION=nightly
+
+      - name: Check Disk Space After Build
+        run: df -h

.github/workflows/tagBasedImageBuild.yml

@@ -9,6 +9,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Check Disk Space Before Build
+        run: df -h
+
+      - name: Docker Prune
+        run: docker system prune -af
+
       - name: Checkout code
         uses: actions/checkout@v2
 
@@ -33,3 +39,6 @@ jobs:
             thirdweb/engine:latest
           build-args: |
             ENGINE_VERSION=${{ github.ref_name }}
+
+      - name: Check Disk Space After Build
+        run: df -h

Dockerfile

@@ -39,20 +39,12 @@ RUN apk del build-dependencies
 ##############################
 ##############################
 
-FROM base AS local_server
+FROM base AS local
 
 EXPOSE 3005
-
 ENV NODE_ENV="local"
-CMD [ "sh", "-c","yarn prisma:setup:dev && yarn dev:server" ]
-
-##############################
-##############################
-
-FROM base AS local_worker
 
-ENV NODE_ENV="local"
-CMD [ "sh", "-c", "yarn prisma:setup:dev && yarn dev:worker" ]
+CMD [ "sh", "-c","yarn prisma:setup:dev && yarn dev" ]
 
 ##############################
 ##############################
@@ -61,38 +53,24 @@ CMD [ "sh", "-c", "yarn prisma:setup:dev && yarn dev:worker" ]
 FROM node:18.15.0-alpine AS prod-dependencies
 
 # Install build dependencies
-RUN apk add --no-cache g++ make py3-pip openssl
-
+RUN apk add --no-cache g++ make py3-pip
 WORKDIR /app
 
 # Copy package.json and yarn.lock files
 COPY package*.json yarn*.lock ./
 
 # Copy the entire project directory
 COPY . .
-
 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
-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 yarn build && \
+    yarn copy-files && \
+    rm -rf node_modules && \
+    yarn install --production=true --frozen-lockfile --network-timeout 1000000
 
 # Clean up build dependencies
-RUN apk del g++ make py3-pip openssl
+RUN apk del g++ make py3-pip
 
 ##############################
 ##############################
@@ -109,9 +87,7 @@ RUN apk add --no-cache tini
 
 # Set the working directory
 WORKDIR /app
-
 ENV NODE_ENV="production"
-
 EXPOSE 3005
 
 # Copy package.json and yarn.lock files
@@ -123,7 +99,7 @@ RUN sed -i 's_"schema": "./src/prisma/schema.prisma"_"schema": "./dist/prisma/sc
 # 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
+COPY --from=base /app/src/https ./dist/https
 
 # Add the node_modules/.bin directory to the PATH
 ENV PATH /app/node_modules/.bin:$PATH

docker-compose.yml

@@ -28,11 +28,11 @@ services:
     volumes:
       - pgadmin:/var/lib/pgadmin
 
-  engine-api:
+  engine:
     build:
       dockerfile: Dockerfile
       context: .
-      target: local_server
+      target: local
     env_file:
       - .env
     ports:
@@ -48,27 +48,6 @@ services:
     # - ./:/app
     # - node_modules:/app/node_modules
 
-  engine-worker:
-    build:
-      dockerfile: Dockerfile
-      context: .
-      target: local_worker
-    env_file:
-      - .env
-    ports:
-      - 3006:3006
-    depends_on:
-      - db
-    deploy:
-      resources:
-        limits:
-          cpus: "1"
-          memory: 1024M
-    # volumes:
-    # - ./:/app
-    # - node_modules:/app/node_modules
-
 volumes:
-  # node_modules:
   db_data:
   pgadmin:

docs/1-user-guide.md

@@ -123,7 +123,7 @@ POSTGRES_CONNECTION_URL=postgres://postgres:postgres@localhost:5432/postgres?ssl
 ```
 
 4. Run: `yarn install`
-5. Run: `yarn dev:server & yarn dev:worker`
+5. Run: `yarn dev:run`
 
 The API defaults to `http://localhost:3005`
 

package.json

@@ -13,7 +13,7 @@
     "dev:infra": "docker compose -f ./docker-compose-infra.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",
-    "build": "yarn && rm -rf dist && tsc -p ./tsconfig.json --outDir dist",
+    "build": "rm -rf dist && tsc -p ./tsconfig.json --outDir dist",
     "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",