From 92a6ec5cd8f5cce9cd5feb45f90aa7b90a1f8324 Mon Sep 17 00:00:00 2001
From: Florent <florent.git@zeteo.me>
Date: Wed, 22 Nov 2023 20:58:38 +0100
Subject: [PATCH] Reintroduce GVisor

---
 conf/default.env | 3 ++-
 manifest.toml    | 4 ++++
 scripts/install  | 4 ----
 scripts/upgrade  | 4 ----
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/conf/default.env b/conf/default.env
index d7502f2..7767018 100644
--- a/conf/default.env
+++ b/conf/default.env
@@ -1,6 +1,6 @@
 APP_HOME_URL=https://__DOMAIN__
 GRIST_ORG_IN_PATH=true
-GRIST_SANDBOX_FLAVOR=pyodide
+GRIST_SANDBOX_FLAVOR=gvisor
 GRIST_HIDE_UI_ELEMENTS=billing,sendToDrive
 GRIST_DEFAULT_LOCALE=__LANGUAGE__
 GRIST_ANON_PLAYGROUND=false
@@ -8,6 +8,7 @@ REDIS_URL=redis://localhost:6379/__REDIS_DB__
 GRIST_DATA_DIR=__DATA_DIR__/docs/
 TYPEORM_DATABASE=__DATA_DIR__/home.db
 PORT=__PORT__
+PYTHON_VERSION=3
 
 # Authentication
 GRIST_FORWARD_AUTH_HEADER=Email
diff --git a/manifest.toml b/manifest.toml
index b57dd6d..cee7d36 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -82,3 +82,7 @@ ram.runtime = "150M"
     extras.yarn.repo = "deb https://dl.yarnpkg.com/debian/ stable main"
     extras.yarn.key = "https://dl.yarnpkg.com/debian/pubkey.gpg"
     extras.yarn.packages = ["yarn"]
+
+    extras.gvisor.repo="deb https://storage.googleapis.com/gvisor/releases release main"
+    extras.gvisor.key="https://gvisor.dev/archive.key"
+    extras.gvisor.packages=[ "runsc" ]
diff --git a/scripts/install b/scripts/install
index 38b3f5a..75f3766 100755
--- a/scripts/install
+++ b/scripts/install
@@ -37,10 +37,6 @@ pushd "$install_dir"
 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean
 popd
 
-pushd "$install_dir/sandbox/pyodide"
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH make setup
-popd
-
 #=================================================
 # SYSTEM CONFIGURATION
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 53f0f2a..2fe9b5c 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -56,10 +56,6 @@ then
     ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH:$install_dir/node_modules/.bin yarn run build:prod
     ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean
   popd
-
-  pushd "$install_dir/sandbox/pyodide"
-    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH make setup
-  popd
 fi
 
 #=================================================