Merge pull request #785 from rstudio/connect-release-2024.05.0

Bump Connect version to 2024.05.0
rstudio · May 31, 2024 · aff77ed · aff77ed
2 parents bcac2d5 + 58b7526
commit aff77ed
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 11 deletions.
diff --git a/Justfile b/Justfile
@@ -7,7 +7,7 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" }
 
 BUILDX_PATH := ""
 
-RSC_VERSION := "2024.04.1"
+RSC_VERSION := "2024.05.0"
 RSPM_VERSION := "2024.04.0-20"
 RSW_VERSION := "2024.04.1+748.pro2"
 

diff --git a/connect-content-init/Dockerfile.ubuntu2204 b/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.04.1
+ARG RSC_VERSION=2024.05.0
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN mkdir -p /rsc-staging && \
     RSC_VERSION_URL=$(echo -n "${RSC_VERSION}" | sed 's/+/%2B/g') && \

diff --git a/connect-content-init/README.md b/connect-content-init/README.md
@@ -9,7 +9,7 @@
 
 # Supported tags and respective Dockerfile links
 
-* [`jammy`, `ubuntu2204`, `jammy-2024.04.1`, `ubuntu2204-2024.04.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
+* [`jammy`, `ubuntu2204`, `jammy-2024.05.0`, `ubuntu2204-2024.05.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.04.1
+just build ubuntu2204 2024.05.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.04.1-dev-326
+docker history rstudio/rstudio-connect-content-init-preview:2024.05.0-dev-326
 ```
 
 NOTE: almost all the image size is pandoc.

diff --git a/connect/.env b/connect/.env
@@ -1,4 +1,4 @@
-RSC_VERSION=2024.04.1
+RSC_VERSION=2024.05.0
 R_VERSION=4.2.3
 R_VERSION_ALT=4.1.3
 PYTHON_VERSION=3.9.17

diff --git a/connect/Dockerfile.ubuntu2204 b/connect/Dockerfile.ubuntu2204
@@ -7,16 +7,26 @@ 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.04.1
+ARG RSC_VERSION=2024.05.0
 ARG QUARTO_VERSION=1.4.552
 ARG SCRIPTS_DIR=/opt/positscripts
 
 ### Install Quarto ###
 RUN QUARTO_VERSION=${QUARTO_VERSION} ${SCRIPTS_DIR}/install_quarto.sh \
     && ln -s /opt/quarto/${QUARTO_VERSION}/bin/quarto /usr/local/bin/quarto
 
-### Install Connect and additional dependencies ###
 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 -
+RUN apt-get update \
+    && apt-get install -yq --no-install-recommends \
+      tensorflow-model-server-universal \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+### Install Connect and additional dependencies ###
 RUN apt-get update --fix-missing \
     && apt-get install -yq --no-install-recommends \
       bzip2 \

diff --git a/connect/NEWS.md b/connect/NEWS.md
@@ -1,3 +1,11 @@
+# 2024-05-30
+
+- BREAKING:
+  - Upgrade installed R versions to 4.4.0 and 4.3.3.
+  - Upgrade installed Python versions to 3.12.1 and 3.11.7.
+- Enables TensorFlow Serving.
+- Installs the TensorFlow Serving universal binary.
+
 # 2024-04-30
 
 - BREAKING: Upgrade the default Quarto version to 1.4.552.

diff --git a/connect/README.md b/connect/README.md
@@ -7,7 +7,7 @@
 
 # Supported tags and respective Dockerfile links
 
-* [`jammy`, `ubuntu2204`, `jammy-2024.04.1`, `ubuntu2204-2024.04.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
+* [`jammy`, `ubuntu2204`, `jammy-2024.05.0`, `ubuntu2204-2024.05.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
 
 # What is Posit Connect?
 

diff --git a/connect/rstudio-connect-float.gcfg b/connect/rstudio-connect-float.gcfg
@@ -41,6 +41,10 @@ Executable = /opt/python/{{PYTHON_VERSION_ALT}}/bin/python
 Enabled = true
 Executable = /opt/quarto/{{QUARTO_VERSION}}/bin/quarto
 
+[TensorFlow]
+Enabled = true
+Executable = /usr/bin/tensorflow_model_server
+
 ;[RPackageRepository "CRAN"]
 ;URL = https://demo.rstudiopm.com/all/__linux__/jammy/latest
 ;

diff --git a/connect/rstudio-connect.gcfg b/connect/rstudio-connect.gcfg
@@ -37,6 +37,10 @@ Executable = /opt/python/{{PYTHON_VERSION_ALT}}/bin/python
 Enabled = true
 Executable = /opt/quarto/{{QUARTO_VERSION}}/bin/quarto
 
+[TensorFlow]
+Enabled = true
+Executable = /usr/bin/tensorflow_model_server
+
 [RPackageRepository "CRAN"]
 URL = https://packagemanager.rstudio.com/cran/__linux__/jammy/latest
 

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -1,6 +1,6 @@
 ### Variable definitions ###
 variable CONNECT_VERSION {
-    default = "2024.04.1"
+    default = "2024.05.0"
 }
 
 variable PACKAGE_MANAGER_VERSION {
@@ -118,7 +118,7 @@ variable PACKAGE_MANAGER_BUILD_MATRIX {
 variable CONNECT_BUILD_MATRIX {
     default = {
         builds = [
-            {os = "ubuntu2204", r_primary = "4.2.3", r_alternate = "4.1.3", py_primary = "3.9.17", py_alternate = "3.8.17", quarto = DEFAULT_QUARTO_VERSION},
+            {os = "ubuntu2204", r_primary = "4.4.0", r_alternate = "4.3.3", py_primary = "3.12.1", py_alternate = "3.11.7", quarto = DEFAULT_QUARTO_VERSION},
         ]
     }
 }