Don't install tinytex

workbench-session/Dockerfile.ubuntu2204

@@ -7,7 +7,6 @@ ARG PYTHON_VERSION=3.9.17
 ARG PYTHON_VERSION_ALT=3.8.17
 ARG JUPYTERLAB_VERSION=3.6.5
 ARG SCRIPTS_DIR=/opt/positscripts
-ARG QUARTO_VERSION=1.3.340
 
 ENV WORKBENCH_JUPYTER_PATH=/usr/local/bin/jupyter
 
@@ -26,10 +25,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/* 
 
 # Add Jupyter, Python, and Quarto to the PATH
-ENV PATH="/opt/python/jupyter/bin:/opt/python/bin:/opt/quarto/${QUARTO_VERSION}/bin:${PATH}"
-
-### Install TinyTeX using Quarto ###
-RUN $SCRIPTS_DIR/install_quarto.sh --install-tinytex --add-path-tinytex
+ENV PATH="/opt/python/jupyter/bin:/opt/python/bin:/usr/lib/rstudio-server/bin/quarto/bin:${PATH}"
 
 RUN /opt/python/"${PYTHON_VERSION}"/bin/python -m venv /opt/python/jupyter \
     && /opt/python/jupyter/bin/python -m pip install --upgrade pip \

workbench-session/README.md

@@ -8,7 +8,7 @@
 
 # Supported tags and respective Dockerfile links
 
-* [`jammy`, `ubuntu2204`, `jammy-2024.09.1`, `ubuntu2204-2024.09.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204)
+* [`ubuntu2204-r4.4.1_4.3.3-py3.12.6_3.11.10`, `ubuntu2204-r4.4.1_4.3.3-py3.11.10_3.10.15`, `ubuntu2204-r4.4.0_4.3.3-py3.12.1_3.11.7`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench-session/Dockerfile.ubuntu2204)
 
 # What are the r-session-complete images?
 
@@ -31,14 +31,16 @@ Images for R and Python sessions and jobs to be used RStudio Workbench, Launcher
 # How to use these images
 
 The Docker images built from these Dockerfiles are intended to be used for R and
-Jupyter sessions and jobs with RStudio Workbench (RSW), Launcher, and
+Jupyter sessions and jobs with Posit Workbench (PWB), Launcher, and
 Kubernetes.
 
 Note: These Docker images are not equipped or intended to be used to run Posit
 Workbench within a Docker container. Visit the
 [rstudio/rstudio-worbench Docker Hub page](https://hub.docker.com/r/rstudio/rstudio-workbench)
 for images built for that purpose.
 
+Note: These images do not include the Posit Workbench Session Components. To use these images with Posit Workbench, the [session init container](https://hub.docker.com/r/rstudio/workbench-session-init) must be enabled within the Posit Workbench configuration. For more information, refer to the [Posit Workbench documentation](https://docs.rstudio.com/ide/server-pro/launcher/).
+
 For more information about Posit Workbench and Launcher, refer to the
 [Launcher Overview](https://solutions.rstudio.com/launcher/overview/) on the
 RStudio Solutions website.
@@ -59,8 +61,8 @@ These images include the following layers:
 
 * Base OS
 * System packages required for R, R packages, RStudio Professional Drivers, and Workbench Session Components
-* One version of R
-* One version of Python
+* Two versions of R
+* Two versions of Python
 * Jupyter Notebooks, JupyterLab, and RSW/RSC notebook extensions
 * RStudio Professional Drivers
 

workbench-session/test/goss.yaml

@@ -6,6 +6,8 @@ file:
     filetype: directory
   /var/lib/rstudio-server/r-versions:
     exists: false
+  /usr/local/bin/quarto:
+    exists: true
 
 command:
   "echo '{ \"cells\": [], \"metadata\": {}, \"nbformat\": 4, \"nbformat_minor\": 2}' | /opt/python/jupyter/bin/jupyter nbconvert --to notebook --stdin --stdout":
@@ -41,14 +43,3 @@ command:
     timeout: 60000
     exit-status: 0
 
-# Ensure Quarto works
-  "quarto check --quiet":
-    title: quarto_check
-    exit-status: 0
-
-# Ensure TinyTeX is installed
-  "quarto list tools":
-    title: quarto_tinytex_installed
-    exit-status: 0
-    stderr:
-      - "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?/"