From 949518355b2829a01fc4eb655b0f483610ccf802 Mon Sep 17 00:00:00 2001
From: Ben Schumacher <ben.schumacher@mattermost.com>
Date: Sun, 25 Sep 2022 00:07:07 +0000
Subject: [PATCH] Fix Gitpod prebuilt image

---
 .gitpod.Dockerfile |  7 +++++++
 .gitpod.yml        | 15 +++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 .gitpod.Dockerfile

diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
new file mode 100644
index 00000000..1c4c6aba
--- /dev/null
+++ b/.gitpod.Dockerfile
@@ -0,0 +1,7 @@
+FROM gitpod/workspace-full:latest
+
+RUN bash -c 'VERSION="18" \
+    && source $HOME/.nvm/nvm.sh && nvm install $VERSION \
+    && nvm use $VERSION && nvm alias default $VERSION'
+
+RUN echo "nvm use default &>/dev/null" >> ~/.bashrc.d/51-nvm-fix
diff --git a/.gitpod.yml b/.gitpod.yml
index f9db221a..d4309434 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,3 +1,6 @@
+image:
+  file: .gitpod.Dockerfile
+
 ports:
   - port: 3000
     name: Silverbullet
@@ -12,25 +15,17 @@ github:
 tasks:
   - name: Setup
     init: |
-      nvm install
-      nvm use
       npm install
       npm run clean-build
       gp sync-done setup
-      exit
   - name: Run Silverbullet server
     init: |      
       gp sync-await setup
-      nvm use
       mkdir pages
     command: npm run server -- ./pages
   - name: Run ParcelJS
-    init: |
-      gp sync-await setup
-      nvm use
+    init: gp sync-await setup
     command: npm run watch
   - name: Build plugins
-    init: |
-      gp sync-await setup
-      nvm use
+    init: gp sync-await setup
     command: npm run plugs