Merge pull request #825 from rstudio/dev

Merge dev to main
rstudio · Aug 8, 2024 · f3d947d · f3d947d
2 parents fab7faa + 3c32218
commit f3d947d
Show file tree

Hide file tree

Showing 15 changed files with 165 additions and 38 deletions.
diff --git a/.github/workflows/build-bake-preview.yaml b/.github/workflows/build-bake-preview.yaml
@@ -77,7 +77,7 @@ jobs:
     steps:
       - name: Check Out main Branch
         if: github.event.schedule == '0 8 * * *'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: 'main'
 
@@ -104,7 +104,7 @@ jobs:
 
   connect-daily:
     needs: [versions]
-    name: Connect Image - Daily
+    name: Connect - Daily
     runs-on: ubuntu-latest-4x
 
     env:

diff --git a/.github/workflows/build-bake.yaml b/.github/workflows/build-bake.yaml
@@ -22,6 +22,13 @@ jobs:
 
     steps:
       - name: Checkout
+        if: github.event_name == 'schedule'
+        uses: actions/checkout@v4
+        with:
+          ref: 'main'
+
+      - name: Checkout
+        if: github.event_name != 'schedule'
         uses: actions/checkout@v4
 
       - name: Get commit SHA
@@ -46,6 +53,13 @@ jobs:
 
     steps:
       - name: Checkout
+        if: github.event_name == 'schedule'
+        uses: actions/checkout@v4
+        with:
+          ref: 'main'
+
+      - name: Checkout
+        if: github.event_name != 'schedule'
         uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
@@ -58,7 +72,7 @@ jobs:
         uses: ./.github/actions/bake-test-push
         with:
           target: ${{ env.target }}
-          push-image: ${{ github.ref == 'refs/heads/main' }}
+          push-image: ${{ github.ref == 'refs/heads/main' || github.event_name == 'schedule' }}
           ghcr-token: ${{ secrets.GITHUB_TOKEN }}
           dockerhub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
           dockerhub-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
@@ -81,6 +95,13 @@ jobs:
 
     steps:
       - name: Checkout
+        if: github.event_name == 'schedule'
+        uses: actions/checkout@v4
+        with:
+          ref: 'main'
+
+      - name: Checkout
+        if: github.event_name != 'schedule'
         uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
@@ -93,7 +114,7 @@ jobs:
         uses: ./.github/actions/bake-test-push
         with:
           target: ${{ env.target }}
-          push-image: ${{ github.ref == 'refs/heads/main' }}
+          push-image: ${{ github.ref == 'refs/heads/main' || github.event_name == 'schedule' }}
           ghcr-token: ${{ secrets.GITHUB_TOKEN }}
           dockerhub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
           dockerhub-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
@@ -116,6 +137,13 @@ jobs:
 
     steps:
       - name: Checkout
+        if: github.event_name == 'schedule'
+        uses: actions/checkout@v4
+        with:
+          ref: 'main'
+
+      - name: Checkout
+        if: github.event_name != 'schedule'
         uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
@@ -128,7 +156,7 @@ jobs:
         uses: ./.github/actions/bake-test-push
         with:
           target: ${{ env.target }}
-          push-image: ${{ github.ref == 'refs/heads/main' }}
+          push-image: ${{ github.ref == 'refs/heads/main' || github.event_name == 'schedule' }}
           ghcr-token: ${{ secrets.GITHUB_TOKEN }}
           dockerhub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
           dockerhub-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
@@ -151,6 +179,13 @@ jobs:
 
     steps:
       - name: Checkout
+        if: github.event_name == 'schedule'
+        uses: actions/checkout@v4
+        with:
+          ref: 'main'
+
+      - name: Checkout
+        if: github.event_name != 'schedule'
         uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
@@ -163,7 +198,7 @@ jobs:
         uses: ./.github/actions/bake-test-push
         with:
           target: ${{ env.target }}
-          push-image: ${{ github.ref == 'refs/heads/main' }}
+          push-image: ${{ github.ref == 'refs/heads/main' || github.event_name == 'schedule' }}
           ghcr-token: ${{ secrets.GITHUB_TOKEN }}
           dockerhub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
           dockerhub-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
@@ -186,6 +221,13 @@ jobs:
 
     steps:
       - name: Checkout
+        if: github.event_name == 'schedule'
+        uses: actions/checkout@v4
+        with:
+          ref: 'main'
+
+      - name: Checkout
+        if: github.event_name != 'schedule'
         uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
@@ -198,7 +240,7 @@ jobs:
         uses: ./.github/actions/bake-test-push
         with:
           target: ${{ env.target }}
-          push-image: ${{ github.ref == 'refs/heads/main' }}
+          push-image: ${{ github.ref == 'refs/heads/main' || github.event_name == 'schedule' }}
           ghcr-token: ${{ secrets.GITHUB_TOKEN }}
           dockerhub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
           dockerhub-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
@@ -221,6 +263,13 @@ jobs:
 
     steps:
       - name: Checkout
+        if: github.event_name == 'schedule'
+        uses: actions/checkout@v4
+        with:
+          ref: 'main'
+
+      - name: Checkout
+        if: github.event_name != 'schedule'
         uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
@@ -233,7 +282,7 @@ jobs:
         uses: ./.github/actions/bake-test-push
         with:
           target: ${{ env.target }}
-          push-image: ${{ github.ref == 'refs/heads/main' }}
+          push-image: ${{ github.ref == 'refs/heads/main' || github.event_name == 'schedule' }}
           ghcr-token: ${{ secrets.GITHUB_TOKEN }}
           dockerhub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
           dockerhub-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
@@ -256,6 +305,13 @@ jobs:
 
     steps:
       - name: Checkout
+        if: github.event_name == 'schedule'
+        uses: actions/checkout@v4
+        with:
+          ref: 'main'
+
+      - name: Checkout
+        if: github.event_name != 'schedule'
         uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
@@ -268,7 +324,7 @@ jobs:
         uses: ./.github/actions/bake-test-push
         with:
           target: ${{ env.target }}
-          push-image: ${{ github.ref == 'refs/heads/main' }}
+          push-image: ${{ github.ref == 'refs/heads/main' || github.event_name == 'schedule' }}
           ghcr-token: ${{ secrets.GITHUB_TOKEN }}
           dockerhub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
           dockerhub-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
@@ -291,6 +347,13 @@ jobs:
 
     steps:
       - name: Checkout
+        if: github.event_name == 'schedule'
+        uses: actions/checkout@v4
+        with:
+          ref: 'main'
+
+      - name: Checkout
+        if: github.event_name != 'schedule'
         uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
@@ -303,7 +366,7 @@ jobs:
         uses: ./.github/actions/bake-test-push
         with:
           target: ${{ env.target }}
-          push-image: ${{ github.ref == 'refs/heads/main' }}
+          push-image: ${{ github.ref == 'refs/heads/main' || github.event_name == 'schedule' }}
           ghcr-token: ${{ secrets.GITHUB_TOKEN }}
           dockerhub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
           dockerhub-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
@@ -326,6 +389,13 @@ jobs:
 
     steps:
       - name: Checkout
+        if: github.event_name == 'schedule'
+        uses: actions/checkout@v4
+        with:
+          ref: 'main'
+
+      - name: Checkout
+        if: github.event_name != 'schedule'
         uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
@@ -338,7 +408,7 @@ jobs:
         uses: ./.github/actions/bake-test-push
         with:
           target: ${{ env.target }}
-          push-image: ${{ github.ref == 'refs/heads/main' }}
+          push-image: ${{ github.ref == 'refs/heads/main' || github.event_name == 'schedule' }}
           ghcr-token: ${{ secrets.GITHUB_TOKEN }}
           dockerhub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
           dockerhub-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

diff --git a/.github/workflows/build-manual.yaml b/.github/workflows/build-manual.yaml
@@ -163,3 +163,5 @@ jobs:
           dockerhub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
           dockerhub-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
           gcp-json: '${{ secrets.GCP_ARTIFACT_REGISTRY_JSON }}'
+          snyk-org: ${{ secrets.SNYK_ORG }}
+          snyk-token: '${{ secrets.SNYK_TOKEN }}'
diff --git a/Justfile b/Justfile
@@ -7,7 +7,7 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" }
 
 BUILDX_PATH := ""
 
-RSC_VERSION := "2024.06.0"
+RSC_VERSION := "2024.08.0"
 RSPM_VERSION := "2024.04.4-35"
 RSW_VERSION := "2024.04.2+764.pro1"
 

diff --git 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.06.0
+ARG RSC_VERSION=2024.08.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
@@ -9,7 +9,7 @@
 
 # Supported tags and respective Dockerfile links
 
-* [`jammy`, `ubuntu2204`, `jammy-2024.06.0`, `ubuntu2204-2024.06.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
+* [`jammy`, `ubuntu2204`, `jammy-2024.08.0`, `ubuntu2204-2024.08.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.06.0
+just build ubuntu2204 2024.08.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.06.0-dev-326
+docker history rstudio/rstudio-connect-content-init-preview:2024.08.0-dev-326
 ```
 
 NOTE: almost all the image size is pandoc.

diff --git a/connect/.env b/connect/.env
@@ -1,4 +1,4 @@
-RSC_VERSION=2024.06.0
+RSC_VERSION=2024.08.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
@@ -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.06.0
+ARG RSC_VERSION=2024.08.0
 ARG QUARTO_VERSION=1.4.557
 ARG SCRIPTS_DIR=/opt/positscripts
 

diff --git a/connect/README.md b/connect/README.md
@@ -7,7 +7,7 @@
 
 # Supported tags and respective Dockerfile links
 
-* [`jammy`, `ubuntu2204`, `jammy-2024.06.0`, `ubuntu2204-2024.06.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
+* [`jammy`, `ubuntu2204`, `jammy-2024.08.0`, `ubuntu2204-2024.08.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
@@ -1,6 +1,6 @@
 ### Variable definitions ###
 variable CONNECT_VERSION {
-    default = "2024.06.0"
+    default = "2024.08.0"
 }
 
 variable PACKAGE_MANAGER_VERSION {
@@ -461,12 +461,12 @@ target "workbench-for-google-cloud-workstations" {
     tags = [
         "us-central1-docker.pkg.dev/posit-images/cloud-workstations/workbench:${tag_safe_version(WORKBENCH_VERSION)}",
         "us-central1-docker.pkg.dev/posit-images/cloud-workstations/workbench:latest",
-        "us-docker.pkg.dev/posit-images/cloud-workstations/workbench:${tag_safe_version(WORKBENCH_VERSION)}",
-        "us-docker.pkg.dev/posit-images/cloud-workstations/workbench:latest",
         "europe-docker.pkg.dev/posit-images/cloud-workstations/workbench:${tag_safe_version(WORKBENCH_VERSION)}",
         "europe-docker.pkg.dev/posit-images/cloud-workstations/workbench:latest",
         "asia-docker.pkg.dev/posit-images/cloud-workstations/workbench:${tag_safe_version(WORKBENCH_VERSION)}",
         "asia-docker.pkg.dev/posit-images/cloud-workstations/workbench:latest",
+        "us-docker.pkg.dev/posit-images/cloud-workstations/workbench:${tag_safe_version(WORKBENCH_VERSION)}",
+        "us-docker.pkg.dev/posit-images/cloud-workstations/workbench:latest",
     ]
 
     dockerfile = "Dockerfile.${builds.os}"

diff --git a/r-session-complete/.snyk b/r-session-complete/.snyk
@@ -11,7 +11,10 @@ ignore:
         created: 2024-07-02T20:33:30.847Z
   SNYK-GOLANG-GITHUBCOMGOJOSEGOJOSEV3-6070737:
     - '*':
-        reason: 'Reported upstream in https://github.com/rstudio/openid/issues/18'
-        expires: 2024-07-31T00:00:00.000Z
-        created: 2024-07-02T20:52:24.627Z
+        reason: >-
+          Confirmed fixed upstream in
+          https://github.com/rstudio/rstudio-pro/issues/6635. Patch will be
+          ingested in Workbench 2024.08.0 (expected within 1 week).
+        expires: 2024-08-07T00:00:00.000Z
+        created: 2024-07-31T17:46:24.852Z
 patch: {}