Merge pull request #17 from drewpayment/16-bug-gh-action-failing-after-converting-to-bun-package-manager

refactor: migrate from pnpm to bun

Author: drewpayment

Dockerfile

@@ -1,7 +1,7 @@
 # Build with:   docker build -t IMAGE_NAME .
 # Run with:     docker run -p 3000:3000 --rm --name IMAGE_NAME IMAGE_NAME
 
-FROM node:20-slim AS builder
+FROM oven/bun:1 AS builder
 WORKDIR /staging
 
 # Install necessary build dependencies
@@ -12,31 +12,28 @@ RUN apt-get update && apt-get install -y \
     && rm -rf /var/lib/apt/lists/*
 
 # Copy package files first for better caching
-COPY package.json pnpm-lock.yaml ./
+COPY package.json bun.lockb* ./
 
-# Enable corepack and install dependencies
-RUN corepack enable && \
-    pnpm install --frozen-lockfile
+# Install dependencies
+RUN bun install --frozen-lockfile
 
 # Copy the rest of the application
 COPY . .
 
 # Generate Drizzle models first, then build
-RUN pnpm generate-migrations:postgres && \
-    pnpm generate-migrations:mysql && \
-    pnpm build && \
-    pnpm prune --prod
+RUN bun run generate-migrations:postgres && \
+    bun run generate-migrations:mysql && \
+    bun run build
 
-FROM node:20-slim
+FROM oven/bun:1-slim
 ARG ORIGIN=http://localhost:3000
 ENV ORIGIN=$ORIGIN
 WORKDIR /app
 
 # Copy necessary files from builder
-COPY --from=builder /staging/package.json /staging/pnpm-lock.yaml ./
+COPY --from=builder /staging/package.json ./
 COPY --from=builder /staging/node_modules ./node_modules
 COPY --from=builder /staging/build ./build
-COPY --from=builder /staging/.tunnel_key ./.tunnel_key
 
 EXPOSE 3000
-CMD ["node", "-r", "dotenv/config", "./build/index.js"]
+CMD ["bun", "run", "./build/index.js"]

package.json

@@ -10,8 +10,8 @@
     "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
     "lint": "prettier --plugin-search-dir . --check . && eslint .",
     "format": "prettier --plugin-search-dir . --write .",
-    "generate-migrations:mysql": "drizzle-kit generate:mysql --config=src/lib/drizzle/mysql/drizzle.config.ts",
-    "generate-migrations:postgres": "drizzle-kit generate:pg --config=src/lib/drizzle/postgres/drizzle.config.ts",
+    "generate-migrations:mysql": "drizzle-kit generate --config=src/lib/drizzle/mysql/drizzle.config.ts",
+    "generate-migrations:postgres": "drizzle-kit generate --config=src/lib/drizzle/postgres/drizzle.config.ts",
     "generate-migrations:turso": "drizzle-kit generate:turso --config=src/lib/drizzle/turso/drizzle.config.ts",
     "push:mysql": "drizzle-kit push --config=src/lib/drizzle/mysql/drizzle.config.ts",
     "push:pg": "drizzle-kit push --config=src/lib/drizzle/postgres/drizzle.config.ts ",

src/lib/drizzle/mysql/client.ts

@@ -32,7 +32,9 @@ const getPrivateKey = async (): Promise<string> => {
     // Otherwise use the direct key value
     if (TUNNEL_PRIVATE_KEY) {
       debug('Using provided SSH private key...');
-      return TUNNEL_PRIVATE_KEY;
+      const base64TunnelPrivateKey = TUNNEL_PRIVATE_KEY;
+            
+      return Buffer.from(base64TunnelPrivateKey, 'base64').toString('utf8');
     }
 
     throw new Error('No private key provided. Set either TUNNEL_PRIVATE_KEY or TUNNEL_PRIVATE_KEY_PATH');
@@ -128,7 +130,7 @@ const createConnection = async (): Promise<Connection> => {
     const debugLogger = TUNNEL_DEBUG === 'true' ? console.log : undefined;
 
     const [server] = await createTunnel(
-      { 
+      {
         debug: TUNNEL_DEBUG === 'true',
         debugLogger,
         keepAlive: true

src/lib/drizzle/mysql/drizzle.config.ts

@@ -5,7 +5,7 @@ dotenv.config();
 
 export default {
 	schema: './src/lib/drizzle/mysql/schema.ts',
-	driver: 'mysql2',
+	dialect: 'mysql',
 	dbCredentials: {
 		host: process.env.MYSQL_DB_HOST as string,
 		port: Number(process.env.MYSQL_DB_PORT),