Refactor Docker Stack

.dockerignore

@@ -0,0 +1,16 @@
+node_modules
+.vscode
+.env*
+dist
+.github
+
+*.compose.yaml
+docker/*
+!docker/entrypoint.sh
+
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

.gitignore

@@ -2,11 +2,10 @@ node_modules
 .vscode
 .env
 dist
-.data
 
 .yarn/*
 !.yarn/patches
 !.yarn/plugins
 !.yarn/releases
 !.yarn/sdks
-!.yarn/versions
+!.yarn/versions

dev.compose.yaml

@@ -0,0 +1,32 @@
+version: "3.9"
+
+services:
+  postgres:
+    container_name: "snailycad-bot-postgres"
+    image: postgres
+    command: -p ${DB_PORT:-5554}
+    env_file:
+      - .env
+    ports:
+      - "${DB_PORT:-5554}:${DB_PORT:-5554}"
+    volumes:
+      - snailybot-dev-db-data:/var/lib/postgresql/data
+
+  api:
+    container_name: "snaily-cad-bot"
+    image: snaily-cad-bot:dev
+    build:
+      context: .
+      dockerfile: docker/Dockerfile
+      target: development
+    volumes:
+      - .:/srv
+    env_file:
+      - .env
+    environment:
+      - NODE_ENV=development
+    depends_on:
+      - postgres
+
+volumes:
+  snailybot-dev-db-data:

docker/Dockerfile

@@ -0,0 +1,37 @@
+# Builder Image
+FROM node:18 as builder
+
+LABEL stage=builder
+
+WORKDIR /srv
+
+COPY . .
+
+RUN yarn install && yarn run build
+
+# Development Image
+FROM node:18 as development 
+
+COPY docker/entrypoint.sh .
+
+RUN chmod +x entrypoint.sh
+
+WORKDIR /srv
+
+ENTRYPOINT ["/entrypoint.sh"]
+
+# Production Image
+FROM node:18-alpine as production
+
+COPY docker/entrypoint.sh .
+
+RUN chmod +x entrypoint.sh
+
+WORKDIR /app
+
+COPY --from=builder /srv/package.json /srv/yarn.lock /srv/.yarn /srv/prisma .
+COPY --from=builder /srv/dist ./dist
+
+RUN yarn install --production
+
+ENTRYPOINT ["/entrypoint.sh"]

docker/entrypoint.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+echo "███████╗███╗   ██╗ █████╗ ██╗██╗  ██╗   ██╗ ██████╗ █████╗ ██████╗     ██████╗  ██████╗ ████████╗"
+echo "██╔════╝████╗  ██║██╔══██╗██║██║  ╚██╗ ██╔╝██╔════╝██╔══██╗██╔══██╗    ██╔══██╗██╔═══██╗╚══██╔══╝"
+echo "███████╗██╔██╗ ██║███████║██║██║   ╚████╔╝ ██║     ███████║██║  ██║    ██████╔╝██║   ██║   ██║"
+echo "╚════██║██║╚██╗██║██╔══██║██║██║    ╚██╔╝  ██║     ██╔══██║██║  ██║    ██╔══██╗██║   ██║   ██║"
+echo "███████║██║ ╚████║██║  ██║██║███████╗██║   ╚██████╗██║  ██║██████╔╝    ██████╔╝╚██████╔╝   ██║"
+echo "╚══════╝╚═╝  ╚═══╝╚═╝  ╚═╝╚═╝╚══════╝╚═╝    ╚═════╝╚═╝  ╚═╝╚═════╝     ╚═════╝  ╚═════╝    ╚═╝"
+
+[ $NODE_ENV == "development" ] && echo "App running in development mode" && yarn install && yarn run dev
+[ $NODE_ENV == "production" ] && echo "App running in production mode" && yarn run start

package.json

@@ -4,19 +4,25 @@
   "type": "module",
   "license": "MIT",
   "scripts": {
-    "dev": "npx prisma db push && nodemon",
-    "build": "npx prisma generate && npx swc ./src -d dist",
-    "start": "npx prisma migrate deploy && node dist/index.js",
+    "dev": "prisma migrate dev && tsx watch src/index.ts",
+    "build": "prisma generate && swc src -d dist",
+    "start": "prisma migrate deploy && node ./dist/index.js",
     "format": "prettier --write \"**/*.{js,jsx,ts,tsx,json}\" --ignore-path .gitignore",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
     "test-tsc": "tsc --noEmit",
-    "postinstall": "npx prisma generate"
+    "postinstall": "prisma generate",
+    "docker-dev:start": "docker compose -f dev.compose.yaml build --no-cache && docker compose -f dev.compose.yaml up -d",
+    "docker-dev:stop": "docker compose -f dev.compose.yaml down",
+    "docker-prod:start": "docker compose -f prod.compose.yaml build --no-cache && docker compose -f prod.compose.yaml up -d",
+    "docker-prod:stop": "docker compose -f prod.compose.yaml down"
   },
   "dependencies": {
     "@discordjs/builders": "^1.6.5",
     "@prisma/client": "^5.5.2",
     "@sentry/node": "^7.76.0",
+    "@swc/helpers": "^0.5.3",
     "discord.js": "^14.13.0",
+    "dotenv": "^16.3.1",
     "globby": "^13.2.2",
     "pretty-ms": "^8.0.0",
     "undici": "^5.27.0"
@@ -25,16 +31,13 @@
     "@casperiv/eslint-config": "^8.0.0",
     "@swc/cli": "^0.1.62",
     "@swc/core": "^1.3.95",
-    "@swc/helpers": "^0.5.3",
     "@types/glob": "^8.1.0",
     "@types/node": "^20.8.9",
-    "dotenv": "^16.3.1",
     "eslint": "^8.52.0",
-    "nodemon": "^3.0.1",
     "prettier": "^3.0.3",
     "prisma": "^5.5.2",
     "regenerator-runtime": "^0.14.0",
-    "ts-node": "^10.9.1",
+    "tsx": "^4.7.0",
     "typescript": "^5.2.2"
   },
   "packageManager": "[email protected]"

prod.compose.yaml

@@ -0,0 +1,30 @@
+version: "3.9"
+
+services:
+  postgres:
+    container_name: "snailycad-bot-postgres"
+    image: postgres
+    command: -p ${DB_PORT:-55545}
+    env_file:
+      - .env
+    # ports:
+    #   - "${DB_PORT:-55545}:${DB_PORT:-55545}"
+    volumes:
+      - snailybot-db-data:/var/lib/postgresql/data
+
+  api:
+    container_name: "snaily-cad-bot"
+    image: snaily-cad-bot:prod
+    build:
+      context: .
+      dockerfile: ./docker/Dockerfile
+      target: production
+    env_file:
+      - .env
+    environment:
+      - NODE_ENV=production
+    depends_on:
+      - postgres
+
+volumes:
+  snailybot-db-data:

tsconfig.json

@@ -1,8 +1,14 @@
 {
-  "exclude": [".dev-data", ".data"],
+  "include": [
+    "src/**/*"
+  ],
+  "exclude": [
+    ".dev-data",
+    ".data",
+    "node_modules"
+  ],
   "compilerOptions": {
     /* Visit https://aka.ms/tsconfig.json to read more about this file */
-
     /* Basic Options */
     "target": "esnext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'. */,
     "module": "esnext" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
@@ -12,8 +18,9 @@
     "importHelpers": true,
     "outDir": "dist",
     "sourceMap": true,
-    "lib": ["esnext"],
-
+    "lib": [
+      "esnext"
+    ],
     /* Strict Type-Checking Options */
     "strict": true /* Enable all strict type-checking options. */,
     "strictNullChecks": true /* Enable strict null checks. */,
@@ -22,24 +29,18 @@
     "strictPropertyInitialization": true /* Enable strict checking of property initialization in classes. */,
     "noImplicitThis": true /* Raise error on 'this' expressions with an implied 'any' type. */,
     "alwaysStrict": true /* Parse in strict mode and emit "use strict" for each source file. */,
-
     /* Additional Checks */
     "noUnusedLocals": true /* Report errors on unused locals. */,
     "noUnusedParameters": true /* Report errors on unused parameters. */,
     "noImplicitReturns": true /* Report error when not all code paths in function return a value. */,
     "noFallthroughCasesInSwitch": true /* Report errors for fallthrough cases in switch statement. */,
     "noUncheckedIndexedAccess": true /* Include 'undefined' in index signature results */,
     "noPropertyAccessFromIndexSignature": true /* Require undeclared properties from index signatures to use element accesses. */,
-
     /* Module Resolution Options */
     "moduleResolution": "node" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */,
     "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
-
     /* Advanced Options */
     "skipLibCheck": true /* Skip type checking of declaration files. */,
     "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
-  },
-  "ts-node": {
-    "swc": true
   }
 }