Merge branch 'main' into jupyterlab-subdomain

framctr · web-flow · commit 69cb0d0204e4 · 2024-10-08T09:38:04.000+02:00
diff --git a/jupyterlab/main.tf b/jupyterlab/main.tf
@@ -40,12 +40,9 @@ variable "share" {
 }
 
 variable "subdomain" {
-  type    = bool
-  default = true
-  validation {
-    condition     = var.share == "owner" || var.share == "authenticated" || var.share == "public"
-    error_message = "Incorrect value. Please set either 'owner', 'authenticated', or 'public'."
-  }
+  type        = bool
+  description = "Determines whether JupyterLab will be accessed via it's own subdomain or whether it will be accessed via a path on Coder."
+  default     = true
 }
 
 variable "order" {
@@ -84,4 +81,3 @@ resource "coder_app" "jupyterlab" {
       threshold = 10
     }
   }
-}
diff --git a/jupyterlab/run.sh b/jupyterlab/run.sh
@@ -1,5 +1,10 @@
 #!/usr/bin/env sh
 
+if [ -n "$BASE_URL" ]
+then
+    BASE_URL="--ServerApp.base_url=${BASE_URL}"
+fi
+
 BOLD='\033[0;1m'
 
 printf "$${BOLD}Installing jupyterlab!\n"
@@ -15,11 +20,17 @@ if ! command -v jupyterlab > /dev/null 2>&1; then
   fi
   # install jupyterlab
   pipx install -q jupyterlab
-  echo "🥳 jupyterlab has been installed\n\n"
+  printf "%s\n\n" "🥳 jupyterlab has been installed"
 else
-  echo "🥳 jupyterlab is already installed\n\n"
+  printf "%s\n\n" "🥳 jupyterlab is already installed"
 fi
 
 echo "👷 Starting jupyterlab in background..."
 echo "check logs at ${LOG_PATH}"
-$HOME/.local/bin/jupyter-lab --ServerApp.ip='0.0.0.0' --ServerApp.port=${PORT} --no-browser --ServerApp.token='' --ServerApp.password='' > ${LOG_PATH} 2>&1 &
+$HOME/.local/bin/jupyter-lab --no-browser \
+    "$BASE_URL" \
+    --ServerApp.ip='*' \
+    --ServerApp.port="${PORT}" \
+    --ServerApp.token='' \
+    --ServerApp.password='' \
+    > "${LOG_PATH}" 2>&1 &

Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,9 @@ variable "share" {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`variable "subdomain" {`
`43`		`- type = bool`
`44`		`- default = true`
`45`		`- validation {`
`46`		`- condition = var.share == "owner" \|\| var.share == "authenticated" \|\| var.share == "public"`
`47`		`- error_message = "Incorrect value. Please set either 'owner', 'authenticated', or 'public'."`
`48`		`- }`
	`43`	`+ type = bool`
	`44`	`+ description = "Determines whether JupyterLab will be accessed via it's own subdomain or whether it will be accessed via a path on Coder."`
	`45`	`+ default = true`
`49`	`46`	`}`
`50`	`47`
`51`	`48`	`variable "order" {`
`@@ -84,4 +81,3 @@ resource "coder_app" "jupyterlab" {`
`84`	`81`	`threshold = 10`
`85`	`82`	`}`
`86`	`83`	`}`
`87`		`-}`