From 2acf74ce72e8bd1f54fa39f266a7847421471e85 Mon Sep 17 00:00:00 2001 From: Ian Pittwood Date: Tue, 22 Oct 2024 10:13:11 -0600 Subject: [PATCH 1/2] Upgrade pip and setuptools on Jupyter venv creation --- r-session-complete/Dockerfile.ubuntu2204 | 2 ++ workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204 | 2 ++ workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 | 2 ++ workbench/Dockerfile.ubuntu2204 | 2 ++ 4 files changed, 8 insertions(+) diff --git a/r-session-complete/Dockerfile.ubuntu2204 b/r-session-complete/Dockerfile.ubuntu2204 index f16c595c..62a18b6c 100644 --- a/r-session-complete/Dockerfile.ubuntu2204 +++ b/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 \ diff --git a/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204 b/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204 index 1cea9f81..aa76f97a 100644 --- a/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204 +++ b/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 \ diff --git a/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 b/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 index c13954a3..9cc5faec 100644 --- a/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 +++ b/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 \ diff --git a/workbench/Dockerfile.ubuntu2204 b/workbench/Dockerfile.ubuntu2204 index ba25914a..3a64b9de 100644 --- a/workbench/Dockerfile.ubuntu2204 +++ b/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 \ From ea37e1d1d22c0dfc9fcd4fd94681321f39fe849d Mon Sep 17 00:00:00 2001 From: "Benjamin R. J. Schwedler" Date: Fri, 25 Oct 2024 15:27:49 -0500 Subject: [PATCH 2/2] Disable Azure ML image build for now The builds for Azure ML continue to fail due to python package incompatibilities introduced upstream. Add this to the issues to resolve in: - https://github.com/rstudio/rstudio-docker-products/issues/562 --- .github/workflows/build-bake.yaml | 43 +--------------------------- .github/workflows/build-manual.yaml | 6 ++-- .github/workflows/update-readme.yaml | 1 - 3 files changed, 4 insertions(+), 46 deletions(-) diff --git a/.github/workflows/build-bake.yaml b/.github/workflows/build-bake.yaml index c1c67e11..be7b55e7 100644 --- a/.github/workflows/build-bake.yaml +++ b/.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 }}' diff --git a/.github/workflows/build-manual.yaml b/.github/workflows/build-manual.yaml index 2f991774..e9ceb46b 100644 --- a/.github/workflows/build-manual.yaml +++ b/.github/workflows/build-manual.yaml @@ -126,7 +126,7 @@ jobs: else VERSION="${{ inputs.version }}" fi - + # Set the appropriate env var suffix="_VERSION" if [[ "${{ inputs.type }}" == "preview" ]]; then @@ -134,7 +134,7 @@ jobs: 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 diff --git a/.github/workflows/update-readme.yaml b/.github/workflows/update-readme.yaml index 0e264b21..78a9db22 100644 --- a/.github/workflows/update-readme.yaml +++ b/.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