Implement shared scripts in WGCW image (#816)

* Implement shared scripts in WGCW image

* Wrap python install with apt update/clean

docker-bake.hcl

@@ -184,7 +184,7 @@ variable WORKBENCH_BUILD_MATRIX {
 variable WORKBENCH_GOOGLE_CLOUD_WORKSTATION_BUILD_MATRIX {
     default = {
         builds = [
-            {os = "ubuntu2204", r_primary = "4.4.0", r_alternate = "4.3.3", py_primary = "3.11.9", py_alternate = "3.10.14"},
+            {os = "ubuntu2204", r_primary = "4.4.0", r_alternate = "4.3.3", py_primary = "3.12.1", py_alternate = "3.11.7"},
         ]
     }
 }
@@ -471,6 +471,9 @@ target "workbench-for-google-cloud-workstations" {
 
     dockerfile = "Dockerfile.${builds.os}"
     context = "workbench-for-google-cloud-workstations"
+    contexts = {
+        product-base-pro = "target:product-base-pro-${builds.os}-r${replace(builds.r_primary, ".", "-")}_${replace(builds.r_alternate, ".", "-")}-py${replace(builds.py_primary, ".", "-")}_${replace(builds.py_alternate, ".", "-")}"
+    }
 
     matrix = WORKBENCH_GOOGLE_CLOUD_WORKSTATION_BUILD_MATRIX
     args = {

workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204

@@ -1,3 +1,4 @@
+FROM product-base-pro as posit_base
 FROM us-central1-docker.pkg.dev/cloud-workstations-images/predefined/base:latest as build
 
 ### ARG declarations ###
@@ -28,56 +29,39 @@ ENV DIAGNOSTIC_ONLY false
 ENV LICENSE_MANAGER_PATH /opt/rstudio-license
 ENV WORKBENCH_JUPYTER_PATH=/usr/local/bin/jupyter
 
+### Copy scripts from Posit Base ###
+COPY --from=posit_base /opt/positscripts /opt/positscripts
+
 ### Copy package lists and install scripts ###
-COPY deps/* /
+COPY deps/* /tmp/
 
 ### Update/upgrade system packages ###
+COPY deps/apt_packages.txt /tmp/apt_packages.txt
 RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - \
-    && apt-get update --fix-missing  \
-    && apt-get upgrade -yq \
-    && xargs -a /apt_packages.txt apt-get install -yq --no-install-recommends \
-    && rm /apt_packages.txt \
-    && rm -rf /var/lib/apt/lists/*
+    && ${SCRIPTS_DIR}/apt.sh --update upgrade \
+    && ${SCRIPTS_DIR}/apt.sh install $(cat /tmp/apt_packages.txt) \
+    && ${SCRIPTS_DIR}/apt.sh --clean \
+    && rm /tmp/apt_packages.txt
 
 ### Install R versions ###
-RUN curl -O https://cdn.rstudio.com/r/ubuntu-2204/pkgs/r-${R_VERSION}_1_amd64.deb \
-    && curl -O https://cdn.rstudio.com/r/ubuntu-2204/pkgs/r-${R_VERSION_ALT}_1_amd64.deb \
-    && apt-get update \
-    && apt-get install -yq --no-install-recommends ./r-${R_VERSION}_1_amd64.deb \
-    && apt-get install -yq --no-install-recommends ./r-${R_VERSION_ALT}_1_amd64.deb \
-    && rm -f ./r-${R_VERSION}_1_amd64.deb \
-    && rm -f ./r-${R_VERSION_ALT}_1_amd64.deb \
-    && ln -s /opt/R/${R_VERSION}/bin/R /usr/local/bin/R \
-    && ln -s /opt/R/${R_VERSION}/bin/Rscript /usr/local/bin/Rscript \
-    && rm -rf /var/lib/apt/lists/*
+COPY deps/r_packages.txt /tmp/r_packages.txt
+RUN ${SCRIPTS_DIR}/apt.sh --update \
+    && R_VERSION=${R_VERSION} ${SCRIPTS_DIR}/install_r.sh -r /tmp/r_packages.txt \
+    && R_VERSION=${R_VERSION_ALT} ${SCRIPTS_DIR}/install_r.sh -r /tmp/r_packages.txt \
+    && ${SCRIPTS_DIR}/apt.sh --clean \
+    && ln -s /opt/R/${R_VERSION} /opt/R/default \
+    && ln -s /opt/R/default/bin/R /usr/local/bin/R \
+    && ln -s /opt/R/default/bin/Rscript /usr/local/bin/Rscript \
+    && rm -f /tmp/r_packages.txt
 
 ### Install Python versions ###
-RUN curl -O https://cdn.rstudio.com/python/ubuntu-2204/pkgs/python-${PYTHON_VERSION}_1_amd64.deb \
-    && curl -O https://cdn.rstudio.com/python/ubuntu-2204/pkgs/python-${PYTHON_VERSION_ALT}_1_amd64.deb \
-    && apt-get update \
-    && apt-get install -yq --no-install-recommends ./python-${PYTHON_VERSION}_1_amd64.deb \
-    && apt-get install -yq --no-install-recommends ./python-${PYTHON_VERSION_ALT}_1_amd64.deb \
-    && rm -rf python-${PYTHON_VERSION}_1_amd64.deb \
-    && rm -rf python-${PYTHON_VERSION_ALT}_1_amd64.deb \
-    && /opt/python/${PYTHON_VERSION}/bin/python3 -m ensurepip --upgrade \
-    && /opt/python/${PYTHON_VERSION}/bin/python3 -m pip install 'virtualenv<20' \
-    && /opt/python/${PYTHON_VERSION}/bin/python3 -m pip install --upgrade setuptools \
-    && /opt/python/${PYTHON_VERSION}/bin/python3 -m pip install --upgrade pip \
-    && /opt/python/${PYTHON_VERSION}/bin/python3 -m pip cache purge \
-    && /opt/python/${PYTHON_VERSION_ALT}/bin/python3 -m ensurepip --upgrade \
-    && /opt/python/${PYTHON_VERSION_ALT}/bin/python3 -m pip install 'virtualenv<20' \
-    && /opt/python/${PYTHON_VERSION_ALT}/bin/python3 -m pip install --upgrade setuptools \
-    && /opt/python/${PYTHON_VERSION_ALT}/bin/python3 -m pip install --upgrade pip \
-    && /opt/python/${PYTHON_VERSION_ALT}/bin/python3 -m pip cache purge \
-    && rm -rf /var/lib/apt/lists/*
-
-### Install basic data science packages for Python and R ###
-RUN /opt/python/${PYTHON_VERSION}/bin/python3 -m pip install -r /py_packages.txt \
-    && /opt/python/${PYTHON_VERSION}/bin/python3 -m pip cache purge \
-    && /opt/python/${PYTHON_VERSION_ALT}/bin/python3 -m pip install -r /py_packages.txt \
-    && /opt/python/${PYTHON_VERSION_ALT}/bin/python3 -m pip cache purge \
-    && ./install_r_packages.sh \
-    && rm install_r_packages.sh py_packages.txt r_packages.txt
+COPY deps/requirements.txt /tmp/requirements.txt
+RUN ${SCRIPTS_DIR}/apt.sh --update \
+    && PYTHON_VERSION=${PYTHON_VERSION} ${SCRIPTS_DIR}/install_python.sh -r /tmp/requirements.txt \
+    && PYTHON_VERSION=${PYTHON_VERSION_ALT} ${SCRIPTS_DIR}/install_python.sh -r /tmp/requirements.txt \
+    && ${SCRIPTS_DIR}/apt.sh --clean \
+    && ln -s /opt/python/${PYTHON_VERSION} /opt/python/default \
+    && rm -f /tmp/requirements.txt
 
 ### Locale configuration ###
 RUN localedef -i en_US -f UTF-8 en_US.UTF-8
@@ -89,13 +73,10 @@ ENV LC_ALL en_US.UTF-8
 RUN ln -s /lib/rstudio-server/bin/quarto/bin/quarto /usr/local/bin/quarto
 
 ### Install Pro Drivers ###
-RUN apt-get update \
-    && apt-get install -yq --no-install-recommends unixodbc unixodbc-dev \
-    && curl -O https://cdn.rstudio.com/drivers/7C152C12/installer/rstudio-drivers_${DRIVERS_VERSION}_amd64.deb \
-    && apt-get update \
-    && apt-get install -yq --no-install-recommends ./rstudio-drivers_${DRIVERS_VERSION}_amd64.deb \
-    && rm -f ./rstudio-drivers_${DRIVERS_VERSION}_amd64.deb \
-    && rm -rf /var/lib/apt/lists/* \
+RUN ${SCRIPTS_DIR}/apt.sh --update upgrade \
+    && ${SCRIPTS_DIR}/apt.sh install unixodbc unixodbc-dev \
+    && DRIVERS_VERSION=${DRIVERS_VERSION} ${SCRIPTS_DIR}/install_drivers.sh \
+    && ${SCRIPTS_DIR}/apt.sh --clean \
     && cp /opt/rstudio-drivers/odbcinst.ini.sample /etc/odbcinst.ini \
     && /opt/R/${R_VERSION}/bin/R -e 'install.packages("odbc", repos="https://packagemanager.rstudio.com/cran/__linux__/jammy/latest")'
 
@@ -112,6 +93,7 @@ RUN curl -o rstudio-workbench.deb "${RSW_DOWNLOAD_URL}/${RSW_NAME}-${RSW_VERSION
     # a wild hack to ensure that workbench can install _and start_ completely before shutdown
     && sleep 30 \
     && rm ./rstudio-workbench.deb \
+    && apt-get remove -yq dpkg-sig \
     && apt-get autoremove -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
@@ -125,7 +107,7 @@ RUN rm -f /etc/rstudio/launcher.pem /etc/rstudio/launcher.pub
 # TODO(ianpittwood): Replace monitor download with $RSW_VERSION after upgrading to 2023.06.0
 RUN mkdir -p /opt/rstudio-license/ \
     && mkdir -p /var/lib/rstudio-workbench \
-    && curl -sL "https://s3.amazonaws.com/rstudio-ide-build/monitor/jammy/rsp-monitor-workbench-gcpw-amd64-2023.06.0-419.pro1.tar.gz" |  \
+    && curl -sL "https://s3.amazonaws.com/rstudio-ide-build/monitor/jammy/rsp-monitor-workbench-gcpw-amd64-${RSW_VERSION//+/-}.tar.gz" |  \
        tar xzvf - --strip 2 -C /opt/rstudio-license/ \
     && chmod 0755 /opt/rstudio-license/license-manager \
     && mv /opt/rstudio-license/license-manager /opt/rstudio-license/license-manager-orig \
@@ -172,12 +154,5 @@ COPY conf/* /etc/rstudio/
 COPY --chmod=755 workstation-startup/* /etc/workstation-startup.d/
 COPY --chmod=644 jupyter/jupyter_notebook_config.json /opt/python/jupyter/etc/jupyter/jupyter_notebook_config.json
 
-### Clean up ###
-RUN apt-get remove -yq dpkg-sig \
-    && apt-get install -yqf --no-install-recommends \
-    && apt-get autoremove -yq \
-    && apt-get clean -yq \
-    && rm -rf /var/lib/apt/lists/*
-
 EXPOSE 80/tcp
 EXPOSE 5559/tcp

workbench-for-google-cloud-workstations/deps/apt_packages.txt

@@ -22,6 +22,7 @@ libuser1-dev
 libxext6
 libxrender1
 locales
+lsb-release
 oddjob-mkhomedir
 rrdtool
 sssd

workbench-for-google-cloud-workstations/test/goss.yaml

@@ -204,7 +204,7 @@ command:
     ]
   {{ $python_version := .Env.PYTHON_VERSION }}
   {{ $python_version_alt := .Env.PYTHON_VERSION_ALT }}
-  {{ $py_package_list := readFile "/tmp/deps/py_packages.txt" | splitList "\n" }}
+  {{ $py_package_list := readFile "/tmp/deps/requirements.txt" | splitList "\n" }}
   {{- range $py_package_list }}
   Check Python {{ $python_version }} has "{{.}}" installed:
     exec: /opt/python/{{$python_version}}/bin/pip show {{.}}