From d28cb0a995f4dd441be1a59ca1844c60c98379af Mon Sep 17 00:00:00 2001 From: Jacob Woliver Date: Mon, 9 Dec 2024 18:48:30 -0500 Subject: [PATCH 1/3] Bump PPM version to 2024.11.0-7 --- Justfile | 2 +- docker-bake.hcl | 2 +- package-manager/.env | 2 +- package-manager/Dockerfile.ubuntu2204 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Justfile b/Justfile index 56ed3e3a..cebb9cc7 100644 --- a/Justfile +++ b/Justfile @@ -8,7 +8,7 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" } BUILDX_PATH := "" RSC_VERSION := "2024.09.0" -RSPM_VERSION := "2024.08.2-9" +RSPM_VERSION := "2024.11.0-7" RSW_VERSION := "2024.09.1+394.pro7" DRIVERS_VERSION := "2023.05.0" diff --git a/docker-bake.hcl b/docker-bake.hcl index c0e7eae4..5cc53ea9 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -4,7 +4,7 @@ variable CONNECT_VERSION { } variable PACKAGE_MANAGER_VERSION { - default = "2024.08.2-9" + default = "2024.11.0-7" } variable WORKBENCH_VERSION { diff --git a/package-manager/.env b/package-manager/.env index 11b0a634..de744b5f 100644 --- a/package-manager/.env +++ b/package-manager/.env @@ -1,4 +1,4 @@ -RSPM_VERSION=2024.08.2-9 +RSPM_VERSION=2024.11.0-7 R_VERSION=4.4.0 R_VERSION_ALT=4.1.3 PYTHON_VERSION=3.9.17 diff --git a/package-manager/Dockerfile.ubuntu2204 b/package-manager/Dockerfile.ubuntu2204 index bc8a3730..d7570ae3 100644 --- a/package-manager/Dockerfile.ubuntu2204 +++ b/package-manager/Dockerfile.ubuntu2204 @@ -18,7 +18,7 @@ RUN apt-get update -qq && apt-get install -y --no-install-recommends \ apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/* # Download RStudio Package Manager ---------------------------------------------# -ARG RSPM_VERSION=2024.08.2-9 +ARG RSPM_VERSION=2024.11.0-7 ARG RSPM_DOWNLOAD_URL=https://cdn.rstudio.com/package-manager/deb/amd64 RUN curl -fsSL -O ${RSPM_DOWNLOAD_URL}/rstudio-pm_${RSPM_VERSION}_amd64.deb \ # Pre 7/25/23 packages From 7cec9975d2a490a219f4f5dd331f80777a37920c Mon Sep 17 00:00:00 2001 From: Skye Turriff Date: Mon, 16 Dec 2024 10:14:32 -0700 Subject: [PATCH 2/3] Reenable workbench-session-init release target and remove WORKBENCH_SESSION_INIT_VERSION usage --- .github/workflows/build-bake.yaml | 22 ---------------------- Justfile | 10 ---------- docker-bake.hcl | 10 +++------- 3 files changed, 3 insertions(+), 39 deletions(-) diff --git a/.github/workflows/build-bake.yaml b/.github/workflows/build-bake.yaml index 3159e343..b80de200 100644 --- a/.github/workflows/build-bake.yaml +++ b/.github/workflows/build-bake.yaml @@ -333,7 +333,6 @@ jobs: snyk-token: '${{ secrets.SNYK_TOKEN }}' workbench-session-init: - if: false # TODO: Re-enable this job after next release needs: [setup] name: Workbench Session Init runs-on: ubuntu-latest-8x @@ -363,28 +362,7 @@ jobs: with: buildkitd-config: ./share/buildkitd.toml - - name: Set up Just - uses: extractions/setup-just@v2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - uses: actions/setup-python@v5 - with: - python-version: '3.12' - - - name: Install Python dependencies - run: | - pip install requests - - - name: Get Version - id: get-version - run: | - WORKBENCH_SESSION_INIT_VERSION=$(just -f ci.Justfile get-version workbench --type=daily --local) - echo "WORKBENCH_SESSION_INIT_VERSION=$WORKBENCH_SESSION_INIT_VERSION" >> $GITHUB_OUTPUT - - name: Build, Test, and Push - env: - WORKBENCH_SESSION_INIT_VERSION: ${{ steps.get-version.outputs.WORKBENCH_SESSION_INIT_VERSION }} uses: ./.github/actions/bake-test-push with: target: ${{ env.target }} diff --git a/Justfile b/Justfile index cebb9cc7..dd19bc9c 100644 --- a/Justfile +++ b/Justfile @@ -49,13 +49,8 @@ delete-builder: alias build := bake # just bake workbench-images bake target="default": - #!/bin/bash just -f {{justfile()}} create-builder || true - if [ -z "$WORKBENCH_SESSION_INIT_VERSION" ]; then - WORKBENCH_SESSION_INIT_VERSION=$(just -f ci.Justfile get-version workbench --type=daily --local) - fi GIT_SHA=$(git rev-parse --short HEAD) \ - WORKBENCH_SESSION_INIT_VERSION=${WORKBENCH_SESSION_INIT_VERSION} \ docker buildx bake --builder=posit-builder -f docker-bake.hcl {{target}} # just preview-bake workbench-images dev @@ -93,12 +88,7 @@ preview-plan branch="$(git branch --show-current)": # just test workbench test target="default" file="docker-bake.hcl": - #!/bin/bash - if [ -z "$WORKBENCH_SESSION_INIT_VERSION" ]; then - WORKBENCH_SESSION_INIT_VERSION=$(just -f ci.Justfile get-version workbench --type=daily --local) - fi GIT_SHA=$(git rev-parse --short HEAD) \ - WORKBENCH_SESSION_INIT_VERSION=${WORKBENCH_SESSION_INIT_VERSION} \ python3 {{justfile_directory()}}/tools/test_bake_artifacts.py --target "{{target}}" --file "{{file}}" # just preview-test connect dev diff --git a/docker-bake.hcl b/docker-bake.hcl index 5cc53ea9..55fc0ecf 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -11,10 +11,6 @@ variable WORKBENCH_VERSION { default = "2024.09.1+394.pro7" } -variable WORKBENCH_SESSION_INIT_VERSION { - default = "" -} - variable DRIVERS_VERSION { default = "2024.03.0" } @@ -500,8 +496,8 @@ target "workbench-session-init" { inherits = ["base"] target = "build" - name = "workbench-session-init-${builds.os}-${replace(tag_safe_version(WORKBENCH_SESSION_INIT_VERSION), ".", "-")}" - tags = get_tags(builds.os, "workbench-session-init", WORKBENCH_SESSION_INIT_VERSION) + name = "workbench-session-init-${builds.os}-${replace(tag_safe_version(WORKBENCH_VERSION), ".", "-")}" + tags = get_tags(builds.os, "workbench-session-init", WORKBENCH_VERSION) dockerfile = "Dockerfile.${builds.os}" context = "workbench-session-init" @@ -509,7 +505,7 @@ target "workbench-session-init" { matrix = WORKBENCH_SESSION_INIT_BUILD_MATRIX args = { - RSW_VERSION = WORKBENCH_SESSION_INIT_VERSION + RSW_VERSION = WORKBENCH_VERSION } } From dd6d4cf38f10cfa8ed3fe0956561f33418612ea1 Mon Sep 17 00:00:00 2001 From: Melissa Barca <5323711+melissa-barca@users.noreply.github.com> Date: Mon, 16 Dec 2024 17:05:22 -0500 Subject: [PATCH 3/3] bump workbench to 2024.12.0 --- Justfile | 2 +- docker-bake.hcl | 2 +- r-session-complete/.env | 2 +- r-session-complete/Dockerfile.ubuntu2204 | 2 +- r-session-complete/README.md | 2 +- workbench-for-google-cloud-workstations/.env | 4 ++-- workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204 | 2 +- workbench-for-microsoft-azure-ml/.env | 2 +- workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 | 4 ++-- workbench-session-init/Dockerfile.ubuntu2204 | 2 +- workbench/.env | 2 +- workbench/Dockerfile.ubuntu2204 | 2 +- workbench/README.md | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Justfile b/Justfile index cebb9cc7..232323e7 100644 --- a/Justfile +++ b/Justfile @@ -9,7 +9,7 @@ BUILDX_PATH := "" RSC_VERSION := "2024.09.0" RSPM_VERSION := "2024.11.0-7" -RSW_VERSION := "2024.09.1+394.pro7" +RSW_VERSION := "2024.12.0+467.pro1" DRIVERS_VERSION := "2023.05.0" DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1" diff --git a/docker-bake.hcl b/docker-bake.hcl index 5cc53ea9..2cf9aac1 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -8,7 +8,7 @@ variable PACKAGE_MANAGER_VERSION { } variable WORKBENCH_VERSION { - default = "2024.09.1+394.pro7" + default = "2024.12.0+467.pro1" } variable WORKBENCH_SESSION_INIT_VERSION { diff --git a/r-session-complete/.env b/r-session-complete/.env index 5138f057..b02bba02 100644 --- a/r-session-complete/.env +++ b/r-session-complete/.env @@ -1,4 +1,4 @@ R_VERSION=4.1.0 PYTHON_VERSION=3.9.5 -RSW_VERSION=2024.09.1+394.pro7 +RSW_VERSION=2024.12.0+467.pro1 DRIVERS_VERSION=2024.03.0-1 diff --git a/r-session-complete/Dockerfile.ubuntu2204 b/r-session-complete/Dockerfile.ubuntu2204 index 95b04386..84cb8891 100644 --- a/r-session-complete/Dockerfile.ubuntu2204 +++ b/r-session-complete/Dockerfile.ubuntu2204 @@ -6,7 +6,7 @@ ARG R_VERSION_ALT=4.3.3 ARG PYTHON_VERSION=3.9.17 ARG PYTHON_VERSION_ALT=3.8.17 ARG JUPYTERLAB_VERSION=3.6.5 -ARG RSW_VERSION=2024.09.1+394.pro7 +ARG RSW_VERSION=2024.12.0+467.pro1 ARG RSW_NAME=rstudio-workbench ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64 ARG SCRIPTS_DIR=/opt/positscripts diff --git a/r-session-complete/README.md b/r-session-complete/README.md index 243c17d1..623d226f 100644 --- a/r-session-complete/README.md +++ b/r-session-complete/README.md @@ -7,7 +7,7 @@ # Supported tags and respective Dockerfile links -* [`jammy`, `ubuntu2204`, `jammy-2024.09.1`, `ubuntu2204-2024.09.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204) +* [`jammy`, `ubuntu2204`, `jammy-2024.12.0`, `ubuntu2204-2024.12.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204) # What are the r-session-complete images? diff --git a/workbench-for-google-cloud-workstations/.env b/workbench-for-google-cloud-workstations/.env index d4ade501..99af5976 100644 --- a/workbench-for-google-cloud-workstations/.env +++ b/workbench-for-google-cloud-workstations/.env @@ -1,5 +1,5 @@ -RSW_VERSION=2024.09.1+394.pro7 -RSW_TAG_VERSION=2024.09.1-394.pro7 +RSW_VERSION=2024.12.0+467.pro1 +RSW_TAG_VERSION=2024.12.0-467.pro1 RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64 RSW_NAME=rstudio-workbench PYTHON_VERSION=3.11.9 diff --git a/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204 b/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204 index aaa7513f..1b06f71b 100644 --- a/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204 +++ b/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204 @@ -10,7 +10,7 @@ ARG PYTHON_VERSION_ALT=3.10.14 ARG PYTHON_VERSION_JUPYTER=3.10.14 ARG JUPYTERLAB_VERSION=3.6.7 ARG DRIVERS_VERSION=2023.05.0 -ARG RSW_VERSION=2024.09.1+394.pro7 +ARG RSW_VERSION=2024.12.0+467.pro1 ARG RSW_NAME=rstudio-workbench ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64 ARG SCRIPTS_DIR=/opt/positscripts diff --git a/workbench-for-microsoft-azure-ml/.env b/workbench-for-microsoft-azure-ml/.env index b7c6d840..e33f466e 100644 --- a/workbench-for-microsoft-azure-ml/.env +++ b/workbench-for-microsoft-azure-ml/.env @@ -1,4 +1,4 @@ -RSW_VERSION=2024.09.1+394.pro7 +RSW_VERSION=2024.12.0+467.pro1 RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/bionic/amd64 RSW_NAME=rstudio-workbench PYTHON_VERSION=3.9.14 diff --git a/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 b/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 index 37c64774..91561303 100644 --- a/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 +++ b/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 @@ -7,7 +7,7 @@ ARG PYTHON_VERSION=3.9.17 ARG PYTHON_VERSION_ALT=3.8.17 ARG PYTHON_VERSION_JUPYTER=3.8.17 ARG JUPYTERLAB_VERSION=3.6.7 -ARG RSW_VERSION=2024.09.1+394.pro7 +ARG RSW_VERSION=2024.12.0+467.pro1 ARG RSW_NAME=rstudio-workbench ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64 ARG SCRIPTS_DIR=/opt/positscripts @@ -178,5 +178,5 @@ LABEL \ azure.ii.endpoints='[{"label":"connect","target":8787,"protocol":"http"}]' \ org.opencontainers.image.description='A professional integrated development environment for data science teams using R and Python' \ org.opencontainers.image.title='RStudio Workbench' \ - org.opencontainers.image.version='2024.09.1+394.pro7' \ + org.opencontainers.image.version='2024.12.0+467.pro1' \ org.opencontainers.image.url='https://www.rstudio.com/products/workbench/' diff --git a/workbench-session-init/Dockerfile.ubuntu2204 b/workbench-session-init/Dockerfile.ubuntu2204 index 7b8ab4f7..12b7c81a 100644 --- a/workbench-session-init/Dockerfile.ubuntu2204 +++ b/workbench-session-init/Dockerfile.ubuntu2204 @@ -8,7 +8,7 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends ca-certificates curl && \ rm -rf /var/lib/apt/lists/* -ARG RSW_VERSION=2024.09.1+394.pro7 +ARG RSW_VERSION=2024.12.0+467.pro1 ARG GO_VERSION=1.22.2 # Download the RStudio Workbench session components and install Go diff --git a/workbench/.env b/workbench/.env index 1667c404..c871a46d 100644 --- a/workbench/.env +++ b/workbench/.env @@ -1,4 +1,4 @@ -RSW_VERSION=2024.09.1+394.pro7 +RSW_VERSION=2024.12.0+467.pro1 RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/bionic/amd64 RSW_NAME=rstudio-workbench PYTHON_VERSION=3.9.17 diff --git a/workbench/Dockerfile.ubuntu2204 b/workbench/Dockerfile.ubuntu2204 index e637a53b..dc500252 100644 --- a/workbench/Dockerfile.ubuntu2204 +++ b/workbench/Dockerfile.ubuntu2204 @@ -7,7 +7,7 @@ ARG PYTHON_VERSION=3.9.17 ARG PYTHON_VERSION_ALT=3.8.17 ARG PYTHON_VERSION_JUPYTER=3.8.17 ARG JUPYTERLAB_VERSION=3.6.7 -ARG RSW_VERSION=2024.09.1+394.pro7 +ARG RSW_VERSION=2024.12.0+467.pro1 ARG RSW_NAME=rstudio-workbench ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64 ARG SCRIPTS_DIR=/opt/positscripts diff --git a/workbench/README.md b/workbench/README.md index 97da82f5..87dc2e22 100644 --- a/workbench/README.md +++ b/workbench/README.md @@ -7,7 +7,7 @@ # Supported tags and respective Dockerfile links -* [`jammy`, `ubuntu2204`, `jammy-2024.09.1`, `ubuntu2204-2024.09.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench/Dockerfile.ubuntu2204) +* [`jammy`, `ubuntu2204`, `jammy-2024.12.0`, `ubuntu2204-2024.12.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench/Dockerfile.ubuntu2204) # What is RStudio Workbench?