From b093afcc64740c5d1e0d2b587fcca064f1188056 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Thu, 25 Jan 2024 11:45:53 -0800 Subject: [PATCH] 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}