Fixup cloning our special SHA

Author: filiptronicek

components/server/src/workspace/context-parser-service.ts

@@ -132,7 +132,6 @@ export class ContextParser {
         try {
             // Note: we only care about repo related stuff in this function.
             // Fields like `config.image` will not be exposed, so we don't pass organizationId here
-            let config = await this.configProvider.fetchConfig({ span }, user, context);
             let mainRepoContext: WorkspaceContext | undefined;
             if (config.config.mainConfiguration) {
                 mainRepoContext = await this.internalHandleWithoutPrefix(
@@ -194,6 +193,9 @@ export class ContextParser {
             if (ExternalImageConfigFile.is(config.config.image)) {
                 if (config.config.image.externalSource.revision === ImageFileRevisionMissing) {
                     context.warnings.push("The Dockerfile specified in the .gitpod.yml file was not found.");
+
+                    // we let the image builder try cloning the context's revision
+                    config.config.image.externalSource.revision = context.revision;
                 }
             }
 

components/server/src/workspace/workspace-factory.ts

@@ -21,13 +21,14 @@ import {
     WithSnapshot,
     Workspace,
     WorkspaceContext,
+    WorkspaceImageSourceDocker,
 } from "@gitpod/gitpod-protocol";
 import { ApplicationError, ErrorCodes } from "@gitpod/gitpod-protocol/lib/messaging/error";
 import { generateWorkspaceID } from "@gitpod/gitpod-protocol/lib/util/generate-workspace-id";
 import { log } from "@gitpod/gitpod-protocol/lib/util/logging";
 import { TraceContext } from "@gitpod/gitpod-protocol/lib/util/tracing";
 import { inject, injectable } from "inversify";
-import { RepoURL } from "../repohost";
+import { ImageFileRevisionMissing, RepoURL } from "../repohost";
 import { ConfigProvider } from "./config-provider";
 import { ImageSourceProvider } from "./image-source-provider";
 import { increasePrebuildsStartedCounter } from "../prometheus-metrics";
@@ -328,6 +329,10 @@ export class WorkspaceFactory {
             if (config._origin === "derived" && literalConfig) {
                 (context as any as AdditionalContentContext).additionalFiles = { ...literalConfig };
             }
+            if (WorkspaceImageSourceDocker.is(imageSource) && imageSource.dockerFileHash === ImageFileRevisionMissing) {
+                // we let the workspace create here and let it fail to build the image
+                imageSource.dockerFileHash = context.revision;
+            }
 
             let projectId: string | undefined;
             // associate with a project, if the current user is a team member

components/server/src/workspace/workspace-starter.ts

@@ -140,6 +140,7 @@ import { IDESettingsVersion } from "@gitpod/gitpod-protocol/lib/ide-protocol";
 import { getFeatureFlagEnableExperimentalJBTB } from "../util/featureflags";
 import { OrganizationService } from "../orgs/organization-service";
 import { ProjectsService } from "../projects/projects-service";
+import { ImageFileRevisionMissing } from "../repohost";
 
 export interface StartWorkspaceOptions extends Omit<GitpodServer.StartWorkspaceOptions, "ideSettings"> {
     excludeFeatureFlags?: NamedWorkspaceFeatureFlag[];
@@ -275,6 +276,13 @@ export class WorkspaceStarter {
                     workspace.context as CommitContext,
                     workspace.config,
                 );
+                if (
+                    WorkspaceImageSourceDocker.is(imageSource) &&
+                    imageSource.dockerFileHash === ImageFileRevisionMissing
+                ) {
+                    // we let the workspace create here and let it fail to build the image
+                    imageSource.dockerFileHash = (workspace.context as CommitContext).revision;
+                }
                 log.debug("Found workspace without imageSource, generated one", { imageSource });
 
                 workspace.imageSource = imageSource;