Merge branch 'dev' into fix-tz

Justfile

@@ -7,7 +7,7 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" }
 
 BUILDX_PATH := ""
 
-RSC_VERSION := "2024.02.0"
+RSC_VERSION := "2024.03.0"
 RSPM_VERSION := "2023.12.0-13"
 RSW_VERSION := "2023.12.1+402.pro1"
 

connect-content-init/Dockerfile.ubuntu2204

@@ -9,7 +9,7 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends ca-certificates curl && \
     rm -rf /var/lib/apt/lists/*
 
-ARG RSC_VERSION=2024.02.0
+ARG RSC_VERSION=2024.03.0
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN mkdir -p /rsc-staging && \
     RSC_VERSION_URL=$(echo -n "${RSC_VERSION}" | sed 's/+/%2B/g') && \

connect-content-init/README.md

@@ -9,7 +9,7 @@
 
 # Supported tags and respective Dockerfile links
 
-* [`jammy`, `ubuntu2204`, `jammy-2024.02.0`, `ubuntu2204-2024.02.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
+* [`jammy`, `ubuntu2204`, `jammy-2024.03.0`, `ubuntu2204-2024.03.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
 
 # RStudio Connect Content Init Container
 
@@ -31,7 +31,7 @@ The version of the release package to use can be overridden with the
 `RSC_VERSION` build arg.
 
 ```console
-just build ubuntu2204 2024.02.0
+just build ubuntu2204 2024.03.0
 ```
 
 ## Testing
@@ -56,7 +56,7 @@ just test
 You can see the different layers that make up the image:
 
 ```console
-docker history rstudio/rstudio-connect-content-init-preview:2024.02.0-dev-326
+docker history rstudio/rstudio-connect-content-init-preview:2024.03.0-dev-326
 ```
 
 NOTE: almost all the image size is pandoc.

connect/.env

@@ -1,4 +1,4 @@
-RSC_VERSION=2024.02.0
+RSC_VERSION=2024.03.0
 R_VERSION=4.2.3
 R_VERSION_ALT=4.1.3
 PYTHON_VERSION=3.9.17

connect/Dockerfile.ubuntu2204

@@ -7,7 +7,7 @@ ARG R_VERSION=4.2.3
 ARG R_VERSION_ALT=4.1.3
 ARG PYTHON_VERSION=3.9.17
 ARG PYTHON_VERSION_ALT=3.8.17
-ARG RSC_VERSION=2024.02.0
+ARG RSC_VERSION=2024.03.0
 SHELL [ "/bin/bash", "-o", "pipefail", "-c"]
 RUN apt-get update --fix-missing \
     && apt-get install -yq --no-install-recommends \

connect/NEWS.md

@@ -4,15 +4,15 @@
 - Updated Python versions to 3.8.17 and 3.9.17 (latest fix versions).
 
 # 2023-07-25
-- Changed `rstudio-connect.gcfg` Python version numbers behavior from statically defined to dynamically filled on build. 
+- Changed `rstudio-connect.gcfg` Python version numbers behavior from statically defined to dynamically filled on build.
 
 # 2023-07-10
 
 - BREAKING: Deprecate the Ubuntu 18.04 (Bionic Beaver) images.
 
 # 2023-07-07
 
-- WARNING: Refactor image to build _FROM_ the new `product-base` image, this could be potentially breaking for some 
+- WARNING: Refactor image to build _FROM_ the new `product-base` image, this could be potentially breaking for some
   users.
   - The following packages have been removed from the image: `gdebi-core`, `libsm6`, `libxext6`, and `libxrender1`.
 - The [Posit Professional Drivers](https://docs.posit.co/pro-drivers/) are now included by default in the image.

connect/README.md

@@ -7,7 +7,7 @@
 
 # Supported tags and respective Dockerfile links
 
-* [`jammy`, `ubuntu2204`, `jammy-2024.02.0`, `ubuntu2204-2024.02.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
+* [`jammy`, `ubuntu2204`, `jammy-2024.03.0`, `ubuntu2204-2024.03.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
 
 # What is Posit Connect?
 

workbench/Dockerfile.ubuntu2204

@@ -53,6 +53,8 @@ RUN apt-get update \
     && gpg --keyserver keys.openpgp.org --recv-keys 51C0B5BB19F92D60 \
     && dpkg-sig --verify ./rstudio-workbench.deb \
     && apt-get install -yq --no-install-recommends ./rstudio-workbench.deb \
+    # a wild hack to ensure that workbench can install _and start_ completely before shutdown
+    && sleep 30 \
     && rm ./rstudio-workbench.deb \
     && apt-get autoremove -y \
     && apt-get clean \