Skip to content

CTM-414: Fix RStudio image detection when JUPYTER_HOME is also present #4907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LizBaldo merged 1 commit into from
May 11, 2026
+3 −1
Merged

CTM-414: Fix RStudio image detection when JUPYTER_HOME is also present #4907

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/dao/HttpDockerDAO.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,9 @@ object HttpDockerDAO {
val dockerHubAuthUri = Uri.unsafeFromString("https://auth.docker.io")
val ghcrAuthUri = Uri.unsafeFromString("https://ghcr.io")
val dockerHubRegistryUri = Uri.unsafeFromString("https://registry-1.docker.io")
val clusterToolEnv = Map(Jupyter -> "JUPYTER_HOME", RStudio -> "RSTUDIO_HOME")
// RStudio must be checked before Jupyter: an image may inherit JUPYTER_HOME from a Jupyter
// base image while also defining RSTUDIO_HOME, and the more specific signal should win.
val clusterToolEnv = List(RStudio -> "RSTUDIO_HOME", Jupyter -> "JUPYTER_HOME")

def apply[F[_]: Concurrent](httpClient: Client[F])(implicit logger: Logger[F]): HttpDockerDAO[F] =
new HttpDockerDAO[F](httpClient)
Expand Down
Loading