From b093afcc64740c5d1e0d2b587fcca064f1188056 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Thu, 25 Jan 2024 11:45:53 -0800 Subject: [PATCH 1/5] Bump Connect to version 2024.01.0 --- Justfile | 2 +- connect-content-init/Dockerfile.ubuntu2204 | 2 +- connect-content-init/Justfile | 2 +- connect-content-init/README.md | 6 +++--- connect/.env | 2 +- connect/Dockerfile.ubuntu2204 | 2 +- connect/Justfile | 2 +- connect/README.md | 2 +- docker-compose.yml | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Justfile b/Justfile index 3740c700..7caffa2d 100644 --- a/Justfile +++ b/Justfile @@ -6,7 +6,7 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" } BUILDX_PATH := "" -RSC_VERSION := "2023.12.0" +RSC_VERSION := "2024.01.0" RSPM_VERSION := "2023.12.0-13" RSW_VERSION := "2023.12.0+369.pro3" diff --git a/connect-content-init/Dockerfile.ubuntu2204 b/connect-content-init/Dockerfile.ubuntu2204 index ad845539..9f58675b 100644 --- a/connect-content-init/Dockerfile.ubuntu2204 +++ b/connect-content-init/Dockerfile.ubuntu2204 @@ -10,7 +10,7 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends ca-certificates curl && \ rm -rf /var/lib/apt/lists/* -ARG RSC_VERSION=2023.12.0 +ARG RSC_VERSION=2024.01.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/Justfile b/connect-content-init/Justfile index 01bcf171..e2df1bae 100644 --- a/connect-content-init/Justfile +++ b/connect-content-init/Justfile @@ -6,7 +6,7 @@ IMAGE_PREFIX := "rstudio-" PRODUCT := "connect-content-init" IMAGE_OS := "ubuntu2204" -RSC_VERSION := "2023.12.0" +RSC_VERSION := "2024.01.0" RSC_TAG_SAFE_VERSION := replace(RSC_VERSION, "+", "-") RSC_LICENSE := "" diff --git a/connect-content-init/README.md b/connect-content-init/README.md index 60702b82..36373b58 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-2023.12.0`, `ubuntu2204-2023.12.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204) +* [`jammy`, `ubuntu2204`, `jammy-2024.01.0`, `ubuntu2204-2024.01.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 2023.12.0 +just build ubuntu2204 2024.01.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:2023.12.0-dev-326 +docker history rstudio/rstudio-connect-content-init-preview:2024.01.0-dev-326 ``` NOTE: almost all the image size is pandoc. diff --git a/connect/.env b/connect/.env index d5a83327..f936ca2c 100644 --- a/connect/.env +++ b/connect/.env @@ -1,4 +1,4 @@ -RSC_VERSION=2023.12.0 +RSC_VERSION=2024.01.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 0bffaf22..8d092a88 100644 --- a/connect/Dockerfile.ubuntu2204 +++ b/connect/Dockerfile.ubuntu2204 @@ -13,7 +13,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=2023.12.0 +ARG RSC_VERSION=2024.01.0 SHELL [ "/bin/bash", "-o", "pipefail", "-c"] RUN apt-get update --fix-missing \ && apt-get install -yq --no-install-recommends \ diff --git a/connect/Justfile b/connect/Justfile index 4d30c08a..ccf4af8e 100644 --- a/connect/Justfile +++ b/connect/Justfile @@ -6,7 +6,7 @@ IMAGE_PREFIX := "rstudio-" PRODUCT := "connect" IMAGE_OS := "ubuntu2204" -RSC_VERSION := "2023.12.0" +RSC_VERSION := "2024.01.0" RSC_LICENSE := "" RSC_LICENSE_SERVER := "" diff --git a/connect/README.md b/connect/README.md index 75f8352b..23add18a 100644 --- a/connect/README.md +++ b/connect/README.md @@ -7,7 +7,7 @@ # Supported tags and respective Dockerfile links -* [`jammy`, `ubuntu2204`, `jammy-2023.12.0`, `ubuntu2204-2023.12.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204) +* [`jammy`, `ubuntu2204`, `jammy-2024.01.0`, `ubuntu2204-2024.01.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204) # What is Posit Connect? diff --git a/docker-compose.yml b/docker-compose.yml index abf4c56b..36db571d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,8 +25,8 @@ services: context: ./connect dockerfile: "Dockerfile.${IMAGE_OS:-ubuntu1804}" args: - RSC_VERSION: 2023.12.0 - image: rstudio/rstudio-connect:2023.12.0 + RSC_VERSION: 2024.01.0 + image: rstudio/rstudio-connect:2024.01.0 privileged: true environment: RSC_LICENSE: ${RSC_LICENSE} From dc8b596c3cc0002430fe096961d42a41f5e8dac4 Mon Sep 17 00:00:00 2001 From: GCRev Date: Tue, 30 Jan 2024 20:50:14 +0000 Subject: [PATCH 2/5] Bump PWB to 2023.12.1+402.pro1 --- Justfile | 2 +- docker-compose.yml | 2 +- r-session-complete/.env | 2 +- r-session-complete/Dockerfile.centos7 | 2 +- r-session-complete/Dockerfile.ubuntu2204 | 2 +- r-session-complete/Justfile | 2 +- r-session-complete/README.md | 2 +- workbench-for-google-cloud-workstations/Dockerfile.ubuntu2004 | 2 +- workbench-for-microsoft-azure-ml/.env | 2 +- workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 | 2 +- workbench-for-microsoft-azure-ml/Justfile | 2 +- workbench/.env | 2 +- workbench/Dockerfile.ubuntu2204 | 2 +- workbench/Justfile | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Justfile b/Justfile index 3740c700..1138e93c 100644 --- a/Justfile +++ b/Justfile @@ -8,7 +8,7 @@ BUILDX_PATH := "" RSC_VERSION := "2023.12.0" RSPM_VERSION := "2023.12.0-13" -RSW_VERSION := "2023.12.0+369.pro3" +RSW_VERSION := "2023.12.1+402.pro1" DRIVERS_VERSION := "2023.05.0" DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1" diff --git a/docker-compose.yml b/docker-compose.yml index abf4c56b..0b502bc9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: context: ./workbench dockerfile: "Dockerfile.${IMAGE_OS:-ubuntu2204}" args: - RSW_VERSION: 2023.12.0+369.pro3 + RSW_VERSION: 2023.12.1+402.pro1 image: rstudio/rstudio-workbench:2023.12.0 environment: RSW_LICENSE: ${RSW_LICENSE} diff --git a/r-session-complete/.env b/r-session-complete/.env index 346abb8b..1931d7fe 100644 --- a/r-session-complete/.env +++ b/r-session-complete/.env @@ -1,4 +1,4 @@ R_VERSION=4.1.0 PYTHON_VERSION=3.9.5 DRIVERS_VERSION=2023.05.0-1 -RSW_VERSION=2023.12.0+369.pro3 +RSW_VERSION=2023.12.1+402.pro1 diff --git a/r-session-complete/Dockerfile.centos7 b/r-session-complete/Dockerfile.centos7 index 5de5ee49..ae766c0b 100644 --- a/r-session-complete/Dockerfile.centos7 +++ b/r-session-complete/Dockerfile.centos7 @@ -12,7 +12,7 @@ ARG R_VERSION_ALT=4.1.3 ARG PYTHON_VERSION=3.9.14 ARG PYTHON_VERSION_ALT=3.8.15 ARG JUPYTERLAB_VERSION=3.2.9 -ARG RSW_VERSION=2023.12.0+369.pro3 +ARG RSW_VERSION=2023.12.1+402.pro1 ARG RSW_NAME=rstudio-workbench-rhel ARG RSW_DOWNLOAD_URL=https://s3.amazonaws.com/rstudio-ide-build/server/centos7/x86_64 diff --git a/r-session-complete/Dockerfile.ubuntu2204 b/r-session-complete/Dockerfile.ubuntu2204 index 519fb444..1f3018b2 100644 --- a/r-session-complete/Dockerfile.ubuntu2204 +++ b/r-session-complete/Dockerfile.ubuntu2204 @@ -13,7 +13,7 @@ ARG R_VERSION_ALT=4.1.3 ARG PYTHON_VERSION=3.9.17 ARG PYTHON_VERSION_ALT=3.8.17 ARG JUPYTERLAB_VERSION=3.6.5 -ARG RSW_VERSION=2023.12.0+369.pro3 +ARG RSW_VERSION=2023.12.1+402.pro1 ARG RSW_NAME=rstudio-workbench ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64 diff --git a/r-session-complete/Justfile b/r-session-complete/Justfile index f2214aea..73642527 100755 --- a/r-session-complete/Justfile +++ b/r-session-complete/Justfile @@ -6,7 +6,7 @@ IMAGE_PREFIX := "" PRODUCT := "r-session-complete" IMAGE_OS := "ubuntu2204" -RSW_VERSION := "2023.12.0+369.pro3" +RSW_VERSION := "2023.12.1+402.pro1" RSW_LICENSE := "" DRIVERS_VERSION := "2023.05.0" diff --git a/r-session-complete/README.md b/r-session-complete/README.md index 44a6ca58..d30dbacf 100644 --- a/r-session-complete/README.md +++ b/r-session-complete/README.md @@ -7,7 +7,7 @@ # Supported tags and respective Dockerfile links -* [`jammy`, `ubuntu2204`, `jammy-2023.12.0`, `ubuntu2204-2023.12.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204) +* [`jammy`, `ubuntu2204`, `jammy-2023.12.1`, `ubuntu2204-2023.12.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204) # What are the r-session-complete images? diff --git a/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2004 b/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2004 index cb5e38c2..f6de9894 100644 --- a/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2004 +++ b/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2004 @@ -10,7 +10,7 @@ ARG PYTHON_VERSION_JUPYTER=3.10.13 ARG JUPYTERLAB_VERSION=3.6.5 ARG QUARTO_VERSION=1.3.450 ARG DRIVERS_VERSION=2023.05.0 -ARG RSW_VERSION=2023.12.0+369.pro3 +ARG RSW_VERSION=2023.12.1+402.pro1 ARG RSW_NAME=rstudio-workbench ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/focal/amd64 diff --git a/workbench-for-microsoft-azure-ml/.env b/workbench-for-microsoft-azure-ml/.env index afaf3495..a66dd515 100644 --- a/workbench-for-microsoft-azure-ml/.env +++ b/workbench-for-microsoft-azure-ml/.env @@ -1,4 +1,4 @@ -RSW_VERSION=2023.12.0+369.pro3 +RSW_VERSION=2023.12.1+402.pro1 RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/bionic/amd64 RSW_NAME=rstudio-workbench PYTHON_VERSION=3.9.14 diff --git a/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 b/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 index deb148ee..f3f0dc96 100644 --- a/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 +++ b/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 @@ -14,7 +14,7 @@ ARG PYTHON_VERSION=3.9.17 ARG PYTHON_VERSION_ALT=3.8.17 ARG PYTHON_VERSION_JUPYTER=3.8.17 ARG JUPYTERLAB_VERSION=3.6.5 -ARG RSW_VERSION=2023.12.0+369.pro3 +ARG RSW_VERSION=2023.12.1+402.pro1 ARG RSW_NAME=rstudio-workbench ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64 ARG DEBIAN_FRONTEND=noninteractive diff --git a/workbench-for-microsoft-azure-ml/Justfile b/workbench-for-microsoft-azure-ml/Justfile index 6dc3242f..cd9a2fa0 100644 --- a/workbench-for-microsoft-azure-ml/Justfile +++ b/workbench-for-microsoft-azure-ml/Justfile @@ -6,7 +6,7 @@ IMAGE_PREFIX := "rstudio-" PRODUCT := "workbench" IMAGE_OS := "ubuntu2204" -RSW_VERSION := "2023.12.0+369.pro3" +RSW_VERSION := "2023.12.1+402.pro1" RSW_LICENSE := "" R_VERSION := "4.2.3" diff --git a/workbench/.env b/workbench/.env index 58607422..075b94b7 100644 --- a/workbench/.env +++ b/workbench/.env @@ -1,4 +1,4 @@ -RSW_VERSION=2023.12.0+369.pro3 +RSW_VERSION=2023.12.1+402.pro1 RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/bionic/amd64 RSW_NAME=rstudio-workbench PYTHON_VERSION=3.9.17 diff --git a/workbench/Dockerfile.ubuntu2204 b/workbench/Dockerfile.ubuntu2204 index 8fd8f1d8..64edfed1 100644 --- a/workbench/Dockerfile.ubuntu2204 +++ b/workbench/Dockerfile.ubuntu2204 @@ -14,7 +14,7 @@ ARG PYTHON_VERSION=3.9.17 ARG PYTHON_VERSION_ALT=3.8.17 ARG PYTHON_VERSION_JUPYTER=3.8.17 ARG JUPYTERLAB_VERSION=3.6.5 -ARG RSW_VERSION=2023.12.0+369.pro3 +ARG RSW_VERSION=2023.12.1+402.pro1 ARG RSW_NAME=rstudio-workbench ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64 diff --git a/workbench/Justfile b/workbench/Justfile index 6202f674..785e0ad7 100644 --- a/workbench/Justfile +++ b/workbench/Justfile @@ -6,7 +6,7 @@ IMAGE_PREFIX := "rstudio-" PRODUCT := "workbench" IMAGE_OS := "ubuntu2204" -RSW_VERSION := "2023.12.0+369.pro3" +RSW_VERSION := "2023.12.1+402.pro1" RSW_RELEASE_TYPE := "release" RSW_LICENSE := "" RSW_LICENSE_SERVER := "" From 43c909e27f6a21bfa9f839ad895fea02f66704d3 Mon Sep 17 00:00:00 2001 From: GCRev Date: Tue, 30 Jan 2024 21:25:36 +0000 Subject: [PATCH 3/5] Update .env in GCP folder and README in workbench folder --- workbench-for-google-cloud-workstations/.env | 4 ++-- workbench/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/workbench-for-google-cloud-workstations/.env b/workbench-for-google-cloud-workstations/.env index fbc18f37..f87a5c6b 100644 --- a/workbench-for-google-cloud-workstations/.env +++ b/workbench-for-google-cloud-workstations/.env @@ -1,5 +1,5 @@ -RSW_VERSION=2023.09.1+494.pro2 -RSW_TAG_VERSION=2023.09.1-494.pro2 +RSW_VERSION=2023.12.1+402.pro1 +RSW_TAG_VERSION=2023.12.1-402.pro1 RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/focal/amd64 RSW_NAME=rstudio-workbench PYTHON_VERSION=3.10.13 diff --git a/workbench/README.md b/workbench/README.md index e72c4b24..f5daeabf 100644 --- a/workbench/README.md +++ b/workbench/README.md @@ -7,7 +7,7 @@ # Supported tags and respective Dockerfile links -* [`jammy`, `ubuntu2204`, `jammy-2023.12.0`, `ubuntu2204-2023.12.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench/Dockerfile.ubuntu2204) +* [`jammy`, `ubuntu2204`, `jammy-2023.12.1`, `ubuntu2204-2023.12.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench/Dockerfile.ubuntu2204) # What is RStudio Workbench? From 3f27e4632f162ef3233b6bc159c9e8d246de1c7f Mon Sep 17 00:00:00 2001 From: Ian Pittwood Date: Thu, 1 Feb 2024 07:37:15 -0800 Subject: [PATCH 4/5] Update Pro Drivers to 2023.12.1 --- NEWS.md | 4 +++ ci.Justfile | 2 +- content/matrix.json | 42 +++++++++++++++---------------- content/pro/Dockerfile.ubuntu1804 | 2 +- content/pro/Dockerfile.ubuntu2204 | 2 +- content/pro/Justfile | 2 +- product/pro/Dockerfile.centos7 | 2 +- product/pro/Dockerfile.ubuntu2204 | 2 +- product/pro/Justfile | 2 +- r-session-complete/.env | 2 +- r-session-complete/Justfile | 2 +- 11 files changed, 34 insertions(+), 30 deletions(-) diff --git a/NEWS.md b/NEWS.md index d4235cc1..fbd90b48 100644 --- a/NEWS.md +++ b/NEWS.md @@ -5,6 +5,10 @@ changed in each image. This file only captures pervasive, repository-wide changes. +# 2024-02-01 + +- Update Pro Drivers to 2023.12.1 + # 2023-08-07 - Removed base image Ubuntu 18.04 builds. diff --git a/ci.Justfile b/ci.Justfile index ebcbdd3b..65da96b0 100644 --- a/ci.Justfile +++ b/ci.Justfile @@ -9,7 +9,7 @@ R_VERSION_ALT := "4.1.3" PYTHON_VERSION := "3.9.17" PYTHON_VERSION_ALT := "3.8.17" -DRIVERS_VERSION := "2023.05.0" +DRIVERS_VERSION := "2023.12.1" DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1" QUARTO_VERSION := "1.3.340" diff --git a/content/matrix.json b/content/matrix.json index bbe08b33..4f84c28d 100644 --- a/content/matrix.json +++ b/content/matrix.json @@ -1,23 +1,23 @@ [ - {"r": "3.1.3", "py": "2.7.18", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"}, - {"r": "3.2.5", "py": "2.7.18", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"}, - {"r": "3.3.3", "py": "3.6.13", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"}, - {"r": "3.4.4", "py": "3.6.13", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"}, - {"r": "3.4.4", "py": "3.7.10", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"}, - {"r": "3.5.3", "py": "2.7.18", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"}, - {"r": "3.5.3", "py": "3.7.10", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"}, - {"r": "3.6.3", "py": "2.7.18", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"}, - {"r": "3.6.3", "py": "3.6.13", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"}, - {"r": "3.6.3", "py": "3.8.8", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"}, - {"r": "4.0.5", "py": "3.6.13", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"}, - {"r": "4.0.5", "py": "3.7.10", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"}, - {"r": "4.0.5", "py": "3.8.8", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"}, - {"r": "4.0.5", "py": "3.9.2", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"}, - {"r": "4.1.0", "py": "3.8.8", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"}, - {"r": "4.1.0", "py": "3.9.2", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"}, - {"r": "4.1.3", "py": "3.10.4", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"}, - {"r": "3.6.3", "py": "3.8.16", "drivers": "2023.05.0", "os": "ubuntu2204", "os_alt": "jammy"}, - {"r": "4.0.5", "py": "3.9.16", "drivers": "2023.05.0", "os": "ubuntu2204", "os_alt": "jammy"}, - {"r": "4.1.3", "py": "3.10.11", "drivers": "2023.05.0", "os": "ubuntu2204", "os_alt": "jammy"}, - {"r": "4.2.2", "py": "3.11.3", "drivers": "2023.05.0", "os": "ubuntu2204", "os_alt": "jammy"} + {"r": "3.1.3", "py": "2.7.18", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"}, + {"r": "3.2.5", "py": "2.7.18", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"}, + {"r": "3.3.3", "py": "3.6.13", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"}, + {"r": "3.4.4", "py": "3.6.13", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"}, + {"r": "3.4.4", "py": "3.7.10", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"}, + {"r": "3.5.3", "py": "2.7.18", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"}, + {"r": "3.5.3", "py": "3.7.10", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"}, + {"r": "3.6.3", "py": "2.7.18", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"}, + {"r": "3.6.3", "py": "3.6.13", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"}, + {"r": "3.6.3", "py": "3.8.8", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"}, + {"r": "4.0.5", "py": "3.6.13", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"}, + {"r": "4.0.5", "py": "3.7.10", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"}, + {"r": "4.0.5", "py": "3.8.8", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"}, + {"r": "4.0.5", "py": "3.9.2", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"}, + {"r": "4.1.0", "py": "3.8.8", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"}, + {"r": "4.1.0", "py": "3.9.2", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"}, + {"r": "4.1.3", "py": "3.10.4", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"}, + {"r": "3.6.3", "py": "3.8.16", "drivers": "2023.12.1", "os": "ubuntu2204", "os_alt": "jammy"}, + {"r": "4.0.5", "py": "3.9.16", "drivers": "2023.12.1", "os": "ubuntu2204", "os_alt": "jammy"}, + {"r": "4.1.3", "py": "3.10.11", "drivers": "2023.12.1", "os": "ubuntu2204", "os_alt": "jammy"}, + {"r": "4.2.2", "py": "3.11.3", "drivers": "2023.12.1", "os": "ubuntu2204", "os_alt": "jammy"} ] diff --git a/content/pro/Dockerfile.ubuntu1804 b/content/pro/Dockerfile.ubuntu1804 index a14ac365..feb9d659 100644 --- a/content/pro/Dockerfile.ubuntu1804 +++ b/content/pro/Dockerfile.ubuntu1804 @@ -6,7 +6,7 @@ FROM ${REGISTRY}/rstudio/content-base:r${R_VERSION}-py${PYTHON_VERSION}-ubuntu18 LABEL maintainer="RStudio Docker " # Install RStudio Professional Drivers ----------------------------------------# -ARG DRIVERS_VERSION=2023.05.0 +ARG DRIVERS_VERSION=2023.12.1 ARG R_VERSION ARG DEBIAN_FRONTEND=noninteractive diff --git a/content/pro/Dockerfile.ubuntu2204 b/content/pro/Dockerfile.ubuntu2204 index ce61df89..afbf342b 100644 --- a/content/pro/Dockerfile.ubuntu2204 +++ b/content/pro/Dockerfile.ubuntu2204 @@ -6,7 +6,7 @@ FROM ${REGISTRY}/rstudio/content-base:r${R_VERSION}-py${PYTHON_VERSION}-ubuntu22 LABEL maintainer="RStudio Docker " # Install RStudio Professional Drivers ----------------------------------------# -ARG DRIVERS_VERSION=2023.05.0 +ARG DRIVERS_VERSION=2023.12.1 ARG R_VERSION ARG DEBIAN_FRONTEND=noninteractive diff --git a/content/pro/Justfile b/content/pro/Justfile index 710d6509..d43ae361 100755 --- a/content/pro/Justfile +++ b/content/pro/Justfile @@ -10,7 +10,7 @@ R_VERSION := "3.6.3" PYTHON_VERSION := "3.9.5" -DRIVERS_VERSION := "2023.05.0" +DRIVERS_VERSION := "2023.12.1" DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1" DEFAULT_TAG := IMAGE_PREFIX + PRODUCT + ":r" + R_VERSION + "-py" + PYTHON_VERSION + "-" + IMAGE_OS diff --git a/product/pro/Dockerfile.centos7 b/product/pro/Dockerfile.centos7 index 641a3fd4..f342b95c 100644 --- a/product/pro/Dockerfile.centos7 +++ b/product/pro/Dockerfile.centos7 @@ -11,7 +11,7 @@ ARG R_VERSION=4.2.0 ARG R_VERSION_ALT=3.6.2 ARG PYTHON_VERSION=3.9.14 ARG PYTHON_VERSION_ALT=3.8.15 -ARG DRIVERS_VERSION=2023.05.0-1 +ARG DRIVERS_VERSION=2023.12.1-1 RUN yum update -y \ && yum install -y unixODBC unixODBC-devel \ diff --git a/product/pro/Dockerfile.ubuntu2204 b/product/pro/Dockerfile.ubuntu2204 index 10f0981c..892d99e4 100644 --- a/product/pro/Dockerfile.ubuntu2204 +++ b/product/pro/Dockerfile.ubuntu2204 @@ -12,7 +12,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 DRIVERS_VERSION=2023.05.0 +ARG DRIVERS_VERSION=2023.12.1 RUN apt-get update \ && apt-get install -yq --no-install-recommends unixodbc unixodbc-dev \ diff --git a/product/pro/Justfile b/product/pro/Justfile index 354c6546..cbee4b36 100644 --- a/product/pro/Justfile +++ b/product/pro/Justfile @@ -16,7 +16,7 @@ PYTHON_VERSION_ALT := "3.8.17" TINI_VERSION := "0.19.0" QUARTO_VERSION := "1.3.340" -DRIVERS_VERSION := "2023.05.0" +DRIVERS_VERSION := "2023.12.1" DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1" _make-default-tag OS=IMAGE_OS: diff --git a/r-session-complete/.env b/r-session-complete/.env index 346abb8b..ac43338b 100644 --- a/r-session-complete/.env +++ b/r-session-complete/.env @@ -1,4 +1,4 @@ R_VERSION=4.1.0 PYTHON_VERSION=3.9.5 -DRIVERS_VERSION=2023.05.0-1 +DRIVERS_VERSION=2023.12.1-1 RSW_VERSION=2023.12.0+369.pro3 diff --git a/r-session-complete/Justfile b/r-session-complete/Justfile index f2214aea..85fdc082 100755 --- a/r-session-complete/Justfile +++ b/r-session-complete/Justfile @@ -9,7 +9,7 @@ IMAGE_OS := "ubuntu2204" RSW_VERSION := "2023.12.0+369.pro3" RSW_LICENSE := "" -DRIVERS_VERSION := "2023.05.0" +DRIVERS_VERSION := "2023.12.1" DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1" R_VERSION := "4.2.3" From c73641b730407faefbc4a94f97539739c9bfef7e Mon Sep 17 00:00:00 2001 From: Ian Pittwood Date: Thu, 1 Feb 2024 10:13:56 -0800 Subject: [PATCH 5/5] Remove R 3.6.3 from Workbench for AML --- workbench-for-microsoft-azure-ml/NEWS.md | 4 ++++ workbench-for-microsoft-azure-ml/deps/install-r.sh | 2 +- workbench-for-microsoft-azure-ml/deps/r_packages.txt | 1 - workbench-for-microsoft-azure-ml/test/goss.yaml | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/workbench-for-microsoft-azure-ml/NEWS.md b/workbench-for-microsoft-azure-ml/NEWS.md index fc0a7381..21e9c1a6 100644 --- a/workbench-for-microsoft-azure-ml/NEWS.md +++ b/workbench-for-microsoft-azure-ml/NEWS.md @@ -1,3 +1,7 @@ +# 2024.02.1 +- Remove R 3.6.3 from image +- Bump R versions to latest patches + # 2023.03.1 - No changes diff --git a/workbench-for-microsoft-azure-ml/deps/install-r.sh b/workbench-for-microsoft-azure-ml/deps/install-r.sh index 5765a06a..99620614 100755 --- a/workbench-for-microsoft-azure-ml/deps/install-r.sh +++ b/workbench-for-microsoft-azure-ml/deps/install-r.sh @@ -29,7 +29,7 @@ install_r_packages() { } -for rvers in 3.6.3 4.0.5 4.1.3 4.2.3 4.3.1; do +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 DEBIAN_FRONTEND=noninteractive apt-get install -y ./r-${rvers}_1_amd64.deb diff --git a/workbench-for-microsoft-azure-ml/deps/r_packages.txt b/workbench-for-microsoft-azure-ml/deps/r_packages.txt index 64fe3f36..e9ccebc5 100644 --- a/workbench-for-microsoft-azure-ml/deps/r_packages.txt +++ b/workbench-for-microsoft-azure-ml/deps/r_packages.txt @@ -46,7 +46,6 @@ readr readxl renv reticulate -rgdal rlang rmarkdown roxygen2 diff --git a/workbench-for-microsoft-azure-ml/test/goss.yaml b/workbench-for-microsoft-azure-ml/test/goss.yaml index fea15bcc..52f9b01b 100644 --- a/workbench-for-microsoft-azure-ml/test/goss.yaml +++ b/workbench-for-microsoft-azure-ml/test/goss.yaml @@ -131,7 +131,7 @@ command: # test all R versions and packages # "/opt/R/3.3.3/bin/R" "/opt/R/3.4.4/bin/R" - {{ $rvers := mkSlice "/opt/R/3.6.3/bin/R" "/opt/R/4.0.5/bin/R" "/opt/R/4.1.3/bin/R" "/opt/R/4.2.3/bin/R" "/opt/R/4.3.1/bin/R"}} + {{ $rvers := mkSlice "/opt/R/4.0.5/bin/R" "/opt/R/4.1.3/bin/R" "/opt/R/4.2.3/bin/R" "/opt/R/4.3.2/bin/R"}} {{ $pkgs := .Vars.packages}} # loops the library command for each R version to ensure expected libraries exist for all. # notably, it also ensures that each expected R version exists and is runnable