diff --git a/Justfile b/Justfile index 6794c383..341c831a 100644 --- a/Justfile +++ b/Justfile @@ -22,7 +22,7 @@ PYTHON_VERSION_ALT := "3.8.17" PYTHON_VERSION_RHEL := "3.9.14" PYTHON_VERSION_ALT_RHEL := "3.8.15" -QUARTO_VERSION := "1.4.553" +QUARTO_VERSION := "1.4.557" export RSC_LICENSE := "" export RSPM_LICENSE := "" diff --git a/ci.Justfile b/ci.Justfile index 06324e8e..1de52f56 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.3.340" +QUARTO_VERSION := "1.4.557" # just _get-os-alias jammy _get-os-alias OS: diff --git a/connect/Dockerfile.ubuntu2204 b/connect/Dockerfile.ubuntu2204 index c314744c..593fe1d3 100644 --- a/connect/Dockerfile.ubuntu2204 +++ b/connect/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 RSC_VERSION=2024.06.0 -ARG QUARTO_VERSION=1.4.552 +ARG QUARTO_VERSION=1.4.557 ARG SCRIPTS_DIR=/opt/positscripts ### Install Quarto ### diff --git a/docker-bake.hcl b/docker-bake.hcl index b04d075c..8cc7fc33 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -16,7 +16,7 @@ variable DRIVERS_VERSION { } variable DEFAULT_QUARTO_VERSION { - default = "1.4.552" + default = "1.4.557" } variable DEFAULT_JUPYTERLAB_VERSION { @@ -158,6 +158,9 @@ variable CONTENT_BUILD_MATRIX { # R-4.4, Python-3.12, Quarto-1.4. {os = "ubuntu2204", os_alt = "jammy", r = "4.4.0", py = "3.12.3", drivers = "2024.03.0", quarto = "1.4.553"}, + + # R-4.4, Python-3.12.4, Quarto-1.4.557 (polyfill.js vulnerability patch) + {os = "ubuntu2204", os_alt = "jammy", r = "4.4.1", py = "3.12.4", drivers = "2024.03.0", quarto = "1.4.557"}, ] } } diff --git a/docker-bake.preview.hcl b/docker-bake.preview.hcl index 40286806..400b13f7 100644 --- a/docker-bake.preview.hcl +++ b/docker-bake.preview.hcl @@ -28,7 +28,7 @@ variable DRIVERS_VERSION { } variable DEFAULT_QUARTO_VERSION { - default = "1.4.552" + default = "1.4.557" } variable DEFAULT_JUPYTERLAB_VERSION { @@ -114,7 +114,7 @@ function get_tags { variable BASE_BUILD_MATRIX { default = { builds = [ - {os = "ubuntu2204", r_primary = "4.4.0", r_alternate = "4.3.3", py_primary = "3.11.9", py_alternate = "3.10.14"}, + {os = "ubuntu2204", r_primary = "4.4.0", r_alternate = "4.3.3", py_primary = "3.12.4", py_alternate = "3.11.9"}, ] } } @@ -126,7 +126,7 @@ variable PRO_BUILD_MATRIX { variable PACKAGE_MANAGER_BUILD_MATRIX { default = { builds = [ - {os = "ubuntu2204", r_primary = "4.4.0", r_alternate = "4.3.3", py_primary = "3.11.9", py_alternate = "3.10.14"}, + {os = "ubuntu2204", r_primary = "4.4.0", r_alternate = "4.3.3", py_primary = "3.12.4", py_alternate = "3.11.9"}, ] } } @@ -134,7 +134,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.11.9", py_alternate = "3.10.14", quarto = DEFAULT_QUARTO_VERSION}, + {os = "ubuntu2204", r_primary = "4.4.0", r_alternate = "4.3.3", py_primary = "3.12.4", py_alternate = "3.11.9", quarto = DEFAULT_QUARTO_VERSION}, ] } } @@ -150,7 +150,7 @@ variable CONNECT_CONTENT_INIT_BUILD_MATRIX { variable R_SESSION_COMPLETE_BUILD_MATRIX { default = { builds = [ - {os = "ubuntu2204", r_primary = "4.4.0", r_alternate = "4.3.3", py_primary = "3.11.9", py_alternate = "3.10.14"}, + {os = "ubuntu2204", r_primary = "4.4.0", r_alternate = "4.3.3", py_primary = "3.12.4", py_alternate = "3.11.9"}, ] } } @@ -158,7 +158,7 @@ variable R_SESSION_COMPLETE_BUILD_MATRIX { variable WORKBENCH_BUILD_MATRIX { default = { builds = [ - {os = "ubuntu2204", r_primary = "4.4.0", r_alternate = "4.3.3", py_primary = "3.11.9", py_alternate = "3.10.14"}, + {os = "ubuntu2204", r_primary = "4.4.0", r_alternate = "4.3.3", py_primary = "3.12.4", py_alternate = "3.11.9"}, ] } } @@ -227,7 +227,7 @@ target "product-base-dev" { PYTHON_VERSION = builds.py_primary PYTHON_VERSION_ALT = builds.py_alternate TINI_VERSION = "0.19.0" - QUARTO_VERSION = "1.3.340" + QUARTO_VERSION = "1.4.557" } }