Feat: Unify Docker Images

.github/workflows/publish.yml

@@ -57,3 +57,5 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}

service/Dockerfile

@@ -20,6 +20,9 @@ RUN bun install --frozen-lockfile --production
 # Build stage
 FROM base AS builder
 
+ARG SENTRY_AUTH_TOKEN
+ENV SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN}
+
 # Copy package files
 COPY package.json bun.lock* ./
 
@@ -52,6 +55,9 @@ RUN apt-get update && \
 COPY src ./src
 COPY tsconfig.json ./tsconfig.json
 
+# Build bundle
+RUN bun run server:build
+
 # Production stage
 FROM base AS runner
 
@@ -67,10 +73,9 @@ COPY --from=builder /app/prisma/generated ./prisma/generated
 COPY --from=builder /app/prisma ./prisma
 COPY --from=builder /app/prisma.config.ts ./prisma.config.ts
 
-# Copy source code
-COPY --from=builder /app/src ./src
+# Copy built bundle
+COPY --from=builder /app/dist ./dist
 COPY --from=builder /app/package.json ./package.json
-COPY --from=builder /app/tsconfig.json ./tsconfig.json
 
 # Create non-root user for security
 RUN groupadd -r metorial && useradd -r -g metorial metorial && \
@@ -86,4 +91,4 @@ HEALTHCHECK --interval=30s --timeout=3s --start-period=40s --retries=3 \
     CMD curl -f http://localhost:52030/ping && curl -f http://localhost:12121/ || exit 1
 
 # Start command: push schema and start service
-CMD ["sh", "-c", "bun prisma db push --accept-data-loss && bun src/server.ts"]
+CMD ["sh", "-c", "bun prisma db push --accept-data-loss && bun ./dist/index.js"]

service/package.json

@@ -1,10 +1,13 @@
 {
   "name": "function-bay-service",
   "module": "index.ts",
-  "type": "module",
+  "type": "commonjs",
   "private": true,
   "scripts": {
-    "start": "bun ./src/server.ts",
+    "start": "bun run server:start",
+    "server:build": "ncc build ./src/server.ts -o ./dist --source-map --transpile-only && bun run sentry:sourcemaps",
+    "sentry:sourcemaps": "sentry-cli sourcemaps inject --org metorial --project mte-function-bay ./dist && sentry-cli sourcemaps upload --org metorial --project mte-function-bay ./dist",
+    "server:start": "bun ./dist/index.js",
     "dev": "bun --watch ./src/server.ts",
     "infra:up": "docker compose -p function-bay -f ./docker-compose.dev.yml --profile infra up -d --pull always",
     "infra:down": "docker compose -p function-bay -f ./docker-compose.dev.yml --profile infra down",
@@ -21,6 +24,7 @@
     "@lowerdeck/testing-tools": "^1.0.1",
     "@types/bun": "latest",
     "@types/lodash": "^4.17.23",
+    "@vercel/ncc": "^0.38.1",
     "vitest": "4.0.17"
   },
   "peerDependencies": {
@@ -54,6 +58,7 @@
     "@prisma/adapter-pg": "^7.2.0",
     "@prisma/client": "^7.2.0",
     "@sentry/bun": "^10.38.0",
+    "@sentry/cli": "^3.2.0",
     "date-fns": "^4.1.0",
     "jszip": "^3.10.1",
     "lodash": "4.17.21",

service/src/server.ts

@@ -1,4 +1,18 @@
-await import('./init');
-await import('./instrument');
-await import('./endpoints');
-await import('./worker');
+import { createRequire } from 'module';
+
+// Provide CommonJS `require` in ESM runtime for bundled deps.
+const require = createRequire(import.meta.url);
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+(globalThis as any).require = require;
+
+async function main() {
+  await import('./init');
+  await import('./instrument');
+  await import('./endpoints');
+  await import('./worker');
+}
+
+main().catch(err => {
+  console.error(err);
+  process.exit(1);
+});

service/tsconfig.json

@@ -10,7 +10,6 @@
 
     // Bundler mode
     "moduleResolution": "bundler",
-    "allowImportingTsExtensions": true,
     "verbatimModuleSyntax": true,
     "noEmit": true,