From d9f8a4f529e9b93c578a14dff56617c4adf92d1b Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Wed, 31 Jan 2024 14:48:49 +0000 Subject: [PATCH 1/5] fix(dogfood): fix startup script on worksapce creation --- dogfood/main.tf | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dogfood/main.tf b/dogfood/main.tf index 8a638d314c7da..00d44703e3afb 100644 --- a/dogfood/main.tf +++ b/dogfood/main.tf @@ -266,8 +266,15 @@ resource "coder_agent" "dev" { sudo service docker start # Install playwright dependencies # We want to use the playwright version from site/package.json - cd "${local.repo_dir}/site" && pnpm install && pnpm playwright:install -EOT + # Check if the directory exists At workspace creation as the coder_script runs in parallel so clone does not exist. + # it will run on fine on a restart though + if [ -d "${local.repo_dir}/site" ]; then + cd "${local.repo_dir}/site" && pnpm install && pnpm playwright:install + else + echo "The directory ${local.repo_dir}/site does not exist. Clone is not complete." + echo 'Please run "${local.repo_dir}/site && pnpm install && pnpm playwright:instal" after workspace creation' + fi + EOT } resource "docker_volume" "home_volume" { From 7509ab8cfa21768cdcba7e94e51f07653ac9015b Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Wed, 31 Jan 2024 17:52:28 +0300 Subject: [PATCH 2/5] Update main.tf --- dogfood/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dogfood/main.tf b/dogfood/main.tf index 00d44703e3afb..77070002da4fc 100644 --- a/dogfood/main.tf +++ b/dogfood/main.tf @@ -272,7 +272,7 @@ resource "coder_agent" "dev" { cd "${local.repo_dir}/site" && pnpm install && pnpm playwright:install else echo "The directory ${local.repo_dir}/site does not exist. Clone is not complete." - echo 'Please run "${local.repo_dir}/site && pnpm install && pnpm playwright:instal" after workspace creation' + echo 'Please run "cd ${local.repo_dir}/site && pnpm install && pnpm playwright:instal" after workspace creation' fi EOT } From 232dfd1aacf3d807669f63aea1fd5773a04666c6 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Wed, 31 Jan 2024 17:54:47 +0300 Subject: [PATCH 3/5] Update main.tf --- dogfood/main.tf | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dogfood/main.tf b/dogfood/main.tf index 77070002da4fc..e3ceed1fc40c0 100644 --- a/dogfood/main.tf +++ b/dogfood/main.tf @@ -267,13 +267,9 @@ resource "coder_agent" "dev" { # Install playwright dependencies # We want to use the playwright version from site/package.json # Check if the directory exists At workspace creation as the coder_script runs in parallel so clone does not exist. - # it will run on fine on a restart though - if [ -d "${local.repo_dir}/site" ]; then - cd "${local.repo_dir}/site" && pnpm install && pnpm playwright:install - else - echo "The directory ${local.repo_dir}/site does not exist. Clone is not complete." - echo 'Please run "cd ${local.repo_dir}/site && pnpm install && pnpm playwright:instal" after workspace creation' - fi + while ! [[ -f "${local.repo_dir}/site/package.json" ]]; do + sleep 1 + done EOT } From 39d5e1cae1cc6724a925846d4aeea9e87810183b Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Wed, 31 Jan 2024 17:55:21 +0300 Subject: [PATCH 4/5] Update main.tf --- dogfood/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dogfood/main.tf b/dogfood/main.tf index e3ceed1fc40c0..f96731078ed35 100644 --- a/dogfood/main.tf +++ b/dogfood/main.tf @@ -266,7 +266,7 @@ resource "coder_agent" "dev" { sudo service docker start # Install playwright dependencies # We want to use the playwright version from site/package.json - # Check if the directory exists At workspace creation as the coder_script runs in parallel so clone does not exist. + # Check if the directory exists At workspace creation as the coder_script runs in parallel so clone might not exist yet. while ! [[ -f "${local.repo_dir}/site/package.json" ]]; do sleep 1 done From cf9225418d9f88e96814f9f81845adf2fb8cc049 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Wed, 31 Jan 2024 17:56:13 +0300 Subject: [PATCH 5/5] Update main.tf --- dogfood/main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/dogfood/main.tf b/dogfood/main.tf index f96731078ed35..11063d63c9e68 100644 --- a/dogfood/main.tf +++ b/dogfood/main.tf @@ -270,6 +270,7 @@ resource "coder_agent" "dev" { while ! [[ -f "${local.repo_dir}/site/package.json" ]]; do sleep 1 done + cd "${local.repo_dir}/site" && pnpm install && pnpm playwright:install EOT }