From 5a72a2317290f4cc28f1223cba993f14cd188a71 Mon Sep 17 00:00:00 2001 From: Balaji Alwar Date: Mon, 1 Jul 2024 16:25:46 -0700 Subject: [PATCH 1/3] Install quarto in Dev hub(dashboard image) --- deployments/dev/images/secondary/install.R | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/deployments/dev/images/secondary/install.R b/deployments/dev/images/secondary/install.R index 237e2e321..ef1975cb5 100755 --- a/deployments/dev/images/secondary/install.R +++ b/deployments/dev/images/secondary/install.R @@ -1,5 +1,15 @@ -#!/usr/bin/env r +#!/usr/bin/env R +# Function to install Quarto +install_quarto <- function() { + print("Installing Quarto") + system("wget https://quarto.org/download/latest/quarto-linux-amd64.deb") + system("sudo apt-get install -y ./quarto-linux-amd64.deb") + system("rm ./quarto-linux-amd64.deb") + print("Quarto installation complete") +} + +# Function to install R packages with specific versions class_libs_install_version <- function(class_name, class_libs) { print(paste("Installing packages for", class_name)) for (i in seq(1, length(class_libs), 2)) { @@ -19,6 +29,9 @@ class_libs_install_version <- function(class_name, class_libs) { print(paste("Done installing packages for", class_name)) } +# Install Quarto +install_quarto() + # R packages to be installed that aren't from apt # Combination of informal requests & rocker image suggestions # Some of these were already in datahub image @@ -29,4 +42,4 @@ cran_packages = c( "shiny", "1.7.4" ) -class_libs_install_version("Base packages", cran_packages) +class_libs_install_version("Base packages", cran_packages) \ No newline at end of file From 70c8dbcc30b92fc2fed1064d238b7873bb878ec6 Mon Sep 17 00:00:00 2001 From: Balaji Alwar Date: Tue, 2 Jul 2024 12:04:22 -0700 Subject: [PATCH 2/3] Install quarto in dev hub --- deployments/dev/images/secondary/environment.yml | 2 +- deployments/dev/images/secondary/install.R | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/deployments/dev/images/secondary/environment.yml b/deployments/dev/images/secondary/environment.yml index c4ab722d6..08bb53833 100644 --- a/deployments/dev/images/secondary/environment.yml +++ b/deployments/dev/images/secondary/environment.yml @@ -56,7 +56,7 @@ dependencies: #- otter-grader==5.5.0 #- python-duckdb==1.0.0 #- jupyterhub==5.0.0 - +- quarto==1.4.550 - pip - pip: # - -r infra-requirements.txt diff --git a/deployments/dev/images/secondary/install.R b/deployments/dev/images/secondary/install.R index ef1975cb5..ca763a518 100755 --- a/deployments/dev/images/secondary/install.R +++ b/deployments/dev/images/secondary/install.R @@ -1,14 +1,5 @@ #!/usr/bin/env R -# Function to install Quarto -install_quarto <- function() { - print("Installing Quarto") - system("wget https://quarto.org/download/latest/quarto-linux-amd64.deb") - system("sudo apt-get install -y ./quarto-linux-amd64.deb") - system("rm ./quarto-linux-amd64.deb") - print("Quarto installation complete") -} - # Function to install R packages with specific versions class_libs_install_version <- function(class_name, class_libs) { print(paste("Installing packages for", class_name)) @@ -29,9 +20,6 @@ class_libs_install_version <- function(class_name, class_libs) { print(paste("Done installing packages for", class_name)) } -# Install Quarto -install_quarto() - # R packages to be installed that aren't from apt # Combination of informal requests & rocker image suggestions # Some of these were already in datahub image From 2eefd47dea45de94c545f1e424f6475754f691d8 Mon Sep 17 00:00:00 2001 From: Balaji Alwar Date: Tue, 2 Jul 2024 14:12:18 -0700 Subject: [PATCH 3/3] Add an extra line at the end of config --- deployments/dev/images/secondary/install.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/dev/images/secondary/install.R b/deployments/dev/images/secondary/install.R index ca763a518..d4e8763e4 100755 --- a/deployments/dev/images/secondary/install.R +++ b/deployments/dev/images/secondary/install.R @@ -30,4 +30,4 @@ cran_packages = c( "shiny", "1.7.4" ) -class_libs_install_version("Base packages", cran_packages) \ No newline at end of file +class_libs_install_version("Base packages", cran_packages)