From 37ea56327811218ded01d115305407da6d8cb4b0 Mon Sep 17 00:00:00 2001
From: Ian Pittwood <ian.pittwood@rstudio.com>
Date: Thu, 29 Aug 2024 10:32:18 -0600
Subject: [PATCH 1/8] Use `--fail` flag for curl in Quarto binary fetch

---
 product/base/scripts/ubuntu/install_quarto.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/product/base/scripts/ubuntu/install_quarto.sh b/product/base/scripts/ubuntu/install_quarto.sh
index 632eebf3..ad0564e3 100755
--- a/product/base/scripts/ubuntu/install_quarto.sh
+++ b/product/base/scripts/ubuntu/install_quarto.sh
@@ -87,6 +87,8 @@ while true; do
     esac
 done
 
+set -u
+
 if [ -z "$QUARTO_VERSION" ] && [[ "$IS_WORKBENCH_INSTALLATION" -eq 0 ]]; then
     usage
     exit 1
@@ -101,7 +103,7 @@ install_quarto() {
     fi
 
     mkdir -p "/opt/quarto/${QUARTO_VERSION}"
-    wget -q -O - "https://github.com/quarto-dev/quarto-cli/releases/download/v${QUARTO_VERSION}/quarto-${QUARTO_VERSION}-linux-amd64.tar.gz" | tar xzf - -C "/opt/quarto/${QUARTO_VERSION}" --strip-components=1
+    curl -fsL "https://github.com/quarto-dev/quarto-cli/releases/download/v${QUARTO_VERSION}/quarto-${QUARTO_VERSION}-linux-amd64.tar.gz" | tar xzf - -C "/opt/quarto/${QUARTO_VERSION}" --strip-components=1
 }
 
 update_tinytex() {

From ffb761ce2fea403446c6be0867153f3d045e2e5e Mon Sep 17 00:00:00 2001
From: Ian Pittwood <ian.pittwood@posit.co>
Date: Wed, 4 Sep 2024 11:00:25 -0600
Subject: [PATCH 2/8] Update product/base/scripts/ubuntu/install_quarto.sh

Co-authored-by: Benjamin R. J. Schwedler <ben@posit.co>
---
 product/base/scripts/ubuntu/install_quarto.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/product/base/scripts/ubuntu/install_quarto.sh b/product/base/scripts/ubuntu/install_quarto.sh
index ad0564e3..4bc67e27 100755
--- a/product/base/scripts/ubuntu/install_quarto.sh
+++ b/product/base/scripts/ubuntu/install_quarto.sh
@@ -103,7 +103,7 @@ install_quarto() {
     fi
 
     mkdir -p "/opt/quarto/${QUARTO_VERSION}"
-    curl -fsL "https://github.com/quarto-dev/quarto-cli/releases/download/v${QUARTO_VERSION}/quarto-${QUARTO_VERSION}-linux-amd64.tar.gz" | tar xzf - -C "/opt/quarto/${QUARTO_VERSION}" --strip-components=1
+    curl -fsSL "https://github.com/quarto-dev/quarto-cli/releases/download/v${QUARTO_VERSION}/quarto-${QUARTO_VERSION}-linux-amd64.tar.gz" | tar xzf - -C "/opt/quarto/${QUARTO_VERSION}" --strip-components=1
 }
 
 update_tinytex() {

From 58b744b8c2ee93c0a9a048a4e8fc4559c6a42d37 Mon Sep 17 00:00:00 2001
From: Ian Pittwood <ian.pittwood@rstudio.com>
Date: Wed, 4 Sep 2024 11:46:42 -0600
Subject: [PATCH 3/8] Unify curl flags across all files

---
 connect-content-init/test/run_tests.sh                      | 2 +-
 connect/Dockerfile.ubuntu2204                               | 4 ++--
 connect/test/run_tests.sh                                   | 2 +-
 content/base/Dockerfile.ubuntu1804                          | 2 +-
 content/base/Dockerfile.ubuntu2204                          | 4 ++--
 content/base/maybe_install_quarto.sh                        | 4 ++--
 content/pro/Dockerfile.ubuntu1804                           | 2 +-
 content/pro/Dockerfile.ubuntu2204                           | 2 +-
 float/Dockerfile.ubuntu1804                                 | 4 ++--
 package-manager/Dockerfile.ubuntu2204                       | 2 +-
 package-manager/test/run_tests.sh                           | 2 +-
 product/base/Dockerfile.centos7                             | 2 +-
 product/base/scripts/rhel/install_drivers.sh                | 2 +-
 product/base/scripts/rhel/install_python.sh                 | 2 +-
 product/base/scripts/rhel/install_r.sh                      | 4 ++--
 product/base/scripts/ubuntu/install_drivers.sh              | 2 +-
 product/base/scripts/ubuntu/install_python.sh               | 2 +-
 product/base/scripts/ubuntu/install_quarto.sh               | 2 --
 product/base/scripts/ubuntu/install_r.sh                    | 4 ++--
 product/base/test/run_tests.sh                              | 2 +-
 product/pro/test/run_tests.sh                               | 2 +-
 r-session-complete/Dockerfile.ubuntu2204                    | 2 +-
 r-session-complete/test/run_tests.sh                        | 2 +-
 .../Dockerfile.ubuntu2204                                   | 6 +++---
 workbench-for-google-cloud-workstations/test/run_tests.sh   | 2 +-
 workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204      | 6 +++---
 workbench-for-microsoft-azure-ml/deps/install-r.sh          | 2 +-
 workbench-for-microsoft-azure-ml/test/run_tests.sh          | 2 +-
 workbench/Dockerfile.ubuntu2204                             | 4 ++--
 workbench/test/run_tests.sh                                 | 2 +-
 30 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/connect-content-init/test/run_tests.sh b/connect-content-init/test/run_tests.sh
index 840d328a..b06a01f9 100755
--- a/connect-content-init/test/run_tests.sh
+++ b/connect-content-init/test/run_tests.sh
@@ -15,7 +15,7 @@ else
 fi
 
 # install goss to tmp location and make executable
-curl -sL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
+curl -fsSL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
   && chmod +x /tmp/goss \
   && GOSS=/tmp/goss
 
diff --git a/connect/Dockerfile.ubuntu2204 b/connect/Dockerfile.ubuntu2204
index 5aea9e84..23a9c4e3 100644
--- a/connect/Dockerfile.ubuntu2204
+++ b/connect/Dockerfile.ubuntu2204
@@ -19,7 +19,7 @@ SHELL [ "/bin/bash", "-o", "pipefail", "-c"]
 
 ### Install TensorFlow Serving ###
 RUN echo "deb [arch=amd64] http://storage.googleapis.com/tensorflow-serving-apt stable tensorflow-model-server tensorflow-model-server-universal" > /etc/apt/sources.list.d/tensorflow-serving.list && \
-    curl https://storage.googleapis.com/tensorflow-serving-apt/tensorflow-serving.release.pub.gpg | apt-key add -
+    curl -fsSL https://storage.googleapis.com/tensorflow-serving-apt/tensorflow-serving.release.pub.gpg | apt-key add -
 RUN apt-get update \
     && apt-get install -yq --no-install-recommends \
       tensorflow-model-server-universal \
@@ -34,7 +34,7 @@ RUN apt-get update --fix-missing \
       libpam-sss \
       libglib2.0-0 \
     && RSC_VERSION_URL=$(echo -n "${RSC_VERSION}" | sed 's/+/%2B/g') \
-    && curl -L -o rstudio-connect.deb "https://cdn.rstudio.com/connect/$(echo $RSC_VERSION | sed -r 's/([0-9]+\.[0-9]+).*/\1/')/rstudio-connect_${RSC_VERSION_URL}~ubuntu22_amd64.deb" \
+    && curl -fsSL -o rstudio-connect.deb "https://cdn.rstudio.com/connect/$(echo $RSC_VERSION | sed -r 's/([0-9]+\.[0-9]+).*/\1/')/rstudio-connect_${RSC_VERSION_URL}~ubuntu22_amd64.deb" \
     # Pre 7/25/23 packages
     && gpg --keyserver keyserver.ubuntu.com --recv-keys 3F32EE77E331692F \
     # Post 7/25 packages
diff --git a/connect/test/run_tests.sh b/connect/test/run_tests.sh
index 10dcb7f7..de8d6f9f 100755
--- a/connect/test/run_tests.sh
+++ b/connect/test/run_tests.sh
@@ -24,7 +24,7 @@ GOSS_VERSION=${GOSS_VERSION:-0.4.6}
 GOSS_MAX_CONCURRENT=${GOSS_MAX_CONCURRENT:-50}
 
 # install goss to tmp location and make executable
-curl -sL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
+curl -fsSL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
   && chmod +x /tmp/goss \
   && GOSS=/tmp/goss
 
diff --git a/content/base/Dockerfile.ubuntu1804 b/content/base/Dockerfile.ubuntu1804
index 9ef4363e..87c2d09e 100644
--- a/content/base/Dockerfile.ubuntu1804
+++ b/content/base/Dockerfile.ubuntu1804
@@ -77,7 +77,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN apt-get update  \
     && apt-get install -y --no-install-recommends wget \
     && rm -rf /var/lib/apt/lists/* \
-    && curl -sL "https://yihui.org/tinytex/install-bin-unix.sh" | sh \
+    && curl -fsSL "https://yihui.org/tinytex/install-bin-unix.sh" | sh \
     && /root/.TinyTeX/bin/*/tlmgr path remove \
     && mv /root/.TinyTeX/ /opt/TinyTeX \
     && /opt/TinyTeX/bin/*/tlmgr option sys_bin /usr/local/bin \
diff --git a/content/base/Dockerfile.ubuntu2204 b/content/base/Dockerfile.ubuntu2204
index 05a4886e..241df921 100644
--- a/content/base/Dockerfile.ubuntu2204
+++ b/content/base/Dockerfile.ubuntu2204
@@ -86,7 +86,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN apt-get update  \
     && apt-get install -y --no-install-recommends wget \
     && rm -rf /var/lib/apt/lists/* \
-    && curl -sL "https://yihui.org/tinytex/install-bin-unix.sh" | sh \
+    && curl -fsSL "https://yihui.org/tinytex/install-bin-unix.sh" | sh \
     && /root/.TinyTeX/bin/*/tlmgr path remove \
     && mv /root/.TinyTeX/ /opt/TinyTeX \
     && /opt/TinyTeX/bin/*/tlmgr option sys_bin /usr/local/bin \
@@ -111,7 +111,7 @@ RUN curl -fsSL -O https://cdn.rstudio.com/r/${DISTRIBUTION}/pkgs/${R_INSTALLER}
 
 # We are NOT linking one of these Python versions into the PATH.
 
-RUN curl -O https://cdn.rstudio.com/python/${DISTRIBUTION}/pkgs/python-${PYTHON_VERSION}_1_amd64.deb \
+RUN curl -fsSL -O https://cdn.rstudio.com/python/${DISTRIBUTION}/pkgs/python-${PYTHON_VERSION}_1_amd64.deb \
     && apt-get install -yq --no-install-recommends ./python-${PYTHON_VERSION}_1_amd64.deb \
     && rm -rf python-${PYTHON_VERSION}_1_amd64.deb \
     && /opt/python/${PYTHON_VERSION}/bin/python3 -m pip install --upgrade setuptools
diff --git a/content/base/maybe_install_quarto.sh b/content/base/maybe_install_quarto.sh
index cb06e6c8..ea8c928a 100755
--- a/content/base/maybe_install_quarto.sh
+++ b/content/base/maybe_install_quarto.sh
@@ -5,7 +5,7 @@
 if [[ `grep -oE bionic /etc/lsb-release` ]] && [[ `ls /opt/python/ | grep '3\.10\.'` ]] && [[ `ls /opt/R | grep '4\.1\.'` ]]; then
   qver=${QUARTO_VERSION:-1.3.340}
   echo '--> Installing Quarto'
-  curl -L -o /quarto.deb https://github.com/quarto-dev/quarto-cli/releases/download/v${qver}/quarto-${qver}-linux-amd64.deb
+  curl -fsSL -o /quarto.deb https://github.com/quarto-dev/quarto-cli/releases/download/v${qver}/quarto-${qver}-linux-amd64.deb
   apt install /quarto.deb
   rm -f /quarto.deb
 fi
@@ -14,7 +14,7 @@ fi
 if [[ `grep -oE jammy /etc/lsb-release` ]]; then
   qver=${QUARTO_VERSION:-1.3.340}
   echo '--> Installing Quarto'
-  curl -L -o /quarto.tar.gz "https://github.com/quarto-dev/quarto-cli/releases/download/v${qver}/quarto-${qver}-linux-amd64.tar.gz"
+  curl -fsSL -o /quarto.tar.gz "https://github.com/quarto-dev/quarto-cli/releases/download/v${qver}/quarto-${qver}-linux-amd64.tar.gz"
   mkdir -p /opt/quarto/${qver}
   tar -zxvf quarto.tar.gz -C "/opt/quarto/${qver}" --strip-components=1
   rm -f /quarto.tar.gz
diff --git a/content/pro/Dockerfile.ubuntu1804 b/content/pro/Dockerfile.ubuntu1804
index 7b6f34c1..551a278a 100644
--- a/content/pro/Dockerfile.ubuntu1804
+++ b/content/pro/Dockerfile.ubuntu1804
@@ -9,7 +9,7 @@ RUN apt-get update -y \
     && apt-get install -y --no-install-recommends unixodbc unixodbc-dev \
     && rm -rf /var/lib/apt/lists/*
 
-RUN curl -O https://cdn.rstudio.com/drivers/7C152C12/installer/rstudio-drivers_${DRIVERS_VERSION}_amd64.deb \
+RUN curl -fsSL -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 -rf /var/lib/apt/lists/* \
diff --git a/content/pro/Dockerfile.ubuntu2204 b/content/pro/Dockerfile.ubuntu2204
index 7b6f34c1..551a278a 100644
--- a/content/pro/Dockerfile.ubuntu2204
+++ b/content/pro/Dockerfile.ubuntu2204
@@ -9,7 +9,7 @@ RUN apt-get update -y \
     && apt-get install -y --no-install-recommends unixodbc unixodbc-dev \
     && rm -rf /var/lib/apt/lists/*
 
-RUN curl -O https://cdn.rstudio.com/drivers/7C152C12/installer/rstudio-drivers_${DRIVERS_VERSION}_amd64.deb \
+RUN curl -fsSL -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 -rf /var/lib/apt/lists/* \
diff --git a/float/Dockerfile.ubuntu1804 b/float/Dockerfile.ubuntu1804
index e0fb76e2..274412c3 100644
--- a/float/Dockerfile.ubuntu1804
+++ b/float/Dockerfile.ubuntu1804
@@ -13,14 +13,14 @@ RUN apt-get update \
 
 # Runtime settings
 ARG TINI_VERSION=0.18.0
-RUN curl -L -o /usr/local/bin/tini https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini \
+RUN curl -fsSL -o /usr/local/bin/tini https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini \
     && chmod +x /usr/local/bin/tini
 
 # install license server binary
 ARG PRODUCT=rsp
 ARG VERSION=1.1.2
 ARG PORT=8989
-RUN curl -L -o "${PRODUCT}-license-server.deb" "https://s3.amazonaws.com/rstudio-license-server/${PRODUCT}-license-server-${VERSION}-x86_64.deb" \
+RUN curl -fsSL -o "${PRODUCT}-license-server.deb" "https://s3.amazonaws.com/rstudio-license-server/${PRODUCT}-license-server-${VERSION}-x86_64.deb" \
     && gdebi -n ${PRODUCT}-license-server.deb \
     && rm ${PRODUCT}-license-server.deb
 
diff --git a/package-manager/Dockerfile.ubuntu2204 b/package-manager/Dockerfile.ubuntu2204
index ccbf9088..58dd04a4 100644
--- a/package-manager/Dockerfile.ubuntu2204
+++ b/package-manager/Dockerfile.ubuntu2204
@@ -15,7 +15,7 @@ RUN /opt/python/${PYTHON_VERSION_ALT}/bin/python3 -m pip install --no-cache-dir
 # Download RStudio Package Manager ---------------------------------------------#
 ARG RSPM_VERSION=2024.08.0-6
 ARG RSPM_DOWNLOAD_URL=https://cdn.rstudio.com/package-manager/deb/amd64
-RUN curl -O ${RSPM_DOWNLOAD_URL}/rstudio-pm_${RSPM_VERSION}_amd64.deb \
+RUN curl -fsSL -O ${RSPM_DOWNLOAD_URL}/rstudio-pm_${RSPM_VERSION}_amd64.deb \
     # Pre 7/25/23 packages
     && gpg --keyserver keyserver.ubuntu.com --recv-keys 3F32EE77E331692F \
     # Post 7/25 packages
diff --git a/package-manager/test/run_tests.sh b/package-manager/test/run_tests.sh
index 4cf48553..388df343 100755
--- a/package-manager/test/run_tests.sh
+++ b/package-manager/test/run_tests.sh
@@ -23,7 +23,7 @@ else
 fi
 
 # install goss to tmp location and make executable
-curl -sL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
+curl -fsSL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
   && chmod +x /tmp/goss \
   && GOSS=/tmp/goss
 
diff --git a/product/base/Dockerfile.centos7 b/product/base/Dockerfile.centos7
index dfd13ed9..70c53154 100644
--- a/product/base/Dockerfile.centos7
+++ b/product/base/Dockerfile.centos7
@@ -29,7 +29,7 @@ RUN gpg --batch --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 595E85A6B1
 
 ### Install TinyTeX ###
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-RUN curl -sL "https://yihui.org/tinytex/install-bin-unix.sh" | sh \
+RUN curl -fsSL "https://yihui.org/tinytex/install-bin-unix.sh" | sh \
     && /root/.TinyTeX/bin/*/tlmgr path remove \
     && mv /root/.TinyTeX/ /opt/TinyTeX \
     && /opt/TinyTeX/bin/*/tlmgr option sys_bin /usr/local/bin \
diff --git a/product/base/scripts/rhel/install_drivers.sh b/product/base/scripts/rhel/install_drivers.sh
index 40538b10..7d227f1a 100755
--- a/product/base/scripts/rhel/install_drivers.sh
+++ b/product/base/scripts/rhel/install_drivers.sh
@@ -13,7 +13,7 @@ fi
 echo "$d$d Installing Professional Drivers ${DRIVERS_VERSION} $d$d"
 
 drivers_url="https://cdn.rstudio.com/drivers/7C152C12/installer/rstudio-drivers-${DRIVERS_VERSION}.el.x86_64.rpm"
-curl -sL "$drivers_url" -o "/tmp/rstudio-drivers_${DRIVERS_VERSION}.el.x86_64.rpm"
+curl -fsSL "$drivers_url" -o "/tmp/rstudio-drivers_${DRIVERS_VERSION}.el.x86_64.rpm"
 
 yum install -y -q "/tmp/rstudio-drivers_${DRIVERS_VERSION}.el.x86_64.rpm"
 cat /opt/rstudio-drivers/odbcinst.ini.sample > /etc/odbcinst.ini
diff --git a/product/base/scripts/rhel/install_python.sh b/product/base/scripts/rhel/install_python.sh
index 8ee26960..14275973 100755
--- a/product/base/scripts/rhel/install_python.sh
+++ b/product/base/scripts/rhel/install_python.sh
@@ -92,7 +92,7 @@ install_python() {
     mkdir -p "$PREFIX"
 
     local python_url="https://cdn.rstudio.com/python/${DISTRO}-${OS_VERSION}/pkgs/python-${PYTHON_VERSION}-1-1.x86_64.rpm"
-    curl -sL "$python_url" -o "/tmp/python-${PYTHON_VERSION}.rpm"
+    curl -fsSL "$python_url" -o "/tmp/python-${PYTHON_VERSION}.rpm"
 
     # shellcheck disable=SC2086
     yum install $YUM_ARGS "/tmp/python-${PYTHON_VERSION}.rpm"
diff --git a/product/base/scripts/rhel/install_r.sh b/product/base/scripts/rhel/install_r.sh
index b346ea12..1dc254f2 100755
--- a/product/base/scripts/rhel/install_r.sh
+++ b/product/base/scripts/rhel/install_r.sh
@@ -98,7 +98,7 @@ install_r() {
     mkdir -p "$PREFIX"
 
     local r_url="https://cdn.rstudio.com/r/${DISTRO}-${OS_VERSION}/pkgs/R-${R_VERSION}-1-1.x86_64.rpm"
-    curl -sL "$r_url" -o "/tmp/r-${R_VERSION}.rpm"
+    curl -fsSL "$r_url" -o "/tmp/r-${R_VERSION}.rpm"
 
     # shellcheck disable=SC2086
     yum install $YUM_ARGS "/tmp/r-${R_VERSION}.rpm"
@@ -146,7 +146,7 @@ get_r_source() {
     echo "$d Fetching R-${R_VERSION} source code into $r_source_dir $d"
     mkdir -p "$r_source_dir"
 
-    curl -sL "$r_source_url" -o "$r_source_dir/R-${R_VERSION}.tar.gz"
+    curl -fsSL "$r_source_url" -o "$r_source_dir/R-${R_VERSION}.tar.gz"
 }
 
 
diff --git a/product/base/scripts/ubuntu/install_drivers.sh b/product/base/scripts/ubuntu/install_drivers.sh
index 68d332d9..9b956ad6 100755
--- a/product/base/scripts/ubuntu/install_drivers.sh
+++ b/product/base/scripts/ubuntu/install_drivers.sh
@@ -13,7 +13,7 @@ fi
 echo "$d$d Installing Professional Drivers ${DRIVERS_VERSION} $d$d"
 
 drivers_url="https://cdn.rstudio.com/drivers/7C152C12/installer/rstudio-drivers_${DRIVERS_VERSION}_amd64.deb"
-curl -sL "$drivers_url" -o "/tmp/rstudio-drivers_${DRIVERS_VERSION}_amd64.deb"
+curl -fsSL "$drivers_url" -o "/tmp/rstudio-drivers_${DRIVERS_VERSION}_amd64.deb"
 
 apt-get install -y -qq "/tmp/rstudio-drivers_${DRIVERS_VERSION}_amd64.deb"
 cat /opt/rstudio-drivers/odbcinst.ini.sample > /etc/odbcinst.ini
diff --git a/product/base/scripts/ubuntu/install_python.sh b/product/base/scripts/ubuntu/install_python.sh
index 13515ef7..e1178af8 100755
--- a/product/base/scripts/ubuntu/install_python.sh
+++ b/product/base/scripts/ubuntu/install_python.sh
@@ -88,7 +88,7 @@ install_python() {
     mkdir -p "$PREFIX"
 
     local python_url="https://cdn.rstudio.com/python/ubuntu-${UBUNTU_VERSION//./}/pkgs/python-${PYTHON_VERSION}_1_amd64.deb"
-    curl -sL "$python_url" -o "/tmp/python-${PYTHON_VERSION}.deb"
+    curl -fsSL "$python_url" -o "/tmp/python-${PYTHON_VERSION}.deb"
 
     # shellcheck disable=SC2086
     apt-get install $APT_ARGS "/tmp/python-${PYTHON_VERSION}.deb"
diff --git a/product/base/scripts/ubuntu/install_quarto.sh b/product/base/scripts/ubuntu/install_quarto.sh
index 4bc67e27..f1f499c3 100755
--- a/product/base/scripts/ubuntu/install_quarto.sh
+++ b/product/base/scripts/ubuntu/install_quarto.sh
@@ -87,8 +87,6 @@ while true; do
     esac
 done
 
-set -u
-
 if [ -z "$QUARTO_VERSION" ] && [[ "$IS_WORKBENCH_INSTALLATION" -eq 0 ]]; then
     usage
     exit 1
diff --git a/product/base/scripts/ubuntu/install_r.sh b/product/base/scripts/ubuntu/install_r.sh
index 03284b61..98d48745 100755
--- a/product/base/scripts/ubuntu/install_r.sh
+++ b/product/base/scripts/ubuntu/install_r.sh
@@ -122,7 +122,7 @@ install_r() {
     mkdir -p "$PREFIX"
 
     local r_url="https://cdn.rstudio.com/r/ubuntu-${UBUNTU_VERSION//./}/pkgs/r-${R_VERSION}_1_amd64.deb"
-    curl -sL "$r_url" -o "/tmp/r-${R_VERSION}.deb"
+    curl -fsSL "$r_url" -o "/tmp/r-${R_VERSION}.deb"
 
     # shellcheck disable=SC2086
     apt-get install $APT_ARGS "/tmp/r-${R_VERSION}.deb"
@@ -152,7 +152,7 @@ get_r_source() {
     echo "$d Fetching R-${R_VERSION} source code into $r_source_dir $d"
     mkdir -p "$r_source_dir"
 
-    curl -sL "$r_source_url" -o "$r_source_dir/R-${R_VERSION}.tar.gz"
+    curl -fsSL "$r_source_url" -o "$r_source_dir/R-${R_VERSION}.tar.gz"
 }
 
 
diff --git a/product/base/test/run_tests.sh b/product/base/test/run_tests.sh
index c18d6a8c..a82b8362 100755
--- a/product/base/test/run_tests.sh
+++ b/product/base/test/run_tests.sh
@@ -19,7 +19,7 @@ else
 fi
 
 # install goss to tmp location and make executable
-curl -sL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
+curl -fsSL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
   && chmod +x /tmp/goss \
   && GOSS=/tmp/goss
 
diff --git a/product/pro/test/run_tests.sh b/product/pro/test/run_tests.sh
index c18d6a8c..a82b8362 100755
--- a/product/pro/test/run_tests.sh
+++ b/product/pro/test/run_tests.sh
@@ -19,7 +19,7 @@ else
 fi
 
 # install goss to tmp location and make executable
-curl -sL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
+curl -fsSL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
   && chmod +x /tmp/goss \
   && GOSS=/tmp/goss
 
diff --git a/r-session-complete/Dockerfile.ubuntu2204 b/r-session-complete/Dockerfile.ubuntu2204
index ec3a8658..7db63af7 100644
--- a/r-session-complete/Dockerfile.ubuntu2204
+++ b/r-session-complete/Dockerfile.ubuntu2204
@@ -24,7 +24,7 @@ RUN apt-get update \
       rrdtool \
       subversion \
     && RSW_VERSION_URL=$(echo -n "${RSW_VERSION}" | sed 's/+/-/g') \
-    && curl -o rstudio-workbench.deb "${RSW_DOWNLOAD_URL}/${RSW_NAME}-${RSW_VERSION_URL}-amd64.deb" \
+    && curl -fsSL -o rstudio-workbench.deb "${RSW_DOWNLOAD_URL}/${RSW_NAME}-${RSW_VERSION_URL}-amd64.deb" \
     # Pre 7/25/23 packages
     && gpg --keyserver keyserver.ubuntu.com --recv-keys 3F32EE77E331692F \
     # Post 7/25 packages
diff --git a/r-session-complete/test/run_tests.sh b/r-session-complete/test/run_tests.sh
index f5744551..8aff0f84 100755
--- a/r-session-complete/test/run_tests.sh
+++ b/r-session-complete/test/run_tests.sh
@@ -12,7 +12,7 @@ else
 fi
 
 # install goss to tmp location and make executable
-curl -sL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
+curl -fsSL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
   && chmod +x /tmp/goss \
   && GOSS=/tmp/goss
 
diff --git a/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204 b/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204
index d9a91c81..6d2225b6 100644
--- a/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204
+++ b/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204
@@ -37,7 +37,7 @@ 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 - \
+RUN curl -fsSL https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - \
     && ${SCRIPTS_DIR}/apt.sh --update upgrade \
     && ${SCRIPTS_DIR}/apt.sh install $(cat /tmp/apt_packages.txt) \
     && ${SCRIPTS_DIR}/apt.sh --clean \
@@ -79,7 +79,7 @@ RUN ${SCRIPTS_DIR}/apt.sh --update upgrade \
 
 ### Install Workbench ###
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-RUN curl -o rstudio-workbench.deb "${RSW_DOWNLOAD_URL}/${RSW_NAME}-${RSW_VERSION//+/-}-amd64.deb" \
+RUN curl -fsSL -o rstudio-workbench.deb "${RSW_DOWNLOAD_URL}/${RSW_NAME}-${RSW_VERSION//+/-}-amd64.deb" \
     # Pre 7/25/23 packages
     && gpg --keyserver keyserver.ubuntu.com --recv-keys 3F32EE77E331692F \
     # Post 7/25 packages
@@ -110,7 +110,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-${RSW_VERSION//+/-}.tar.gz" |  \
+    && curl -fsSL "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 \
diff --git a/workbench-for-google-cloud-workstations/test/run_tests.sh b/workbench-for-google-cloud-workstations/test/run_tests.sh
index 9e86f128..253e0286 100755
--- a/workbench-for-google-cloud-workstations/test/run_tests.sh
+++ b/workbench-for-google-cloud-workstations/test/run_tests.sh
@@ -30,7 +30,7 @@ GOSS_VERSION=${GOSS_VERSION:-0.4.6}
 GOSS_MAX_CONCURRENT=${GOSS_MAX_CONCURRENT:-5}
 
 # install goss to tmp location and make executable
-curl -sL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
+curl -fsSL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
   && chmod +x /tmp/goss \
   && GOSS=/tmp/goss
 
diff --git a/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 b/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204
index bcb6139d..1f6437c9 100644
--- a/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204
+++ b/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204
@@ -39,7 +39,7 @@ RUN apt-get update --fix-missing \
     && rm -rf /var/lib/apt/lists/*
 
 RUN apt-get update \
-    && curl -o rstudio-workbench.deb "${RSW_DOWNLOAD_URL}/${RSW_NAME}-${RSW_VERSION//+/-}-amd64.deb" \
+    && curl -fsSL -o rstudio-workbench.deb "${RSW_DOWNLOAD_URL}/${RSW_NAME}-${RSW_VERSION//+/-}-amd64.deb" \
     # Pre 7/25/23 packages
     && gpg --keyserver keyserver.ubuntu.com --recv-keys 3F32EE77E331692F \
     # Post 7/25 packages
@@ -51,7 +51,7 @@ RUN apt-get update \
     && rm ./rstudio-workbench.deb \
     && 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-azureml-amd64-${RSW_VERSION//+/-}.tar.gz" \
+    && curl -fsSL "https://s3.amazonaws.com/rstudio-ide-build/monitor/jammy/rsp-monitor-workbench-azureml-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 \
@@ -122,7 +122,7 @@ RUN /opt/python/${PYTHON_VERSION}/bin/python3 -m pip install -r /tmp/py_packages
 
 ADD --chmod=755 https://raw.githubusercontent.com/rstudio/wait-for-it/master/wait-for-it.sh /usr/local/bin/wait-for-it.sh
 
-RUN curl -sL https://aka.ms/InstallAzureCLIDeb | bash \
+RUN curl -fsSL https://aka.ms/InstallAzureCLIDeb | bash \
     && az extension add -n ml -y
 
 COPY conf/* /etc/rstudio/
diff --git a/workbench-for-microsoft-azure-ml/deps/install-r.sh b/workbench-for-microsoft-azure-ml/deps/install-r.sh
index 99620614..4fccb829 100755
--- a/workbench-for-microsoft-azure-ml/deps/install-r.sh
+++ b/workbench-for-microsoft-azure-ml/deps/install-r.sh
@@ -31,7 +31,7 @@ install_r_packages() {
 
 for rvers in 4.0.5 4.1.3 4.2.3 4.3.2; do
     # install r version
-    curl -O https://cdn.rstudio.com/r/ubuntu-$(lsb_release -rs | sed 's/\.//g')/pkgs/r-${rvers}_1_amd64.deb
+    curl -fsSL -O https://cdn.rstudio.com/r/ubuntu-$(lsb_release -rs | sed 's/\.//g')/pkgs/r-${rvers}_1_amd64.deb
     DEBIAN_FRONTEND=noninteractive apt-get install -y ./r-${rvers}_1_amd64.deb
     rm -f ./r-${rvers}_1_amd64.deb
 
diff --git a/workbench-for-microsoft-azure-ml/test/run_tests.sh b/workbench-for-microsoft-azure-ml/test/run_tests.sh
index 8c14be69..c938aa52 100755
--- a/workbench-for-microsoft-azure-ml/test/run_tests.sh
+++ b/workbench-for-microsoft-azure-ml/test/run_tests.sh
@@ -31,7 +31,7 @@ GOSS_VERSION=${GOSS_VERSION:-0.4.6}
 GOSS_MAX_CONCURRENT=${GOSS_MAX_CONCURRENT:-5}
 
 # install goss to tmp location and make executable
-curl -sL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
+curl -fsSL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
   && chmod +x /tmp/goss \
   && GOSS=/tmp/goss
 
diff --git a/workbench/Dockerfile.ubuntu2204 b/workbench/Dockerfile.ubuntu2204
index fd09b7e0..544fe97b 100644
--- a/workbench/Dockerfile.ubuntu2204
+++ b/workbench/Dockerfile.ubuntu2204
@@ -47,7 +47,7 @@ RUN apt-get update \
       sssd \
       supervisor \
     && RSW_VERSION_URL=$(echo -n "${RSW_VERSION}" | sed 's/+/-/g') \
-    && curl -o rstudio-workbench.deb "${RSW_DOWNLOAD_URL}/${RSW_NAME}-${RSW_VERSION_URL}-amd64.deb" \
+    && curl -fsSL -o rstudio-workbench.deb "${RSW_DOWNLOAD_URL}/${RSW_NAME}-${RSW_VERSION_URL}-amd64.deb" \
     # Pre 7/25/23 packages
     && gpg --keyserver keyserver.ubuntu.com --recv-keys 3F32EE77E331692F \
     # Post 7/25 packages
@@ -98,7 +98,7 @@ RUN /opt/python/"${PYTHON_VERSION_JUPYTER}"/bin/python -m venv /opt/python/jupyt
     && /opt/python/jupyter/bin/jupyter-nbextension enable --sys-prefix --py rsconnect_jupyter \
     && /opt/python/jupyter/bin/jupyter-serverextension enable --sys-prefix --py rsconnect_jupyter
 
-RUN curl -L -o /usr/local/bin/wait-for-it.sh https://raw.githubusercontent.com/rstudio/wait-for-it/master/wait-for-it.sh && \
+RUN curl -fsSL -o /usr/local/bin/wait-for-it.sh https://raw.githubusercontent.com/rstudio/wait-for-it/master/wait-for-it.sh && \
     chmod +x /usr/local/bin/wait-for-it.sh
 
 COPY --chmod=600 sssd.conf /etc/sssd/sssd.conf
diff --git a/workbench/test/run_tests.sh b/workbench/test/run_tests.sh
index ccec65e4..fd157f7a 100755
--- a/workbench/test/run_tests.sh
+++ b/workbench/test/run_tests.sh
@@ -30,7 +30,7 @@ GOSS_VERSION=${GOSS_VERSION:-0.4.6}
 GOSS_MAX_CONCURRENT=${GOSS_MAX_CONCURRENT:-5}
 
 # install goss to tmp location and make executable
-curl -sL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
+curl -fsSL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
   && chmod +x /tmp/goss \
   && GOSS=/tmp/goss
 

From c0ba2f7a6e6eeefa78e63b12779a73a9b3bfcb55 Mon Sep 17 00:00:00 2001
From: Ian Pittwood <ian.pittwood@rstudio.com>
Date: Wed, 4 Sep 2024 12:03:32 -0600
Subject: [PATCH 4/8] Fix Quarto tools output test pattern

---
 connect/test/goss.yaml                                 | 2 +-
 r-session-complete/test/goss.yaml                      | 2 +-
 workbench-for-google-cloud-workstations/test/goss.yaml | 2 +-
 workbench-for-microsoft-azure-ml/test/goss.yaml        | 2 +-
 workbench/test/goss.yaml                               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/connect/test/goss.yaml b/connect/test/goss.yaml
index 63cffa16..739b02ce 100644
--- a/connect/test/goss.yaml
+++ b/connect/test/goss.yaml
@@ -120,4 +120,4 @@ command:
     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}/"
+      - "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}\\s+v\\d{4}\\.\\d{2}/"
diff --git a/r-session-complete/test/goss.yaml b/r-session-complete/test/goss.yaml
index 44e611ec..0c8a9b28 100644
--- a/r-session-complete/test/goss.yaml
+++ b/r-session-complete/test/goss.yaml
@@ -66,4 +66,4 @@ command:
     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}/"
+      - "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}\\s+v\\d{4}\\.\\d{2}/"
diff --git a/workbench-for-google-cloud-workstations/test/goss.yaml b/workbench-for-google-cloud-workstations/test/goss.yaml
index 121ca897..b7bbf71b 100644
--- a/workbench-for-google-cloud-workstations/test/goss.yaml
+++ b/workbench-for-google-cloud-workstations/test/goss.yaml
@@ -239,4 +239,4 @@ command:
     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}/"
+      - "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}\\s+v\\d{4}\\.\\d{2}/"
diff --git a/workbench-for-microsoft-azure-ml/test/goss.yaml b/workbench-for-microsoft-azure-ml/test/goss.yaml
index 332ad325..aa355054 100644
--- a/workbench-for-microsoft-azure-ml/test/goss.yaml
+++ b/workbench-for-microsoft-azure-ml/test/goss.yaml
@@ -157,4 +157,4 @@ command:
     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}/"
+      - "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}\\s+v\\d{4}\\.\\d{2}/"
diff --git a/workbench/test/goss.yaml b/workbench/test/goss.yaml
index 5830f11a..f2d54f29 100644
--- a/workbench/test/goss.yaml
+++ b/workbench/test/goss.yaml
@@ -154,4 +154,4 @@ command:
     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}/"
+      - "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}\\s+v\\d{4}\\.\\d{2}/"

From 10c0e622c0e99f9509d93ccd97e8e86a2b37c011 Mon Sep 17 00:00:00 2001
From: Ian Pittwood <ian.pittwood@rstudio.com>
Date: Wed, 4 Sep 2024 12:06:05 -0600
Subject: [PATCH 5/8] Change third part to optional

---
 connect/test/goss.yaml                                 | 2 +-
 r-session-complete/test/goss.yaml                      | 2 +-
 workbench-for-google-cloud-workstations/test/goss.yaml | 2 +-
 workbench-for-microsoft-azure-ml/test/goss.yaml        | 2 +-
 workbench/test/goss.yaml                               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/connect/test/goss.yaml b/connect/test/goss.yaml
index 739b02ce..d44b4257 100644
--- a/connect/test/goss.yaml
+++ b/connect/test/goss.yaml
@@ -120,4 +120,4 @@ command:
     title: quarto_tinytex_installed
     exit-status: 0
     stderr:
-      - "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}\\s+v\\d{4}\\.\\d{2}/"
+      - "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?/"
diff --git a/r-session-complete/test/goss.yaml b/r-session-complete/test/goss.yaml
index 0c8a9b28..c5ea93a4 100644
--- a/r-session-complete/test/goss.yaml
+++ b/r-session-complete/test/goss.yaml
@@ -66,4 +66,4 @@ command:
     title: quarto_tinytex_installed
     exit-status: 0
     stderr:
-      - "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}\\s+v\\d{4}\\.\\d{2}/"
+      - "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?/"
diff --git a/workbench-for-google-cloud-workstations/test/goss.yaml b/workbench-for-google-cloud-workstations/test/goss.yaml
index b7bbf71b..8285d1b7 100644
--- a/workbench-for-google-cloud-workstations/test/goss.yaml
+++ b/workbench-for-google-cloud-workstations/test/goss.yaml
@@ -239,4 +239,4 @@ command:
     title: quarto_tinytex_installed
     exit-status: 0
     stderr:
-      - "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}\\s+v\\d{4}\\.\\d{2}/"
+      - "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?/"
diff --git a/workbench-for-microsoft-azure-ml/test/goss.yaml b/workbench-for-microsoft-azure-ml/test/goss.yaml
index aa355054..5983284a 100644
--- a/workbench-for-microsoft-azure-ml/test/goss.yaml
+++ b/workbench-for-microsoft-azure-ml/test/goss.yaml
@@ -157,4 +157,4 @@ command:
     title: quarto_tinytex_installed
     exit-status: 0
     stderr:
-      - "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}\\s+v\\d{4}\\.\\d{2}/"
+      - "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?/"
diff --git a/workbench/test/goss.yaml b/workbench/test/goss.yaml
index f2d54f29..297662de 100644
--- a/workbench/test/goss.yaml
+++ b/workbench/test/goss.yaml
@@ -154,4 +154,4 @@ command:
     title: quarto_tinytex_installed
     exit-status: 0
     stderr:
-      - "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}\\s+v\\d{4}\\.\\d{2}/"
+      - "/tinytex\\s+Up to date\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?\\s+v\\d{4}\\.\\d{2}(\\.\\d{2})?/"

From ca5a6a875852b914ff89bfed1a78d29a7c4fe8bf Mon Sep 17 00:00:00 2001
From: Trevor-Reid <104936561+Trevor-Reid@users.noreply.github.com>
Date: Wed, 4 Sep 2024 17:24:22 -0400
Subject: [PATCH 6/8] Unpin ms-python.python ext and installms-toolsai.jupyter
 ext (#834)

Co-authored-by: Ian Pittwood <ian.pittwood@posit.co>
---
 r-session-complete/vscode.extensions.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/r-session-complete/vscode.extensions.conf b/r-session-complete/vscode.extensions.conf
index 0e38faab..80e04b95 100644
--- a/r-session-complete/vscode.extensions.conf
+++ b/r-session-complete/vscode.extensions.conf
@@ -1,4 +1,5 @@
 quarto.quarto
 REditorSupport.r@2.8.2
-ms-python.python@2023.6.1
+ms-python.python
 posit.shiny
+ms-toolsai.jupyter

From 7cce3095a6b7a36e98e0bf88ab1e68fb6035fa33 Mon Sep 17 00:00:00 2001
From: Jacob Woliver <jacob@jmw.sh>
Date: Tue, 10 Sep 2024 12:57:41 -0400
Subject: [PATCH 7/8] fix: update downloads.json to point to posit.co

---
 tools/get-version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/get-version.py b/tools/get-version.py
index 6c73fd72..411d18ea 100755
--- a/tools/get-version.py
+++ b/tools/get-version.py
@@ -108,7 +108,7 @@ def download_json(url):
 
 
 def get_downloads_json():
-    return download_json("https://www.rstudio.com/wp-content/downloads.json")
+    return download_json("https://posit.co/wp-content/uploads/downloads.json")
 
 
 def rstudio_workbench_preview():

From ededfde3f88f5fe7b15d5ed4e725198ba1ced805 Mon Sep 17 00:00:00 2001
From: Ian Pittwood <ian.pittwood@rstudio.com>
Date: Mon, 16 Sep 2024 13:34:04 -0600
Subject: [PATCH 8/8] Pin WGCW build back to Ubuntu 22.04

---
 workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204 b/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204
index 6d2225b6..d32b72fe 100644
--- a/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204
+++ b/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204
@@ -1,5 +1,5 @@
 FROM product-base-pro as posit_base
-FROM us-central1-docker.pkg.dev/cloud-workstations-images/predefined/base:latest as build
+FROM us-central1-docker.pkg.dev/cloud-workstations-images/predefined/base:last-ubuntu2204 as build
 
 ### ARG declarations ###
 ARG DEBIAN_FRONTEND=noninteractive