From 0d031b6ef4c7e983cbd8b9f97f21bed79e8fdb82 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Tue, 7 May 2024 10:32:31 -0700 Subject: [PATCH 1/2] Bump Connect to version 2024.04.1 --- 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 e976c62d..3b491ed0 100644 --- a/Justfile +++ b/Justfile @@ -7,7 +7,7 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" } BUILDX_PATH := "" -RSC_VERSION := "2024.04.0" +RSC_VERSION := "2024.04.1" RSPM_VERSION := "2024.04.0-20" RSW_VERSION := "2024.04.0+735.pro3" diff --git a/connect-content-init/Dockerfile.ubuntu2204 b/connect-content-init/Dockerfile.ubuntu2204 index b121ed1d..7a4cfd4c 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.04.0 +ARG RSC_VERSION=2024.04.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/README.md b/connect-content-init/README.md index 8e02f0be..4a6a58de 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.04.0`, `ubuntu2204-2024.04.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204) +* [`jammy`, `ubuntu2204`, `jammy-2024.04.1`, `ubuntu2204-2024.04.1`](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.04.0 +just build ubuntu2204 2024.04.1 ``` ## 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.04.0-dev-326 +docker history rstudio/rstudio-connect-content-init-preview:2024.04.1-dev-326 ``` NOTE: almost all the image size is pandoc. diff --git a/connect/.env b/connect/.env index fffe465c..b27a5daf 100644 --- a/connect/.env +++ b/connect/.env @@ -1,4 +1,4 @@ -RSC_VERSION=2024.04.0 +RSC_VERSION=2024.04.1 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 1e23d58e..cbea5ad9 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.04.0 +ARG RSC_VERSION=2024.04.1 ARG QUARTO_VERSION=1.4.552 ARG SCRIPTS_DIR=/opt/positscripts diff --git a/connect/README.md b/connect/README.md index 4eaaa728..9215a5fd 100644 --- a/connect/README.md +++ b/connect/README.md @@ -7,7 +7,7 @@ # Supported tags and respective Dockerfile links -* [`jammy`, `ubuntu2204`, `jammy-2024.04.0`, `ubuntu2204-2024.04.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204) +* [`jammy`, `ubuntu2204`, `jammy-2024.04.1`, `ubuntu2204-2024.04.1`](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 c5ba855c..674b4fbe 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -1,6 +1,6 @@ ### Variable definitions ### variable CONNECT_VERSION { - default = "2024.04.0" + default = "2024.04.1" } variable PACKAGE_MANAGER_VERSION { From 75b98182d170463df48bbaa5beb6ef0dce526134 Mon Sep 17 00:00:00 2001 From: Ian Pittwood Date: Wed, 8 May 2024 06:22:06 -0700 Subject: [PATCH 2/2] Fix image short sha (#760) * Add debug statement for git rev-parse * Use github.sha instead of HEAD * Set GIT_SHA to null * Add debug plan * Fix output for GIT_SHA * Remove debug statement --- .github/workflows/build-bake.yaml | 3 ++- docker-bake.hcl | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bake.yaml b/.github/workflows/build-bake.yaml index 25613e94..a1c999b2 100644 --- a/.github/workflows/build-bake.yaml +++ b/.github/workflows/build-bake.yaml @@ -18,7 +18,7 @@ jobs: cancel-in-progress: true outputs: - GIT_SHA: ${{ steps.checkout.outputs.sha }} + GIT_SHA: ${{ steps.get-git-sha.outputs.GIT_SHA }} steps: - name: Checkout @@ -29,6 +29,7 @@ jobs: run: | GIT_SHA=$(git rev-parse --short HEAD) echo "GIT_SHA=$GIT_SHA" >> $GITHUB_OUTPUT + echo "$GIT_SHA" base: needs: [setup] diff --git a/docker-bake.hcl b/docker-bake.hcl index 674b4fbe..ddaf21ad 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -24,7 +24,7 @@ variable DEFAULT_JUPYTERLAB_VERSION { } variable GIT_SHA { - default = "" + default = null } function tag_safe_version {