From aac56a610b3b112dfb0ad014b83265352381173e Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Sat, 19 Aug 2023 10:42:28 +0200 Subject: [PATCH] Build contributed recipes on aarch64 (#1974) * Build contributed recipes on aarch64 * Add --pull to contributed recipes * Exclude recipe not working on aarch64 --- .github/workflows/contributed-recipes.yml | 5 +++-- docs/using/recipe_code/generate_matrix.py | 6 +++++- docs/using/recipes.md | 4 ++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/contributed-recipes.yml b/.github/workflows/contributed-recipes.yml index d51bf3e4..5478efa8 100644 --- a/.github/workflows/contributed-recipes.yml +++ b/.github/workflows/contributed-recipes.yml @@ -33,7 +33,7 @@ jobs: run: docs/using/recipe_code/generate_matrix.py >> $GITHUB_OUTPUT test-recipes: - runs-on: ubuntu-latest + runs-on: ${{ matrix.runsOn }} needs: generate-matrix if: github.repository == 'jupyter/docker-stacks' @@ -42,7 +42,8 @@ jobs: uses: actions/checkout@v3 - name: Build recipe 🛠 - run: docker build --rm --force-rm --tag my-custom-image -f ./${{ matrix.dockerfile }} ./ + # We're pulling here to avoid accidentally using image which migt be present on aarch64 self-hosted runner + run: docker build --pull --rm --force-rm --tag my-custom-image -f ./${{ matrix.dockerfile }} ./ env: DOCKER_BUILDKIT: 1 # Full logs for CI build diff --git a/docs/using/recipe_code/generate_matrix.py b/docs/using/recipe_code/generate_matrix.py index ff588029..417cdfb1 100755 --- a/docs/using/recipe_code/generate_matrix.py +++ b/docs/using/recipe_code/generate_matrix.py @@ -10,7 +10,11 @@ THIS_DIR = Path(__file__).parent.resolve() def generate_matrix() -> dict[str, Any]: dockerfiles = sorted(file.name for file in THIS_DIR.glob("*.dockerfile")) - return {"dockerfile": dockerfiles} + return { + "dockerfile": dockerfiles, + "runsOn": ["ubuntu-latest", "ARM64"], + "exclude": [{"dockerfile": "oracledb.dockerfile", "runsOn": "ARM64"}], + } if __name__ == "__main__": diff --git a/docs/using/recipes.md b/docs/using/recipes.md index 507e374e..8b958067 100644 --- a/docs/using/recipes.md +++ b/docs/using/recipes.md @@ -502,6 +502,10 @@ Pre-built images are hosted in the [realiserad/jupyter-docker-mssql](https://git ## Add Oracle SQL Instant client, SQL\*Plus and other tools (Version 21.x) +```{note} +This recipe only works for x86_64 architecture. +``` + The following recipe demonstrates how to add functionality to connect to a Oracle Database using [Oracle Instant Client](https://www.oracle.com/database/technologies/instant-client.html) in your notebook. This recipe installs version `21.11.0.0.0`.