[server] Wait for image build logs in preparing state

gitpod-io · Jan 6, 2023 · 907cc87 · 907cc87
1 parent 277a1f2
commit 907cc87
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/components/dashboard/debug.sh b/components/dashboard/debug.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+# Licensed under the GNU Affero General Public License (AGPL).
+# See License.AGPL.txt in the project root for license information.
+
+set -Eeuo pipefail
+source /workspace/gitpod/scripts/ws-deploy.sh deployment dashboard
diff --git a/components/server/src/workspace/gitpod-server-impl.ts b/components/server/src/workspace/gitpod-server-impl.ts
@@ -1639,7 +1639,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
             await new Promise((resolve) => setTimeout(resolve, 2000));
 
             const wsi = await this.workspaceDb.trace(ctx).findInstanceById(instance.id);
-            if (!wsi || wsi.status.phase !== "building") {
+            if (!wsi || !["preparing", "building"].includes(wsi.status.phase)) {
                 log.debug(logCtx, `imagebuild logs: instance is not/no longer in 'building' state`, {
                     phase: wsi?.status.phase,
                 });