Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Workbench for GCW to 2023.12.0 #686

Closed
wants to merge 2 commits into from
Closed

Upgrade Workbench for GCW to 2023.12.0 #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b638ff8
Upgrade WGCW to 2023.12.0
ianpittwood Jan 10, 2024
2fead09
Fix missed Quarto update
ianpittwood Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci.Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion connect/rstudio-connect.gcfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion content/base/Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions content/base/maybe_install_quarto.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion product/base/Dockerfile.centos7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion product/base/Dockerfile.ubuntu2204
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion product/base/Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}"
Expand Down
10 changes: 5 additions & 5 deletions workbench-for-google-cloud-workstations/Dockerfile.ubuntu2004
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading