review comments with cleanup + small fixes

Tool: gitpod/catfood.gitpod.cloud

Author: geropl

components/dashboard/src/repositories/detail/variables/EnableDockerdAuthentication.tsx

@@ -55,7 +55,7 @@ export const EnableDockerdAuthentication: FC<Props> = ({ configuration }) => {
                     <code>GITPOD_IMAGE_AUTH</code> environment variable.
                 </span>
 
-                <Alert type={"warning"} closable={false} showIcon={true} className="flex rounded p-2 w-2/3 mb-2 w-full">
+                <Alert type={"warning"} closable={false} showIcon={true} className="flex rounded p-2 mb-2 w-full">
                     By enabling this, credentials specified in <code>GITPOD_IMAGE_AUTH</code> will be visible inside all
                     workspaces on this project.
                 </Alert>

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

@@ -211,14 +211,6 @@ export function isClusterMaintenanceError(err: any): boolean {
     );
 }
 
-/**
- * Context for creating the actual workspace spec.
- * This is meant to help make the actual spec generation stateless and testable.
- */
-interface CreateSpecContext {
-    project?: Project;
-}
-
 @injectable()
 export class WorkspaceStarter {
     static readonly STARTING_PHASES: WorkspaceInstancePhase[] = ["preparing", "building", "pending"];
@@ -653,8 +645,7 @@ export class WorkspaceStarter {
             );
 
             // create spec
-            const specCtx = await this.getCreateSpecContext(user, workspace);
-            const spec = await this.createSpec({ span }, specCtx, user, workspace, instance, envVars);
+            const spec = await this.createSpec({ span }, user, workspace, instance, envVars);
 
             // create start workspace request
             const metadata = await this.createMetadata(workspace);
@@ -1379,7 +1370,6 @@ export class WorkspaceStarter {
 
     private async createSpec(
         traceCtx: TraceContext,
-        specCtx: CreateSpecContext,
         user: User,
         workspace: Workspace,
         instance: WorkspaceInstance,
@@ -1998,14 +1988,6 @@ export class WorkspaceStarter {
         };
     }
 
-    private async getCreateSpecContext(user: User, workspace: Workspace): Promise<CreateSpecContext> {
-        let project: Project | undefined;
-        if (workspace.projectId) {
-            project = await this.projectService.getProject(user.id, workspace.projectId, true);
-        }
-        return { project };
-    }
-
     private toWorkspaceFeatureFlags(featureFlags: NamedWorkspaceFeatureFlag[]): WorkspaceFeatureFlag[] {
         const result = featureFlags
             .map((name) => {

components/supervisor/pkg/supervisor/docker.go

@@ -318,7 +318,7 @@ func insertCredentialsIntoConfig(imageAuth string) (int, error) {
 			continue
 		}
 		host := parts[0]
-		if strings.Contains(host, "docker.io") {
+		if host == "docker.io" || strings.HasSuffix(host, ".docker.io") {
 			host = "https://index.docker.io/v1/"
 		}