Merge pull request #859 from rstudio/dev

Merge dev to main

Author: bschwedler

.github/workflows/build-bake.yaml

@@ -6,7 +6,7 @@ on:
       - main
       - dev
   pull_request:
-  
+
 name: Release - Build, Test, and Push
 jobs:
   setup:
@@ -374,44 +374,3 @@ jobs:
           snyk-org: ${{ secrets.SNYK_ORG }}
           snyk-token: '${{ secrets.SNYK_TOKEN }}'
 
-  workbench-for-microsoft-azure-ml:
-    needs: [setup]
-    name: Workbench for Microsoft Azure ML
-    runs-on: ubuntu-latest-8x
-
-    concurrency:
-      group: bake-waml-${{ github.ref }}
-      cancel-in-progress: true
-
-    env:
-      target: workbench-for-microsoft-azure-ml
-      GIT_SHA: ${{ needs.setup.outputs.GIT_SHA }}
-
-    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
-        uses: docker/setup-buildx-action@v3
-        id: setup-buildx
-        with:
-          buildkitd-config: ./share/buildkitd.toml
-
-      - name: Build, Test, and Push
-        uses: ./.github/actions/bake-test-push
-        with:
-          target: ${{ env.target }}
-          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 }}
-          gcp-json: '${{ secrets.GCP_ARTIFACT_REGISTRY_JSON }}'
-          snyk-org: ${{ secrets.SNYK_ORG }}
-          snyk-token: '${{ secrets.SNYK_TOKEN }}'

.github/workflows/build-manual.yaml

@@ -126,15 +126,15 @@ jobs:
           else
             VERSION="${{ inputs.version }}"
           fi
-          
+
           # Set the appropriate env var
           suffix="_VERSION"
           if [[ "${{ inputs.type }}" == "preview" ]]; then
             suffix="_PREVIEW_VERSION"
           elif [[ "${{ inputs.type }}" == "daily" ]]; then
             suffix="_DAILY_VERSION"
           fi
-          
+
           product="${{ inputs.product }}"
           if [[ "$product" == "connect" ]] || [[ "$product" == "connect-content-init" ]] || [[ "$product" == "content-images" ]]; then
             product="CONNECT"
@@ -143,7 +143,7 @@ jobs:
           else
             product="WORKBENCH"
           fi
-          
+
           echo "Setting $product$suffix=$VERSION"
           echo "$product$suffix=$VERSION" >> $GITHUB_ENV
 

.github/workflows/update-readme.yaml

@@ -24,7 +24,6 @@ jobs:
           - {prefix: '', repository: 'content-pro', readme_path: './content/pro/README.md'}
           - {prefix: 'rstudio-', repository: 'package-manager', readme_path: './package-manager/README.md'}
           - {prefix: '', repository: 'r-session-complete', readme_path: './r-session-complete/README.md'}
-          - {prefix: 'rstudio-', repository: 'workbench-for-microsoft-azure-ml', readme_path: './workbench-for-microsoft-azure-ml/README.md'}
 
     steps:
       - name: Check Out Repo

r-session-complete/Dockerfile.ubuntu2204

@@ -44,6 +44,8 @@ RUN ln -s /lib/rstudio-server/bin/quarto/bin/quarto /usr/local/bin/quarto
 RUN $SCRIPTS_DIR/install_quarto.sh --install-tinytex --add-path-tinytex
 
 RUN /opt/python/"${PYTHON_VERSION}"/bin/python -m venv /opt/python/jupyter \
+    && /opt/python/jupyter/bin/python -m pip install --upgrade pip \
+    && /opt/python/jupyter/bin/python -m pip install --upgrade setuptools \
     && /opt/python/jupyter/bin/python -m pip install \
       jupyterlab~=4.2.4 \
       notebook \

workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204

@@ -118,6 +118,8 @@ RUN mkdir -p /opt/rstudio-license/ \
 
 ### Install Jupyter and extensions ###
 RUN /opt/python/"${PYTHON_VERSION_JUPYTER}"/bin/python -m venv /opt/python/jupyter \
+    && /opt/python/jupyter/bin/python -m pip install --upgrade pip \
+    && /opt/python/jupyter/bin/python -m pip install --upgrade setuptools \
     && /opt/python/jupyter/bin/python -m pip install\
       jupyterlab~=4.2.4 \
       notebook \

workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204

@@ -88,6 +88,8 @@ RUN apt-get update --fix-missing -qq \
 
 ### Install Jupyter and extensions ###
 RUN /opt/python/"${PYTHON_VERSION_JUPYTER}"/bin/python -m venv /opt/python/jupyter \
+    && /opt/python/jupyter/bin/python -m pip install --upgrade pip \
+    && /opt/python/jupyter/bin/python -m pip install --upgrade setuptools \
     && /opt/python/jupyter/bin/pip install \
       jupyterlab~=4.2.4 \
       notebook \

workbench/Dockerfile.ubuntu2204

@@ -80,6 +80,8 @@ COPY startup/* /startup/base/
 COPY supervisord.conf /etc/supervisor/supervisord.conf
 
 RUN /opt/python/"${PYTHON_VERSION_JUPYTER}"/bin/python -m venv /opt/python/jupyter \
+    && /opt/python/jupyter/bin/python -m pip install --upgrade pip \
+    && /opt/python/jupyter/bin/python -m pip install --upgrade setuptools \
     && /opt/python/jupyter/bin/python -m pip install \
       jupyterlab~=4.2.4 \
       notebook \