Compose docker build

.gitignore

@@ -62,4 +62,8 @@ dist
 # should be here otherwise if placed inside prisma-client pnpm deploy doesn't copy it
 packages/prisma-client/src/__generated__
 
-.temp
+.temp
+
+
+.nx/cache
+.nx/workspace-data

Dockerfile

@@ -0,0 +1,31 @@
+FROM node:22.13.1-alpine AS builder
+
+# Set working directory
+WORKDIR /app
+
+# Copy application files 
+COPY packages/ ./packages
+COPY pnpm-workspace.yaml ./
+COPY apps/builder/ ./
+
+# Install dependencies
+RUN corepack enable && corepack prepare pnpm@latest --activate
+RUN pnpm install
+
+# Build the application (if needed, adjust accordingly)
+RUN pnpm run build
+
+# -- Second Stage: Production Image --
+FROM node:22.13.1-alpine AS production
+
+# Set working directory
+WORKDIR /app
+
+# Copy only necessary files from builder stage
+COPY --from=builder /app .
+
+# Expose necessary port
+EXPOSE 13100
+
+# Set entry point
+CMD ["npx", "remix-serve", "build/server/index.js"]

apps/builder/.env

@@ -3,7 +3,7 @@
 DATABASE_URL=postgresql://postgres:pass@localhost/webstudio?pgbouncer=true
 DIRECT_URL=postgresql://postgres:pass@localhost/webstudio
 
-AUTH_SECRET="# Linux: $(openssl rand -hex 32) or go to https://generate-secret.now.sh/64"
+AUTH_SECRET="rand"
 DEV_LOGIN=true
 
 # Restrictions
@@ -47,13 +47,10 @@ FEATURES=*
 # Current user plan features (default)
 USER_PLAN=pro
 
-
 # TRCP server url and API token. If empty local TRPC server is used
 # TRPC_SERVER_URL=
 # TRPC_SERVER_API_TOKEN=
 
 # AI Features
 # OPENAI_KEY=
 # OPENAI_ORG=
-
-

apps/builder/vite.config.ts

@@ -35,7 +35,7 @@ export default defineConfig(({ mode }) => {
   return {
     plugins: [
       remix({
-        presets: [vercelPreset()],
+        presets: [],
         future: {
           v3_lazyRouteDiscovery: false,
           v3_relativeSplatPath: false,
@@ -86,50 +86,50 @@ export default defineConfig(({ mode }) => {
     define: {
       "process.env.NODE_ENV": JSON.stringify(mode),
     },
-    server: {
-      // Service-to-service OAuth token call requires a specified host for the wstd.dev domain
-      host: "wstd.dev",
-      // Needed for SSL
-      proxy: {},
-
-      https: {
-        key: readFileSync("../../https/privkey.pem"),
-        cert: readFileSync("../../https/fullchain.pem"),
-      },
-      cors: ((
-        req: IncomingMessage,
-        callback: (error: Error | null, options: CorsOptions | null) => void
-      ) => {
-        // Handle CORS preflight requests in development to mimic Remix production behavior
-        if (req.method === "OPTIONS" || req.method === "POST") {
-          if (req.headers.origin != null && req.url != null) {
-            const url = new URL(req.url, `https://${req.headers.host}`);
-
-            // Allow CORS for /builder-logout path when requested from the authorization server
-            if (url.pathname === "/builder-logout" && isBuilderUrl(url.href)) {
-              return callback(null, {
-                origin: getAuthorizationServerOrigin(url.href),
-                preflightContinue: false,
-                credentials: true,
-              });
-            }
-          }
-
-          if (req.method === "OPTIONS") {
-            // Respond with method not allowed for other preflight requests
-            return callback(null, {
-              preflightContinue: false,
-              optionsSuccessStatus: 405,
-            });
-          }
-        }
-
-        // Disable CORS for all other requests
-        return callback(null, {
-          origin: false,
-        });
-      }) as never,
-    },
+    // server: {
+    //   // Service-to-service OAuth token call requires a specified host for the wstd.dev domain
+    //   host: "wstd.dev",
+    //   // Needed for SSL
+    //   proxy: {},
+    //
+    //   https: {
+    //     key: readFileSync("../../https/privkey.pem"),
+    //     cert: readFileSync("../../https/fullchain.pem"),
+    //   },
+    //   cors: ((
+    //     req: IncomingMessage,
+    //     callback: (error: Error | null, options: CorsOptions | null) => void
+    //   ) => {
+    //     // Handle CORS preflight requests in development to mimic Remix production behavior
+    //     if (req.method === "OPTIONS" || req.method === "POST") {
+    //       if (req.headers.origin != null && req.url != null) {
+    //         const url = new URL(req.url, `https://${req.headers.host}`);
+    //
+    //         // Allow CORS for /builder-logout path when requested from the authorization server
+    //         if (url.pathname === "/builder-logout" && isBuilderUrl(url.href)) {
+    //           return callback(null, {
+    //             origin: getAuthorizationServerOrigin(url.href),
+    //             preflightContinue: false,
+    //             credentials: true,
+    //           });
+    //         }
+    //       }
+    //
+    //       if (req.method === "OPTIONS") {
+    //         // Respond with method not allowed for other preflight requests
+    //         return callback(null, {
+    //           preflightContinue: false,
+    //           optionsSuccessStatus: 405,
+    //         });
+    //       }
+    //     }
+    //
+    //     // Disable CORS for all other requests
+    //     return callback(null, {
+    //       origin: false,
+    //     });
+    //   }) as never,
+    // },
     envPrefix: "GITHUB_",
   };
 });