From 7259bcb2dc2f01b9783041c3c059284e82d199cc Mon Sep 17 00:00:00 2001 From: "Benjamin R. J. Schwedler" Date: Fri, 22 Mar 2024 08:51:19 -0500 Subject: [PATCH] Revert "Merge pull request #699 from rstudio/kg-quarto-update-1.4.550" This reverts commit 2fa5480f9f103ddfecd7db4d954f0447f99efb14, reversing changes made to e0fa3ab39e64e6e9b03febcbcb97e71a96210596. We do not want to update Quarto globally across all images due to the coordination required across the helm charts for the individual products. --- Justfile | 2 +- NEWS.md | 4 ---- ci.Justfile | 2 +- connect/NEWS.md | 4 ---- connect/rstudio-connect.gcfg | 2 +- content/base/Dockerfile.ubuntu2204 | 2 +- content/base/Justfile | 2 +- content/base/NEWS.md | 4 ---- content/base/maybe_install_quarto.sh | 4 ++-- product/base/Dockerfile.centos7 | 2 +- product/base/Dockerfile.ubuntu2204 | 2 +- product/base/Justfile | 2 +- product/pro/Justfile | 2 +- workbench-for-google-cloud-workstations/.env | 2 +- workbench-for-google-cloud-workstations/Dockerfile.ubuntu2004 | 2 +- 15 files changed, 13 insertions(+), 25 deletions(-) diff --git a/Justfile b/Justfile index 6f5d25fd..59152788 100644 --- a/Justfile +++ b/Justfile @@ -21,7 +21,7 @@ PYTHON_VERSION_ALT := "3.8.17" PYTHON_VERSION_RHEL := "3.9.14" PYTHON_VERSION_ALT_RHEL := "3.8.15" -QUARTO_VERSION := "1.4.550" +QUARTO_VERSION := "1.3.450" # just _get-tag-safe-version 2022.07.2+576.pro12 _get-tag-safe-version $VERSION: diff --git a/NEWS.md b/NEWS.md index e347fc9c..2a981260 100644 --- a/NEWS.md +++ b/NEWS.md @@ -9,10 +9,6 @@ This file only captures pervasive, repository-wide changes. - Update Professional Drivers to 2024.03.0 -# 2024-03-01 - -- BREAKING: Update Quarto version to 1.4.550 - # 2024-02-01 - Update Pro Drivers to 2023.12.1 diff --git a/ci.Justfile b/ci.Justfile index 79bf3dcc..39261319 100644 --- a/ci.Justfile +++ b/ci.Justfile @@ -12,7 +12,7 @@ PYTHON_VERSION_ALT := "3.8.17" DRIVERS_VERSION := "2024.03.0" DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1" -QUARTO_VERSION := "1.4.550" +QUARTO_VERSION := "1.3.340" # just _get-os-alias jammy _get-os-alias OS: diff --git a/connect/NEWS.md b/connect/NEWS.md index bdef561d..812a78cd 100644 --- a/connect/NEWS.md +++ b/connect/NEWS.md @@ -1,7 +1,3 @@ -# 2024-03-01 - -- BREAKING: Update Quarto version to 1.4.550 - # 2023-08-01 - BREAKING: Removed R 3.6.2, replaced with R 4.1.3. - Updated R 4.2.0 to 4.2.3. diff --git a/connect/rstudio-connect.gcfg b/connect/rstudio-connect.gcfg index d06c6ce8..376d08c2 100644 --- a/connect/rstudio-connect.gcfg +++ b/connect/rstudio-connect.gcfg @@ -35,7 +35,7 @@ Executable = /opt/python/{{PYTHON_VERSION_ALT}}/bin/python [Quarto] Enabled = true -Executable = /opt/quarto/1.4.550/bin/quarto +Executable = /opt/quarto/1.3.340/bin/quarto [RPackageRepository "CRAN"] URL = https://packagemanager.rstudio.com/cran/__linux__/jammy/latest diff --git a/content/base/Dockerfile.ubuntu2204 b/content/base/Dockerfile.ubuntu2204 index 9fd5571e..030eab0b 100644 --- a/content/base/Dockerfile.ubuntu2204 +++ b/content/base/Dockerfile.ubuntu2204 @@ -117,7 +117,7 @@ RUN curl -O https://cdn.rstudio.com/python/${DISTRIBUTION}/pkgs/python-${PYTHON_ && /opt/python/${PYTHON_VERSION}/bin/python3 -m pip install --upgrade setuptools # install quarto -ARG QUARTO_VERSION=1.4.550 +ARG QUARTO_VERSION=1.3.340 COPY maybe_install_quarto.sh /tmp/maybe_install_quarto.sh RUN /opt/R/${R_VERSION}/bin/R -e 'install.packages("odbc", repos="https://packagemanager.rstudio.com/cran/__linux__/bionic/latest")' \ && /tmp/maybe_install_quarto.sh \ diff --git a/content/base/Justfile b/content/base/Justfile index a76eb9b5..a1defbf8 100755 --- a/content/base/Justfile +++ b/content/base/Justfile @@ -10,7 +10,7 @@ R_VERSION := "3.6.3" PYTHON_VERSION := "3.9.5" -QUARTO_VERSION := "1.4.550" +QUARTO_VERSION := "1.3.340" DEFAULT_TAG := IMAGE_PREFIX + PRODUCT + ":r" + R_VERSION + "-py" + PYTHON_VERSION + "-" + IMAGE_OS diff --git a/content/base/NEWS.md b/content/base/NEWS.md index f80f7d52..47839d89 100644 --- a/content/base/NEWS.md +++ b/content/base/NEWS.md @@ -1,7 +1,3 @@ -# 2024-03-01 - -- BREAKING: Update Quarto version to 1.4.550 - # 2023-04-26 - Use the Quarto release 1.3.340 in jammy images. diff --git a/content/base/maybe_install_quarto.sh b/content/base/maybe_install_quarto.sh index 5cebc8e1..cb06e6c8 100755 --- a/content/base/maybe_install_quarto.sh +++ b/content/base/maybe_install_quarto.sh @@ -3,7 +3,7 @@ # on bionic, only install quarto if python 3.10 and R 4.1 # TODO: figure out a different hierarchy... if [[ `grep -oE bionic /etc/lsb-release` ]] && [[ `ls /opt/python/ | grep '3\.10\.'` ]] && [[ `ls /opt/R | grep '4\.1\.'` ]]; then - qver=${QUARTO_VERSION:-1.4.550} + 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 apt install /quarto.deb @@ -12,7 +12,7 @@ fi # on jammy, always install quarto if [[ `grep -oE jammy /etc/lsb-release` ]]; then - qver=${QUARTO_VERSION:-1.4.550} + 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" mkdir -p /opt/quarto/${qver} diff --git a/product/base/Dockerfile.centos7 b/product/base/Dockerfile.centos7 index 2070ba2e..27341082 100644 --- a/product/base/Dockerfile.centos7 +++ b/product/base/Dockerfile.centos7 @@ -7,7 +7,7 @@ ARG R_VERSION_ALT=3.6.2 ARG PYTHON_VERSION=3.9.14 ARG PYTHON_VERSION_ALT=3.8.15 ARG TINI_VERSION=0.19.0 -ARG QUARTO_VERSION=1.4.550 +ARG QUARTO_VERSION=1.3.340 ### Update/upgrade system packages ### RUN yum upgrade -y -q \ diff --git a/product/base/Dockerfile.ubuntu2204 b/product/base/Dockerfile.ubuntu2204 index c191eed7..f326b3e3 100644 --- a/product/base/Dockerfile.ubuntu2204 +++ b/product/base/Dockerfile.ubuntu2204 @@ -8,7 +8,7 @@ ARG R_VERSION_ALT=4.1.3 ARG PYTHON_VERSION=3.9.17 ARG PYTHON_VERSION_ALT=3.8.17 ARG TINI_VERSION=0.19.0 -ARG QUARTO_VERSION=1.4.550 +ARG QUARTO_VERSION=1.3.340 ### Update/upgrade system packages ### RUN apt-get update --fix-missing \ diff --git a/product/base/Justfile b/product/base/Justfile index 54f0ef56..00c60378 100755 --- a/product/base/Justfile +++ b/product/base/Justfile @@ -14,7 +14,7 @@ PYTHON_VERSION := "3.9.17" PYTHON_VERSION_ALT := "3.8.17" TINI_VERSION := "0.19.0" -QUARTO_VERSION := "1.4.550" +QUARTO_VERSION := "1.3.340" _make-default-tag OS=IMAGE_OS: echo "{{IMAGE_REGISTRY}}/{{PRODUCT}}:{{OS}}-r{{R_VERSION}}_{{R_VERSION_ALT}}-py{{PYTHON_VERSION}}_{{PYTHON_VERSION_ALT}}" diff --git a/product/pro/Justfile b/product/pro/Justfile index a0b4aba8..d07474f0 100644 --- a/product/pro/Justfile +++ b/product/pro/Justfile @@ -14,7 +14,7 @@ PYTHON_VERSION := "3.9.17" PYTHON_VERSION_ALT := "3.8.17" TINI_VERSION := "0.19.0" -QUARTO_VERSION := "1.4.550" +QUARTO_VERSION := "1.3.340" DRIVERS_VERSION := "2024.03.0" DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1" diff --git a/workbench-for-google-cloud-workstations/.env b/workbench-for-google-cloud-workstations/.env index 45b72c01..f87a5c6b 100644 --- a/workbench-for-google-cloud-workstations/.env +++ b/workbench-for-google-cloud-workstations/.env @@ -8,5 +8,5 @@ PYTHON_VERSION_JUPYTER=3.10.13 R_VERSION=4.2.3 R_VERSION_ALT=4.1.3 DRIVERS_VERSION=2023.05.0 -QUARTO_VERSION=1.4.550 +QUARTO_VERSION=1.3.340 IMAGE_REGISTRY_NAME=us-central1-docker.pkg.dev/posit-images/cloud-workstations/workbench diff --git a/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2004 b/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2004 index 7ceab95f..b612a6a9 100644 --- a/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2004 +++ b/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2004 @@ -8,7 +8,7 @@ ARG PYTHON_VERSION=3.11.7 ARG PYTHON_VERSION_ALT=3.10.13 ARG PYTHON_VERSION_JUPYTER=3.10.13 ARG JUPYTERLAB_VERSION=3.6.5 -ARG QUARTO_VERSION=1.4.550 +ARG QUARTO_VERSION=1.3.450 ARG DRIVERS_VERSION=2023.05.0 ARG RSW_VERSION=2023.12.1+402.pro1 ARG RSW_NAME=rstudio-workbench