remove --self-hosted flag

Author: nicktrn

apps/webapp/app/v3/remoteImageBuilder.server.ts

@@ -4,7 +4,7 @@ import { prisma } from "~/db.server";
 import { env } from "~/env.server";
 
 export async function createRemoteImageBuild(project: Project) {
-  if (!env.DEPOT_TOKEN || !env.DEPOT_PROJECT_ID) {
+  if (!remoteBuildsEnabled()) {
     return;
   }
 
@@ -57,3 +57,7 @@ async function createBuilderProjectIfNotExists(project: Project) {
 
   return result.project.projectId;
 }
+
+export function remoteBuildsEnabled() {
+  return env.DEPOT_TOKEN && env.DEPOT_PROJECT_ID && env.DEPOT_ORG_ID && env.DEPOT_REGION;
+}

apps/webapp/app/v3/services/finalizeDeploymentV2.server.ts

@@ -8,6 +8,7 @@ import { mkdtemp, writeFile } from "node:fs/promises";
 import { env } from "~/env.server";
 import { depot as execDepot } from "@depot/cli";
 import { FinalizeDeploymentService } from "./finalizeDeployment.server";
+import { remoteBuildsEnabled } from "../remoteImageBuilder.server";
 
 export class FinalizeDeploymentV2Service extends BaseService {
   public async call(
@@ -16,10 +17,9 @@ export class FinalizeDeploymentV2Service extends BaseService {
     body: FinalizeDeploymentRequestBody,
     writer?: WritableStreamDefaultWriter
   ) {
-    // if it's self hosted, lets just use the v1 finalize deployment service
-    if (body.selfHosted) {
+    // If remote builds are not enabled, lets just use the v1 finalize deployment service
+    if (!remoteBuildsEnabled()) {
       const finalizeService = new FinalizeDeploymentService();
-
       return finalizeService.call(authenticatedEnv, id, body);
     }
 

apps/webapp/app/v3/services/initializeDeployment.server.ts

@@ -5,7 +5,7 @@ import { env } from "~/env.server";
 import { type AuthenticatedEnvironment } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
 import { generateFriendlyId } from "../friendlyIdentifiers";
-import { createRemoteImageBuild } from "../remoteImageBuilder.server";
+import { createRemoteImageBuild, remoteBuildsEnabled } from "../remoteImageBuilder.server";
 import { calculateNextBuildVersion } from "../utils/calculateNextBuildVersion";
 import { BaseService, ServiceValidationError } from "./baseService.server";
 import { TimeoutDeploymentService } from "./timeoutDeployment.server";
@@ -46,13 +46,17 @@ export class InitializeDeploymentService extends BaseService {
 
       const nextVersion = calculateNextBuildVersion(latestDeployment?.version);
 
+      if (payload.selfHosted && remoteBuildsEnabled()) {
+        throw new ServiceValidationError(
+          "Self-hosted deployments are not supported on this instance"
+        );
+      }
+
       // Try and create a depot build and get back the external build data
-      const externalBuildData = payload.selfHosted
-        ? undefined
-        : await createRemoteImageBuild(environment.project);
+      const externalBuildData = await createRemoteImageBuild(environment.project);
 
       const triggeredBy = payload.userId
-        ? await this._prisma.user.findUnique({
+        ? await this._prisma.user.findFirst({
             where: {
               id: payload.userId,
               orgMemberships: {

packages/cli-v3/src/commands/deploy.ts

@@ -48,7 +48,6 @@ const DeployCommandOptions = CommonCommandOptions.extend({
   loadImage: z.boolean().default(false),
   buildPlatform: z.enum(["linux/amd64", "linux/arm64"]).default("linux/amd64"),
   namespace: z.string().optional(),
-  selfHosted: z.boolean().default(false),
   registry: z.string().optional(),
   push: z.boolean().default(false),
   config: z.string().optional(),
@@ -103,12 +102,6 @@ export function configureDeployCommand(program: Command) {
         "Skip promoting the deployment to the current deployment for the environment."
       )
   )
-    .addOption(
-      new CommandOption(
-        "--self-hosted",
-        "Build and load the image using your local Docker. Use the --registry option to specify the registry to push the image to when using --self-hosted, or just use --push to push to the default registry."
-      ).hideHelp()
-    )
     .addOption(
       new CommandOption(
         "--no-cache",
@@ -319,7 +312,6 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
   const deploymentResponse = await projectClient.client.initializeDeployment({
     contentHash: buildManifest.contentHash,
     userId: authorization.userId,
-    selfHosted: options.selfHosted,
     registryHost: options.registry,
     namespace: options.namespace,
     gitMeta,
@@ -331,16 +323,10 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
   }
 
   const deployment = deploymentResponse.data;
+  const isLocalBuild = !deployment.externalBuildData;
 
-  // If the deployment doesn't have any externalBuildData, then we can't use the remote image builder
-  // TODO: handle this and allow the user to the build and push the image themselves
-  if (!deployment.externalBuildData && !options.selfHosted) {
-    throw new Error(
-      `Failed to start deployment, as your instance of trigger.dev does not support hosting. To deploy this project, you must use the --self-hosted flag to build and push the image yourself.`
-    );
-  }
-
-  if (options.selfHosted) {
+  // Fail fast if we know local builds will fail
+  if (isLocalBuild) {
     const result = await x("docker", ["buildx", "version"]);
 
     if (result.exitCode !== 0) {
@@ -416,7 +402,7 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
   const registryHost = selfHostedRegistryHost ?? "registry.trigger.dev";
 
   const buildResult = await buildImage({
-    selfHosted: options.selfHosted,
+    selfHosted: isLocalBuild,
     buildPlatform: options.buildPlatform,
     noCache: options.noCache,
     push: options.push,
@@ -512,7 +498,7 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
     throw new SkipLoggingError("Failed to get deployment with worker");
   }
 
-  const imageReference = options.selfHosted
+  const imageReference = isLocalBuild
     ? `${selfHostedRegistryHost ? `${selfHostedRegistryHost}/` : ""}${buildResult.image}${
         buildResult.digest ? `@${buildResult.digest}` : ""
       }`
@@ -532,7 +518,6 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
     deployment.id,
     {
       imageReference,
-      selfHosted: options.selfHosted,
       skipPromotion: options.skipPromotion,
     },
     (logMessage) => {

packages/core/src/v3/schemas/api.ts

@@ -293,6 +293,7 @@ export type StartDeploymentIndexingResponseBody = z.infer<
 
 export const FinalizeDeploymentRequestBody = z.object({
   imageReference: z.string(),
+  /** @deprecated This is now determined by the webapp */
   selfHosted: z.boolean().optional(),
   skipRegistryProxy: z.boolean().optional(),
   skipPromotion: z.boolean().optional(),
@@ -338,6 +339,7 @@ export const InitializeDeploymentRequestBody = z.object({
   contentHash: z.string(),
   userId: z.string().optional(),
   registryHost: z.string().optional(),
+  /** @deprecated This is now determined by the webapp */
   selfHosted: z.boolean().optional(),
   namespace: z.string().optional(),
   gitMeta: GitMeta.optional(),