From 7b63db10d250af04d70d33fe1509582742ab88aa Mon Sep 17 00:00:00 2001 From: Ofer Shaal Date: Tue, 2 Aug 2022 03:31:48 +0000 Subject: [PATCH 1/6] use Gitpod's node-LTS base image --- .gitpod.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index e6dbb0118361..0971bc5334e1 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -1,4 +1,4 @@ -FROM gitpod/workspace-node +FROM gitpod/workspace-node-lts # Install latest pnpm RUN pnpm i -g pnpm From b685f8ebbe3b4dec3a350eeea661eb6fc3a02284 Mon Sep 17 00:00:00 2001 From: Ofer Shaal Date: Tue, 2 Aug 2022 03:32:12 +0000 Subject: [PATCH 2/6] update gitpod command waiting for port --- .gitpod/gitpod-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod/gitpod-setup.sh b/.gitpod/gitpod-setup.sh index 883b3b1c97f7..4385432e2f15 100755 --- a/.gitpod/gitpod-setup.sh +++ b/.gitpod/gitpod-setup.sh @@ -15,7 +15,7 @@ else fi # Wait for VSCode to be ready (port 23000) -gp await-port 23000 > /dev/null 2>&1 +gp ports --await 23000 > /dev/null 2>&1 echo "Loading example project:" $EXAMPLE_PROJECT From 51e7ceeb8c50d933f97fdf34dfe0e8c578f7714f Mon Sep 17 00:00:00 2001 From: Ofer Shaal Date: Tue, 2 Aug 2022 03:40:31 +0000 Subject: [PATCH 3/6] export variables for pnpm --- .gitpod.Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 0971bc5334e1..648493347d93 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -1,6 +1,8 @@ FROM gitpod/workspace-node-lts # Install latest pnpm +RUN export PNPM_HOME="/home/gitpod/.local/share/pnpm" +RUN export PATH="$PNPM_HOME:$PATH" RUN pnpm i -g pnpm # Install deno in gitpod From 33d112bc2baf72f8ffeddbc17e832ec421f518e1 Mon Sep 17 00:00:00 2001 From: Ofer Shaal Date: Tue, 2 Aug 2022 03:49:45 +0000 Subject: [PATCH 4/6] install pnpm using recommended method --- .gitpod.Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 648493347d93..40e1c155e160 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -1,9 +1,7 @@ -FROM gitpod/workspace-node-lts +FROM gitpod/workspace-node # Install latest pnpm -RUN export PNPM_HOME="/home/gitpod/.local/share/pnpm" -RUN export PATH="$PNPM_HOME:$PATH" -RUN pnpm i -g pnpm +RUN curl -fsSL https://get.pnpm.io/install.sh | sh - # Install deno in gitpod RUN curl -fsSL https://deno.land/x/install/install.sh | sh From 6d4cd102ef797c38470bb699c4907cc8e510abbd Mon Sep 17 00:00:00 2001 From: Ofer Shaal Date: Tue, 2 Aug 2022 03:54:44 +0000 Subject: [PATCH 5/6] fix prebuild's shell problem --- .gitpod.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 40e1c155e160..b5c2057344e3 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -1,7 +1,7 @@ FROM gitpod/workspace-node # Install latest pnpm -RUN curl -fsSL https://get.pnpm.io/install.sh | sh - +RUN curl -fsSL https://get.pnpm.io/install.sh | SHELL=`which bash` bash - # Install deno in gitpod RUN curl -fsSL https://deno.land/x/install/install.sh | sh From c96ed499c904e618f39305face0e6f7a351ae1a3 Mon Sep 17 00:00:00 2001 From: Ofer Shaal Date: Tue, 2 Aug 2022 04:06:11 +0000 Subject: [PATCH 6/6] fix Gitpod ports await command syntax --- .gitpod/gitpod-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod/gitpod-setup.sh b/.gitpod/gitpod-setup.sh index 4385432e2f15..0e739c46dd7b 100755 --- a/.gitpod/gitpod-setup.sh +++ b/.gitpod/gitpod-setup.sh @@ -15,7 +15,7 @@ else fi # Wait for VSCode to be ready (port 23000) -gp ports --await 23000 > /dev/null 2>&1 +gp ports await 23000 > /dev/null 2>&1 echo "Loading example project:" $EXAMPLE_PROJECT