From c635edcffd839ea59f70642370b9f62323e5e039 Mon Sep 17 00:00:00 2001 From: David Kegley Date: Thu, 30 May 2024 10:31:10 -0400 Subject: [PATCH 1/6] Bump Connect version to 2024.05.0 --- Justfile | 2 +- connect-content-init/Dockerfile.ubuntu2204 | 2 +- connect-content-init/README.md | 6 +++--- connect/.env | 2 +- connect/Dockerfile.ubuntu2204 | 2 +- connect/README.md | 2 +- docker-bake.hcl | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Justfile b/Justfile index 4386afdb..39086128 100644 --- 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 index 7a4cfd4c..3d9278ce 100644 --- 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 index 4a6a58de..3d8ce099 100644 --- 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 index b27a5daf..bc292340 100644 --- 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 index cbea5ad9..dcbc35f9 100644 --- a/connect/Dockerfile.ubuntu2204 +++ b/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.04.1 +ARG RSC_VERSION=2024.05.0 ARG QUARTO_VERSION=1.4.552 ARG SCRIPTS_DIR=/opt/positscripts diff --git a/connect/README.md b/connect/README.md index 9215a5fd..763b1428 100644 --- 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/docker-bake.hcl b/docker-bake.hcl index f9169170..92a36bc7 100644 --- 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 { From 68565a53022284c859ecf1f21a31e8faed395f01 Mon Sep 17 00:00:00 2001 From: Aron Atkins Date: Fri, 24 May 2024 14:29:43 -0400 Subject: [PATCH 2/6] connect: install TensorFlow Serving Install the universal binary. No configuration modifications. Fixes #776 --- connect/Dockerfile.ubuntu2204 | 12 +++++++++++- connect/NEWS.md | 4 ++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/connect/Dockerfile.ubuntu2204 b/connect/Dockerfile.ubuntu2204 index dcbc35f9..ed79fce8 100644 --- a/connect/Dockerfile.ubuntu2204 +++ b/connect/Dockerfile.ubuntu2204 @@ -15,8 +15,18 @@ ARG SCRIPTS_DIR=/opt/positscripts 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 index 136c66ce..fa4d57f2 100644 --- a/connect/NEWS.md +++ b/connect/NEWS.md @@ -1,3 +1,7 @@ +# 2024-05-24 + +- Installs the TensorFlow Serving universal binary. + # 2024-04-30 - BREAKING: Upgrade the default Quarto version to 1.4.552. From 0ccbc5231d26fc3275476438ebefe3bbe2fda990 Mon Sep 17 00:00:00 2001 From: Aron Atkins Date: Fri, 24 May 2024 14:32:00 -0400 Subject: [PATCH 3/6] connect: enable TensorFlow Serving Builds upon #778 Fixes #777 --- connect/NEWS.md | 4 ++++ connect/rstudio-connect-float.gcfg | 4 ++++ connect/rstudio-connect.gcfg | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/connect/NEWS.md b/connect/NEWS.md index fa4d57f2..aed6cbe8 100644 --- a/connect/NEWS.md +++ b/connect/NEWS.md @@ -1,3 +1,7 @@ +# 2024-05-25 + +- Enables TensorFlow Serving. + # 2024-05-24 - Installs the TensorFlow Serving universal binary. diff --git a/connect/rstudio-connect-float.gcfg b/connect/rstudio-connect-float.gcfg index df12fe67..7cf34133 100644 --- 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 index 0cf5006d..13312664 100644 --- 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 From 28a1f46cb96858c1960f0c625eb745f3aabbcc4a Mon Sep 17 00:00:00 2001 From: David Kegley Date: Thu, 30 May 2024 10:48:15 -0400 Subject: [PATCH 4/6] Bump R version to 4.4.0 in Connect image --- connect/NEWS.md | 6 ++---- docker-bake.hcl | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/connect/NEWS.md b/connect/NEWS.md index aed6cbe8..313c4309 100644 --- a/connect/NEWS.md +++ b/connect/NEWS.md @@ -1,9 +1,7 @@ -# 2024-05-25 +# 2024-05-30 +- BREAKING: Upgrade the default R version to 4.4.0. R version 4.1.3 has been removed. - Enables TensorFlow Serving. - -# 2024-05-24 - - Installs the TensorFlow Serving universal binary. # 2024-04-30 diff --git a/docker-bake.hcl b/docker-bake.hcl index 92a36bc7..55f4e7f1 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -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.2.3", py_primary = "3.9.17", py_alternate = "3.8.17", quarto = DEFAULT_QUARTO_VERSION}, ] } } From 1e43d3fdd9079484ce200a5f1e754365956d709a Mon Sep 17 00:00:00 2001 From: David Kegley Date: Thu, 30 May 2024 11:06:02 -0400 Subject: [PATCH 5/6] Bump Connect image R versions to 4.4.0 and 4.3.3 --- connect/NEWS.md | 2 +- docker-bake.hcl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/connect/NEWS.md b/connect/NEWS.md index 313c4309..69e82093 100644 --- a/connect/NEWS.md +++ b/connect/NEWS.md @@ -1,6 +1,6 @@ # 2024-05-30 -- BREAKING: Upgrade the default R version to 4.4.0. R version 4.1.3 has been removed. +- BREAKING: Upgrade installed R versions to 4.4.0 and 4.3.3. - Enables TensorFlow Serving. - Installs the TensorFlow Serving universal binary. diff --git a/docker-bake.hcl b/docker-bake.hcl index 55f4e7f1..f3dd8684 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -118,7 +118,7 @@ variable PACKAGE_MANAGER_BUILD_MATRIX { variable CONNECT_BUILD_MATRIX { default = { builds = [ - {os = "ubuntu2204", r_primary = "4.4.0", r_alternate = "4.2.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.9.17", py_alternate = "3.8.17", quarto = DEFAULT_QUARTO_VERSION}, ] } } From 58b752696355d774860eedfb088862142408026d Mon Sep 17 00:00:00 2001 From: David Kegley Date: Thu, 30 May 2024 17:08:22 -0400 Subject: [PATCH 6/6] Bump python install versions for Connect --- connect/NEWS.md | 4 +++- docker-bake.hcl | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/connect/NEWS.md b/connect/NEWS.md index 69e82093..5db5e1b2 100644 --- a/connect/NEWS.md +++ b/connect/NEWS.md @@ -1,6 +1,8 @@ # 2024-05-30 -- BREAKING: Upgrade installed R versions to 4.4.0 and 4.3.3. +- 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. diff --git a/docker-bake.hcl b/docker-bake.hcl index f3dd8684..5dcdeb03 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -118,7 +118,7 @@ variable PACKAGE_MANAGER_BUILD_MATRIX { variable CONNECT_BUILD_MATRIX { default = { builds = [ - {os = "ubuntu2204", r_primary = "4.4.0", r_alternate = "4.3.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}, ] } }