fix: simplify docker setup (#41)

Co-authored-by: Alexandru Matei <alexandrumatei3693@gmail.com>

.dockerignore

@@ -1,9 +1,12 @@
-node_modules
 Dockerfile
+docker-compose.yml
+volumes
+**/dist
+**/node_modules
 .dockerignore
-.vscode
+.env
+.git*
+.husky
 .pnpm-store
 .turbo
-**/dist
-dist
-.env
+.vscode

Dockerfile

@@ -1,5 +1,5 @@
 # Set the build image
-FROM node:20 AS development
+FROM node:20
 
 # Set the work directory
 WORKDIR /usr/src/app
@@ -21,32 +21,10 @@ COPY packages/template/package.json ./packages/template/package.json
 COPY packages/typescript-config/package.json ./packages/typescript-config/package.json
 
 # Build the dependencies into a node_modules folder
-RUN pnpm install --frozen-lockfile --ignore-scripts
+RUN pnpm install --frozen-lockfile
 
 # Copy the rest of the files & build the app
-COPY ./apps ./apps
-COPY ./packages ./packages
-RUN pnpm build
-
-# Set the production image
-FROM node:20-alpine AS production
-
-ARG NODE_ENV=production
-ENV NODE_ENV=${NODE_ENV}
-
-WORKDIR /usr/src/app
+COPY . .
 
-# Copy pnpm from the development stage
-COPY --from=development /usr/local/bin/pnpm /usr/local/bin/pnpm
-
-# Copy over the built files from the development stage
-COPY --from=development /usr/src/app/apps ./apps
-COPY --from=development /usr/src/app/packages ./packages
-COPY --from=development /usr/src/app/node_modules ./node_modules
-
-# Change the working directory to the apps/node directory
-WORKDIR /usr/src/app/apps/node
-
-COPY ./docker ./docker
-
-CMD ["sh", "./docker/prod.command.sh"]
+# Build the monorepo
+RUN pnpm build

apps/node/package.json

@@ -5,6 +5,7 @@
   "main": "index.js",
   "scripts": {
     "start": "ts-node ./src/app",
+    "start:prod": "node dist/app",
     "build": "tsc -b",
     "format": "prettier --write src",
     "lint": "eslint --fix",

docker-compose.yml

@@ -25,17 +25,14 @@ services:
   indexer-scraper:
     build:
       context: .
-      target: development
     container_name: indexer_service
     volumes:
-      - .:/usr/src/app
+      # - .:/usr/src/app
       - indexer-node-modules:/usr/src/app/node_modules
-    command: /bin/sh -c "/bin/sh ./docker/migrations.command.sh && /bin/sh ./docker/dev.command.sh"
-    working_dir: "/usr/src/app"
+    command: [sh, -c, "pnpm db:indexer-database:migrate:run && pnpm start:indexer"]
     env_file:
       - .env
     environment:
-      APP: indexer
       INDEXER_REDIS_HOST: redis
       DATABASE_HOST: postgres
     depends_on:
@@ -46,19 +43,16 @@ services:
   indexer-api:
     build:
       context: .
-      target: development
     container_name: indexer_api
-    working_dir: "/usr/src/app"
     volumes:
-      - .:/usr/src/app
+      # - .:/usr/src/app
       - indexer-api-node-modules:/usr/src/app/node_modules
     ports:
       - ${PORT}:${PORT}
-    command: ["/bin/sh", "./docker/dev.command.sh"]
+    command: pnpm start:indexer-api
     env_file:
       - .env
     environment:
-      APP: indexer-api
       INDEXER_REDIS_HOST: redis
       DATABASE_HOST: postgres
     depends_on:

package.json

@@ -8,14 +8,16 @@
     "check": "turbo check",
     "test": "turbo test",
     "start:indexer": "APP=indexer pnpm --filter @repo/node-app start",
+    "start:indexer:prod": "APP=indexer pnpm --filter @repo/node-app start:prod",
     "start:indexer-api": "APP=indexer-api pnpm --filter @repo/node-app start",
+    "start:indexer-api:prod": "APP=indexer-api pnpm --filter @repo/node-app start:prod",
     "start:template": "APP=template pnpm --filter @repo/node-app start",
     "start:persistence-example": "APP=persistence-example pnpm --filter @repo/node-app start",
     "prepare": "husky",
     "db:persistence-example:migrate:generate": "cd packages/persistence-example; pnpm db:migration:generate $MIGRATION_PATH",
     "db:persistence-example:migrate:run": "cd packages/persistence-example; pnpm db:migration:run",
     "db:indexer-database:migrate:generate": "cd packages/indexer-database; pnpm db:migration:generate $MIGRATION_PATH",
-    "db:indexer-database:migrate:run": "cd packages/indexer-database; pnpm db:migration:run",
+    "db:indexer-database:migrate:run": "pnpm --filter @repo/indexer-database db:migration:run",
     "dev-env:up": "docker compose up -d --build",
     "dev-env:down": "docker compose down"
   },