From fe05240bd7dc0ec679090de84b7a7cee5bfc2750 Mon Sep 17 00:00:00 2001 From: Lucas Rodriguez Date: Thu, 30 Jan 2025 12:12:24 -0600 Subject: [PATCH 1/2] Bump Connect to version 2025.01.0 --- Justfile | 2 +- connect-content-init/Dockerfile.ubuntu2204 | 2 +- connect-content-init/README.md | 6 +++--- connect/.env | 2 +- connect/Dockerfile.ubuntu2204 | 2 +- connect/README.md | 2 +- docker-bake.hcl | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Justfile b/Justfile index e33dc984..0ce13e94 100644 --- a/Justfile +++ b/Justfile @@ -7,7 +7,7 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" } BUILDX_PATH := "" -RSC_VERSION := "2024.12.0" +RSC_VERSION := "2025.01.0" RSPM_VERSION := "2024.11.0-7" RSW_VERSION := "2024.12.0+467.pro1" diff --git a/connect-content-init/Dockerfile.ubuntu2204 b/connect-content-init/Dockerfile.ubuntu2204 index db984892..657ebde2 100644 --- a/connect-content-init/Dockerfile.ubuntu2204 +++ b/connect-content-init/Dockerfile.ubuntu2204 @@ -9,7 +9,7 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends ca-certificates curl && \ rm -rf /var/lib/apt/lists/* -ARG RSC_VERSION=2024.12.0 +ARG RSC_VERSION=2025.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/README.md b/connect-content-init/README.md index fd82891a..01e2307f 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-2024.12.0`, `ubuntu2204-2024.12.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204) +* [`jammy`, `ubuntu2204`, `jammy-2025.01.0`, `ubuntu2204-2025.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 2024.12.0 +just build ubuntu2204 2025.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:2024.12.0-dev-326 +docker history rstudio/rstudio-connect-content-init-preview:2025.01.0-dev-326 ``` NOTE: almost all the image size is pandoc. diff --git a/connect/.env b/connect/.env index 3ecfbc3d..25346857 100644 --- a/connect/.env +++ b/connect/.env @@ -1,4 +1,4 @@ -RSC_VERSION=2024.12.0 +RSC_VERSION=2025.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 0af45f61..2178b21a 100644 --- a/connect/Dockerfile.ubuntu2204 +++ b/connect/Dockerfile.ubuntu2204 @@ -7,7 +7,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=2024.12.0 +ARG RSC_VERSION=2025.01.0 ARG QUARTO_VERSION=1.4.557 ARG SCRIPTS_DIR=/opt/positscripts diff --git a/connect/README.md b/connect/README.md index dc71f79b..9a621aa9 100644 --- a/connect/README.md +++ b/connect/README.md @@ -7,7 +7,7 @@ # Supported tags and respective Dockerfile links -* [`jammy`, `ubuntu2204`, `jammy-2024.12.0`, `ubuntu2204-2024.12.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204) +* [`jammy`, `ubuntu2204`, `jammy-2025.01.0`, `ubuntu2204-2025.01.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204) # What is Posit Connect? diff --git a/docker-bake.hcl b/docker-bake.hcl index abbb3c31..cd5eb4aa 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -1,6 +1,6 @@ ### Variable definitions ### variable CONNECT_VERSION { - default = "2024.12.0" + default = "2025.01.0" } variable PACKAGE_MANAGER_VERSION { From e81880419ec4d54724e11b94f3fe5a3231f90e81 Mon Sep 17 00:00:00 2001 From: Ian Pittwood Date: Fri, 24 Jan 2025 07:53:54 -0700 Subject: [PATCH 2/2] Upgrade actions versions Fixes bake-action incompatibility with newer buildx versions --- .github/actions/bake-test-push/action.yml | 4 ++-- .github/workflows/clean-registry.yaml | 2 +- .github/workflows/lint.yaml | 2 +- .github/workflows/update-readme.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/bake-test-push/action.yml b/.github/actions/bake-test-push/action.yml index 10436d91..cdd99ea6 100644 --- a/.github/actions/bake-test-push/action.yml +++ b/.github/actions/bake-test-push/action.yml @@ -119,7 +119,7 @@ runs: # Build, test, and push image - name: Build id: build - uses: docker/bake-action@v4 + uses: docker/bake-action@v5 with: targets: "${{ inputs.target }}" push: false @@ -154,7 +154,7 @@ runs: category: "${{ inputs.target }}-snyk-vulnerabilities" - name: Push - ${{ inputs.push-image }} - uses: docker/bake-action@v4 + uses: docker/bake-action@v5 with: targets: "${{ inputs.target }}" push: ${{ inputs.push-image }} diff --git a/.github/workflows/clean-registry.yaml b/.github/workflows/clean-registry.yaml index 890614d8..9273c2e7 100644 --- a/.github/workflows/clean-registry.yaml +++ b/.github/workflows/clean-registry.yaml @@ -14,7 +14,7 @@ jobs: name: cleanup-dockerhub steps: - name: Check Out Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run Script run: ./tools/dockerhub_clean.py diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 55c01833..59055e48 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -37,7 +37,7 @@ jobs: uses: actions/checkout@v4 - name: Run Hadolint - uses: hadolint/hadolint-action@v3.0.0 + uses: hadolint/hadolint-action@v3.1.0 with: dockerfile: ${{ matrix.config.product }}/Dockerfile.${{ matrix.config.os }} config: ./hadolint.yaml diff --git a/.github/workflows/update-readme.yaml b/.github/workflows/update-readme.yaml index 65715320..0e9b7c84 100644 --- a/.github/workflows/update-readme.yaml +++ b/.github/workflows/update-readme.yaml @@ -32,7 +32,7 @@ jobs: uses: actions/checkout@v3 - name: Docker Hub Description - uses: peter-evans/dockerhub-description@v3.1.2 + uses: peter-evans/dockerhub-description@v4.0.0 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}