diff --git a/Justfile b/Justfile index 8838d56d..f72f1f99 100644 --- a/Justfile +++ b/Justfile @@ -6,7 +6,7 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" } BUILDX_PATH := "" -RSC_VERSION := "2023.01.0" +RSC_VERSION := "2023.01.1" RSPM_VERSION := "2022.11.4-20" RSW_VERSION := "2022.12.0+353.pro20" diff --git a/connect-content-init/Dockerfile.ubuntu1804 b/connect-content-init/Dockerfile.ubuntu1804 index cfe46c25..6b166309 100644 --- a/connect-content-init/Dockerfile.ubuntu1804 +++ b/connect-content-init/Dockerfile.ubuntu1804 @@ -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.01.0 +ARG RSC_VERSION=2023.01.1 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/Dockerfile.ubuntu2204 b/connect-content-init/Dockerfile.ubuntu2204 index 35ee4e41..42bcaee0 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.01.0 +ARG RSC_VERSION=2023.01.1 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 231265de..b2439698 100644 --- a/connect-content-init/Justfile +++ b/connect-content-init/Justfile @@ -6,7 +6,7 @@ IMAGE_PREFIX := "rstudio-" PRODUCT := "connect-content-init" IMAGE_OS := "ubuntu1804" -RSC_VERSION := "2023.01.0" +RSC_VERSION := "2023.01.1" RSC_TAG_SAFE_VERSION := replace(RSC_VERSION, "+", "-") RSC_LICENSE := "" diff --git a/connect-content-init/README.md b/connect-content-init/README.md index c1d80529..7a70c186 100644 --- a/connect-content-init/README.md +++ b/connect-content-init/README.md @@ -9,8 +9,8 @@ # Supported tags and respective Dockerfile links -* [`2023.01.0`, `bionic`, `ubuntu1804`, `bionic-2023.01.0`, `ubuntu1804-2023.01.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.bionic) -* [`jammy`, `ubuntu2204`, `jammy-2023.01.0`, `ubuntu2204-2023.01.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.jammy) +* [`2023.01.1`, `bionic`, `ubuntu1804`, `bionic-2023.01.1`, `ubuntu1804-2023.01.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.bionic) +* [`jammy`, `ubuntu2204`, `jammy-2023.01.1`, `ubuntu2204-2023.01.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.jammy) # RStudio Connect Content Init Container @@ -32,7 +32,7 @@ The version of the release package to use can be overridden with the `RSC_VERSION` build arg. ```console -just build ubuntu1804 2023.01.0 +just build ubuntu1804 2023.01.1 ``` ## Testing @@ -57,7 +57,7 @@ just test You can see the different layers that make up the image: ```console -docker history rstudio/rstudio-connect-content-init-preview:2023.01.0-dev-326 +docker history rstudio/rstudio-connect-content-init-preview:2023.01.1-dev-326 ``` NOTE: almost all the image size is pandoc. diff --git a/connect/.env b/connect/.env index d3a26efa..c75d28a1 100644 --- a/connect/.env +++ b/connect/.env @@ -1,4 +1,4 @@ -RSC_VERSION=2023.01.0 +RSC_VERSION=2023.01.1 R_VERSION=3.6.2 R_VERSION_ALT=4.1.0 PYTHON_VERSION=3.9.5 diff --git a/connect/Dockerfile.ubuntu1804 b/connect/Dockerfile.ubuntu1804 index bd5583ac..a1cfe86b 100644 --- a/connect/Dockerfile.ubuntu1804 +++ b/connect/Dockerfile.ubuntu1804 @@ -101,7 +101,7 @@ RUN curl -L -o /usr/local/bin/tini https://github.com/krallin/tini/releases/down COPY --chmod=0775 startup.sh /usr/local/bin/startup.sh # Download RStudio Connect -----------------------------------------------------# -ARG RSC_VERSION=2023.01.0 +ARG RSC_VERSION=2023.01.1 SHELL [ "/bin/bash", "-o", "pipefail", "-c"] RUN apt-get update --fix-missing \ && RSC_VERSION_URL=$(echo -n "${RSC_VERSION}" | sed 's/+/%2B/g') \ diff --git a/connect/Dockerfile.ubuntu2204 b/connect/Dockerfile.ubuntu2204 index 506d52e9..04cb3661 100644 --- a/connect/Dockerfile.ubuntu2204 +++ b/connect/Dockerfile.ubuntu2204 @@ -98,7 +98,7 @@ RUN curl -L -o /usr/local/bin/tini https://github.com/krallin/tini/releases/down COPY --chmod=0775 startup.sh /usr/local/bin/startup.sh # Download RStudio Connect -----------------------------------------------------# -ARG RSC_VERSION=2023.01.0 +ARG RSC_VERSION=2023.01.1 SHELL [ "/bin/bash", "-o", "pipefail", "-c"] RUN apt-get update --fix-missing \ && RSC_VERSION_URL=$(echo -n "${RSC_VERSION}" | sed 's/+/%2B/g') \ diff --git a/connect/Justfile b/connect/Justfile index 4d3db7b8..423431df 100644 --- a/connect/Justfile +++ b/connect/Justfile @@ -6,7 +6,7 @@ IMAGE_PREFIX := "rstudio-" PRODUCT := "connect" IMAGE_OS := "ubuntu1804" -RSC_VERSION := "2023.01.0" +RSC_VERSION := "2023.01.1" RSC_LICENSE := "" RSC_LICENSE_SERVER := "" diff --git a/connect/README.md b/connect/README.md index 689e2e46..3dc59106 100644 --- a/connect/README.md +++ b/connect/README.md @@ -7,8 +7,8 @@ # Supported tags and respective Dockerfile links -* [`2023.01.0`, `bionic`, `ubuntu1804`, `bionic-2023.01.0`, `ubuntu1804-2023.01.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.bionic) -* [`jammy`, `ubuntu2204`, `jammy-2023.01.0`, `ubuntu2204-2023.01.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.jammy) +* [`2023.01.1`, `bionic`, `ubuntu1804`, `bionic-2023.01.1`, `ubuntu1804-2023.01.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.bionic) +* [`jammy`, `ubuntu2204`, `jammy-2023.01.1`, `ubuntu2204-2023.01.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.jammy) # What is RStudio Connect? diff --git a/docker-compose.yml b/docker-compose.yml index c55ee860..f6a31431 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.01.0 - image: rstudio/rstudio-connect:2023.01.0 + RSC_VERSION: 2023.01.1 + image: rstudio/rstudio-connect:2023.01.1 privileged: true environment: RSC_LICENSE: ${RSC_LICENSE}