From b638ff82f076d9c7d31610a57955c335d03dd38e Mon Sep 17 00:00:00 2001 From: Ian Pittwood Date: Wed, 10 Jan 2024 10:15:12 -0800 Subject: [PATCH 1/2] Upgrade WGCW to 2023.12.0 --- .../Dockerfile.ubuntu2004 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2004 b/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2004 index 144e3578..cb5e38c2 100644 --- a/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2004 +++ b/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2004 @@ -4,13 +4,13 @@ FROM us-central1-docker.pkg.dev/cloud-workstations-images/predefined/base:public ARG DEBIAN_FRONTEND=noninteractive ARG R_VERSION=4.2.3 ARG R_VERSION_ALT=4.1.3 -ARG PYTHON_VERSION=3.10.12 -ARG PYTHON_VERSION_ALT=3.9.17 -ARG PYTHON_VERSION_JUPYTER=3.10.12 +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.3.340 +ARG QUARTO_VERSION=1.3.450 ARG DRIVERS_VERSION=2023.05.0 -ARG RSW_VERSION=2023.09.1+494.pro2 +ARG RSW_VERSION=2023.12.0+369.pro3 ARG RSW_NAME=rstudio-workbench ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/focal/amd64 From 2fead09535090a2d044da6119254227f28630c4a Mon Sep 17 00:00:00 2001 From: Ian Pittwood Date: Wed, 10 Jan 2024 10:15:30 -0800 Subject: [PATCH 2/2] Fix missed Quarto update --- ci.Justfile | 2 +- connect/rstudio-connect.gcfg | 2 +- content/base/Justfile | 2 +- content/base/maybe_install_quarto.sh | 4 ++-- product/base/Dockerfile.centos7 | 2 +- product/base/Dockerfile.ubuntu2204 | 2 +- product/base/Justfile | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ci.Justfile b/ci.Justfile index ebcbdd3b..f59ed16e 100644 --- a/ci.Justfile +++ b/ci.Justfile @@ -12,7 +12,7 @@ PYTHON_VERSION_ALT := "3.8.17" DRIVERS_VERSION := "2023.05.0" DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1" -QUARTO_VERSION := "1.3.340" +QUARTO_VERSION := "1.3.450" # just _get-os-alias jammy _get-os-alias OS: diff --git a/connect/rstudio-connect.gcfg b/connect/rstudio-connect.gcfg index 376d08c2..f729390e 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.3.340/bin/quarto +Executable = /opt/quarto/1.3.450/bin/quarto [RPackageRepository "CRAN"] URL = https://packagemanager.rstudio.com/cran/__linux__/jammy/latest diff --git a/content/base/Justfile b/content/base/Justfile index a1defbf8..e67bef34 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.3.340" +QUARTO_VERSION := "1.3.450" DEFAULT_TAG := IMAGE_PREFIX + PRODUCT + ":r" + R_VERSION + "-py" + PYTHON_VERSION + "-" + IMAGE_OS diff --git a/content/base/maybe_install_quarto.sh b/content/base/maybe_install_quarto.sh index cb06e6c8..becb2680 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.3.340} + qver=${QUARTO_VERSION:-1.3.450} 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.3.340} + qver=${QUARTO_VERSION:-1.3.450} 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 27341082..a037735e 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.3.340 +ARG QUARTO_VERSION=1.3.450 ### Update/upgrade system packages ### RUN yum upgrade -y -q \ diff --git a/product/base/Dockerfile.ubuntu2204 b/product/base/Dockerfile.ubuntu2204 index f326b3e3..55f17c6b 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.3.340 +ARG QUARTO_VERSION=1.3.450 ### Update/upgrade system packages ### RUN apt-get update --fix-missing \ diff --git a/product/base/Justfile b/product/base/Justfile index 00c60378..891a6af2 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.3.340" +QUARTO_VERSION := "1.3.450" _make-default-tag OS=IMAGE_OS: echo "{{IMAGE_REGISTRY}}/{{PRODUCT}}:{{OS}}-r{{R_VERSION}}_{{R_VERSION_ALT}}-py{{PYTHON_VERSION}}_{{PYTHON_VERSION_ALT}}"